Skip to content

Commit ca6012d

Browse files
fmbenhassinefmbenhassine
committed
Remove deprecated DateUtils class
1 parent dfbab94 commit ca6012d

File tree

4 files changed

+110
-128
lines changed

4 files changed

+110
-128
lines changed

‎easy-random-core/src/main/java/org/jeasy/random/randomizers/time/DateRandomizer.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
import org.jeasy.random.api.Randomizer;
2828
import org.jeasy.random.randomizers.range.DateRangeRandomizer;
2929

30+
import java.time.ZonedDateTime;
3031
import java.util.Date;
3132

32-
import static org.jeasy.random.util.DateUtils.toDate;
33+
import static java.util.Date.from;
3334

3435
/**
3536
* Generate a random {@link Date}.
@@ -83,4 +84,8 @@ public static DateRandomizer aNewDateRandomizer(final long seed) {
8384
public Date getRandomValue() {
8485
return delegate.getRandomValue();
8586
}
87+
88+
private Date toDate(ZonedDateTime zonedDateTime) {
89+
return from(zonedDateTime.toInstant());
90+
}
8691
}

‎easy-random-core/src/main/java/org/jeasy/random/util/ConversionUtils.java

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
/*
2+
* The MIT License
3+
*
4+
* Copyright (c) 2020, Mahmoud Ben Hassine (mahmoud.benhassine@icloud.com)
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
package org.jeasy.random.util;
25+
26+
import java.lang.reflect.Array;
27+
import java.math.BigDecimal;
28+
import java.math.BigInteger;
29+
import java.time.LocalDate;
30+
import java.time.LocalDateTime;
31+
import java.time.LocalTime;
32+
import java.time.ZoneOffset;
33+
import java.time.format.DateTimeFormatter;
34+
import java.util.Date;
35+
import java.util.stream.Stream;
36+
37+
import org.jeasy.random.annotation.RandomizerArgument;
38+
39+
/**
40+
* Type conversion utility methods.
41+
*
42+
* <strong>This class is intended for internal use only.</strong>
43+
*
44+
* @author Mahmoud Ben Hassine (mahmoud.benhassine@icloud.com)
45+
*/
46+
public class ConversionUtils {
47+
48+
private static final String DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
49+
50+
private ConversionUtils() {
51+
}
52+
53+
public static Object[] convertArguments(final RandomizerArgument[] declaredArguments) {
54+
int numberOfArguments = declaredArguments.length;
55+
Object[] arguments = new Object[numberOfArguments];
56+
for (int i = 0; i < numberOfArguments; i++) {
57+
Class<?> type = declaredArguments[i].type();
58+
String value = declaredArguments[i].value();
59+
// issue 299: if argument type is array, split values before conversion
60+
if (type.isArray()) {
61+
Object[] values = Stream.of(value.split(",")).map(String::trim).toArray();
62+
arguments[i] = convertArray(values, type);
63+
} else {
64+
arguments[i] = convertValue(value, type);
65+
}
66+
}
67+
return arguments;
68+
}
69+
70+
private static Object convertArray(Object array, Class<?> targetType) {
71+
Object[] values = (Object[]) array;
72+
Object convertedValuesArray = Array.newInstance(targetType.getComponentType(), values.length);
73+
for (int i = 0; i < values.length; i++) {
74+
Array.set(convertedValuesArray, i, convertValue((String) values[i], targetType.getComponentType()));
75+
}
76+
return convertedValuesArray;
77+
}
78+
79+
private static Object convertValue(String value, Class<?> targetType) {
80+
if(Boolean.class.equals(targetType) || Boolean.TYPE.equals(targetType)) return Boolean.parseBoolean(value);
81+
if(Byte.class.equals(targetType) || Byte.TYPE.equals(targetType)) return Byte.parseByte(value);
82+
if(Short.class.equals(targetType) || Short.TYPE.equals(targetType)) return Short.parseShort(value);
83+
if(Integer.class.equals(targetType) || Integer.TYPE.equals(targetType)) return Integer.parseInt(value);
84+
if(Long.class.equals(targetType) || Long.TYPE.equals(targetType)) return Long.parseLong(value);
85+
if(Float.class.equals(targetType) || Float.TYPE.equals(targetType)) return Float.parseFloat(value);
86+
if(Double.class.equals(targetType) || Double.TYPE.equals(targetType)) return Double.parseDouble(value);
87+
if(BigInteger.class.equals(targetType)) return new BigInteger(value);
88+
if(BigDecimal.class.equals(targetType)) return new BigDecimal(value);
89+
if(Date.class.equals(targetType)) return Date.from(parseDate(value).toInstant(ZoneOffset.UTC));
90+
if(java.sql.Date.class.equals(targetType)) return java.sql.Date.valueOf(value);
91+
if(java.sql.Time.class.equals(targetType)) return java.sql.Time.valueOf(value);
92+
if(java.sql.Timestamp.class.equals(targetType)) return java.sql.Timestamp.valueOf(value);
93+
if(LocalDate.class.equals(targetType)) return LocalDate.parse(value);
94+
if(LocalTime.class.equals(targetType)) return LocalTime.parse(value);
95+
if(LocalDateTime.class.equals(targetType)) return LocalDateTime.parse(value);
96+
return value;
97+
}
98+
99+
private static LocalDateTime parseDate(String value) {
100+
return LocalDateTime.parse(value, DateTimeFormatter.ofPattern(DATE_PATTERN));
101+
}
102+
}

‎easy-random-core/src/main/java/org/jeasy/random/util/DateUtils.java

-78
This file was deleted.

‎easy-random-core/src/main/java/org/jeasy/random/util/ReflectionUtils.java

+2-49
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030

3131
import java.lang.annotation.Annotation;
3232
import java.lang.reflect.*;
33-
import java.math.BigDecimal;
34-
import java.math.BigInteger;
35-
import java.time.LocalDate;
36-
import java.time.LocalDateTime;
37-
import java.time.LocalTime;
3833
import java.util.*;
3934
import java.util.concurrent.*;
4035
import java.util.function.Supplier;
@@ -44,6 +39,7 @@
4439
import static java.util.Arrays.asList;
4540
import static java.util.Locale.ENGLISH;
4641
import static java.util.stream.Collectors.toList;
42+
import static org.jeasy.random.util.ConversionUtils.convertArguments;
4743

4844
/**
4945
* Reflection utility methods.
@@ -629,50 +625,7 @@ private static boolean hasSameArgumentTypes(final Constructor<?> constructor, fi
629625
return true;
630626
}
631627

632-
private static Object[] convertArguments(final RandomizerArgument[] declaredArguments) {
633-
int numberOfArguments = declaredArguments.length;
634-
Object[] arguments = new Object[numberOfArguments];
635-
for (int i = 0; i < numberOfArguments; i++) {
636-
Class<?> type = declaredArguments[i].type();
637-
String value = declaredArguments[i].value();
638-
// issue 299: if argument type is array, split values before conversion
639-
if (type.isArray()) {
640-
Object[] values = Stream.of(value.split(",")).map(String::trim).toArray();
641-
arguments[i] = convertArray(values, type);
642-
} else {
643-
arguments[i] = convertValue(value, type);
644-
}
645-
}
646-
return arguments;
647-
}
648-
649-
private static Object convertValue(String value, Class<?> targetType) {
650-
if(Boolean.class.equals(targetType) || Boolean.TYPE.equals(targetType)) return Boolean.parseBoolean(value);
651-
if(Byte.class.equals(targetType) || Byte.TYPE.equals(targetType)) return Byte.parseByte(value);
652-
if(Short.class.equals(targetType) || Short.TYPE.equals(targetType)) return Short.parseShort(value);
653-
if(Integer.class.equals(targetType) || Integer.TYPE.equals(targetType)) return Integer.parseInt(value);
654-
if(Long.class.equals(targetType) || Long.TYPE.equals(targetType)) return Long.parseLong(value);
655-
if(Float.class.equals(targetType) || Float.TYPE.equals(targetType)) return Float.parseFloat(value);
656-
if(Double.class.equals(targetType) || Double.TYPE.equals(targetType)) return Double.parseDouble(value);
657-
if(BigInteger.class.equals(targetType)) return new BigInteger(value);
658-
if(BigDecimal.class.equals(targetType)) return new BigDecimal(value);
659-
if(Date.class.equals(targetType)) return DateUtils.parse(value);
660-
if(java.sql.Date.class.equals(targetType)) return java.sql.Date.valueOf(value);
661-
if(java.sql.Time.class.equals(targetType)) return java.sql.Time.valueOf(value);
662-
if(java.sql.Timestamp.class.equals(targetType)) return java.sql.Timestamp.valueOf(value);
663-
if(LocalDate.class.equals(targetType)) return LocalDate.parse(value);
664-
if(LocalTime.class.equals(targetType)) return LocalTime.parse(value);
665-
if(LocalDateTime.class.equals(targetType)) return LocalDateTime.parse(value);
666-
return value;
667-
}
668628

669-
private static Object convertArray(Object array, Class<?> targetType) {
670-
Object[] values = (Object[]) array;
671-
Object convertedValuesArray = Array.newInstance(targetType.getComponentType(), values.length);
672-
for (int i = 0; i < values.length; i++) {
673-
Array.set(convertedValuesArray, i, convertValue((String) values[i], targetType.getComponentType()));
674-
}
675-
return convertedValuesArray;
676-
}
629+
677630

678631
}

0 commit comments

Comments
 (0)