Skip to content

Commit d83691e

Browse files
laurentschoelenslaurentschoelens
committed
[highsource#590] remove commons-lang3 dependency
1 parent 79b4f54 commit d83691e

File tree

67 files changed

+341
-242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+341
-242
lines changed

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package org.jvnet.jaxb2_commons.plugin.codegenerator;
22

3-
import org.apache.commons.lang3.Validate;
4-
53
import com.sun.codemodel.JCodeModel;
64

5+
import java.util.Objects;
6+
77
public abstract class AbstractCodeGenerationImplementor<A extends Arguments<A>>
88
implements CodeGenerationImplementor<A> {
99

1010
private final JCodeModel codeModel;
1111

1212
public AbstractCodeGenerationImplementor(JCodeModel codeModel) {
13-
this.codeModel = Validate.notNull(codeModel);
13+
this.codeModel = Objects.requireNonNull(codeModel, "codeModel must not be null");
1414
}
1515

1616
@Override

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.jvnet.jaxb2_commons.plugin.codegenerator;
22

3-
import org.apache.commons.lang3.Validate;
4-
53
import com.sun.codemodel.JCodeModel;
64

5+
import java.util.Objects;
6+
77
public abstract class AbstractCodeGenerator<A extends Arguments<A>> implements
88
CodeGenerator<A> {
99

@@ -13,8 +13,8 @@ public abstract class AbstractCodeGenerator<A extends Arguments<A>> implements
1313

1414
public AbstractCodeGenerator(CodeGenerator<A> codeGenerator,
1515
CodeGenerationImplementor<A> implementor) {
16-
this.codeGenerator = Validate.notNull(codeGenerator);
17-
this.implementor = Validate.notNull(implementor);
16+
this.codeGenerator = Objects.requireNonNull(codeGenerator, "codeGenerator must not be null");
17+
this.implementor = Objects.requireNonNull(implementor, "implementor must not be null");
1818
this.codeModel = implementor.getCodeModel();
1919
}
2020

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import java.util.List;
66
import java.util.Map;
77
import java.util.Map.Entry;
8+
import java.util.Objects;
89

910
import javax.xml.bind.JAXBElement;
1011

11-
import org.apache.commons.lang3.Validate;
1212
import org.jvnet.jaxb2_commons.codemodel.JCMType;
1313
import org.jvnet.jaxb2_commons.codemodel.JCMTypeFactory;
1414

@@ -29,7 +29,7 @@ public class CodeGenerationAbstraction<A extends Arguments<A>> implements
2929

3030
public CodeGenerationAbstraction(CodeGenerationImplementor<A> generationImplementor) {
3131

32-
this.implementor = Validate.notNull(generationImplementor);
32+
this.implementor = Objects.requireNonNull(generationImplementor, "generationImplementor must not be null");
3333
this.codeModel = generationImplementor.getCodeModel();
3434

3535
addCodeGenerator(this.codeModel.BOOLEAN, new BooleanCodeGenerator<A>(

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import java.util.Collections;
55
import java.util.HashSet;
66
import java.util.List;
7+
import java.util.Objects;
78
import java.util.Set;
89

910
import javax.xml.namespace.QName;
1011

11-
import org.apache.commons.lang3.Validate;
1212
import org.jvnet.jaxb2_commons.codemodel.JCMTypeFactory;
1313

1414
import com.sun.codemodel.JBlock;
@@ -23,7 +23,7 @@ public class JAXBElementCodeGenerator<A extends Arguments<A>> extends
2323
public JAXBElementCodeGenerator(CodeGenerator<A> codeGenerator,
2424
CodeGenerationImplementor<A> implementor, JCMTypeFactory typeFactory) {
2525
super(codeGenerator, implementor);
26-
this.typeFactory = Validate.notNull(typeFactory);
26+
this.typeFactory = Objects.requireNonNull(typeFactory, "typeFactory is null");
2727
}
2828

2929
private JCMTypeFactory getTypeFactory() {
@@ -33,7 +33,9 @@ private JCMTypeFactory getTypeFactory() {
3333
@Override
3434
public void generate(JBlock block, JType type,
3535
Collection<JType> possibleTypes, boolean isAlwaysSet, A arguments) {
36-
Validate.isInstanceOf(JClass.class, type);
36+
if (!(type instanceof JClass)) {
37+
throw new IllegalArgumentException("Type must be a JClass.");
38+
}
3739

3840
final JClass _class = (JClass) type;
3941

@@ -62,7 +64,9 @@ private Set<JType> getPossibleValueTypes(Collection<JType> possibleTypes) {
6264
final Set<JType> possibleValueTypes = new HashSet<JType>();
6365

6466
for (JType possibleType : possibleTypes) {
65-
Validate.isInstanceOf(JClass.class, possibleType);
67+
if (!(possibleType instanceof JClass)) {
68+
throw new IllegalArgumentException("possibleType must be a JClass.");
69+
}
6670
final JClass possibleClass = (JClass) possibleType;
6771
if (possibleClass.getTypeParameters().size() == 1) {
6872
possibleValueTypes

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
import javax.xml.bind.JAXBElement;
88

9-
import org.apache.commons.lang3.Validate;
10-
119
import com.sun.codemodel.JBlock;
1210
import com.sun.codemodel.JClass;
1311
import com.sun.codemodel.JType;
@@ -23,7 +21,9 @@ public ListCodeGenerator(CodeGenerator<A> codeGenerator,
2321
@Override
2422
public void generate(JBlock block, JType type,
2523
Collection<JType> possibleTypes, boolean isAlwaysSet, A arguments) {
26-
Validate.isInstanceOf(JClass.class, type);
24+
if (!(type instanceof JClass)) {
25+
throw new IllegalArgumentException("Type must be a JClass.");
26+
}
2727
final JClass _class = (JClass) type;
2828

2929
final JClass jaxbElementClass = getCodeModel().ref(JAXBElement.class);

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/commons_lang/XjcCommonsLangPlugin.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
*/
1616
package org.jvnet.jaxb2_commons.plugin.commons_lang;
1717

18-
import org.apache.commons.lang3.builder.EqualsBuilder;
19-
import org.apache.commons.lang3.builder.HashCodeBuilder;
20-
import org.apache.commons.lang3.builder.ToStringBuilder;
21-
import org.apache.commons.lang3.builder.ToStringStyle;
2218
import org.xml.sax.ErrorHandler;
2319

2420
import com.sun.codemodel.JCodeModel;
@@ -66,12 +62,15 @@
6662
*
6763
* The default ToStringStyle adopted by this plugin is MULTI_LINE_STYLE.
6864
*
69-
* @see org.apache.commons.lang3.builder.ToStringStyle
7065
* @author Hanson Char
7166
*/
7267
public class XjcCommonsLangPlugin extends Plugin
7368
{
7469
private static final String TOSTRING_STYLE_PARAM = "-Xcommons-lang:ToStringStyle=";
70+
private static final String TOSTRINGSTYLE_CLASSNAME = "org.apache.commons.lang3.builder.ToStringStyle";
71+
private static final String EQUALSBUILDER_CLASSNAME = "org.apache.commons.lang3.builder.EqualsBuilder";
72+
private static final String HASHCODEBUILDER_CLASSNAME = "org.apache.commons.lang3.builder.HashCodeBuilder";
73+
private static final String TOSTRINGBUILDER_CLASSNAME = "org.apache.commons.lang3.builder.ToStringBuilder";
7574
private String toStringStyle = "MULTI_LINE_STYLE";
7675
private Class<?> customToStringStyle;
7776

@@ -118,15 +117,15 @@ private void createToStringMethod(JDefinedClass implClass)
118117
toStringMethod.annotate(Override.class);
119118
final JExpression toStringStyleExpr =
120119
customToStringStyle == null
121-
? codeModel.ref(ToStringStyle.class)
120+
? codeModel.ref(TOSTRINGSTYLE_CLASSNAME)
122121
.staticRef(toStringStyle)
123122
: JExpr._new(
124123
codeModel.ref(customToStringStyle))
125124
;
126125
// Invoke ToStringBuilder.reflectionToString(Object,StringStyle)
127126
toStringMethod.body()
128127
._return(
129-
codeModel.ref(ToStringBuilder.class)
128+
codeModel.ref(TOSTRINGBUILDER_CLASSNAME)
130129
.staticInvoke("reflectionToString")
131130
.arg(JExpr._this())
132131
.arg(toStringStyleExpr)
@@ -144,7 +143,7 @@ private void createEqualsMethod(JDefinedClass implClass)
144143
toStringMethod.annotate(Override.class);
145144
// Invoke EqualsBuilder.reflectionEquals(Object,Object);
146145
toStringMethod.body()._return(
147-
codeModel.ref(EqualsBuilder.class)
146+
codeModel.ref(EQUALSBUILDER_CLASSNAME)
148147
.staticInvoke("reflectionEquals")
149148
.arg(JExpr._this())
150149
.arg(that)
@@ -161,7 +160,7 @@ private void createHashCodeMethod(JDefinedClass implClass)
161160
toStringMethod.annotate(Override.class);
162161
// Invoke EqualsBuilder.reflectionHashCode(Object);
163162
toStringMethod.body()._return(
164-
codeModel.ref(HashCodeBuilder.class)
163+
codeModel.ref(HASHCODEBUILDER_CLASSNAME)
165164
.staticInvoke("reflectionHashCode")
166165
.arg(JExpr._this())
167166
);
@@ -179,9 +178,9 @@ public int parseArgument(Options opt, String[] args, int i)
179178
{
180179
toStringStyle = arg.substring(TOSTRING_STYLE_PARAM.length());
181180
try {
182-
ToStringStyle.class.getField(toStringStyle);
181+
Class.forName(TOSTRINGSTYLE_CLASSNAME).getField(toStringStyle);
183182
return 1;
184-
} catch (SecurityException e) {
183+
} catch (ClassNotFoundException | SecurityException e) {
185184
throw new BadCommandLineException(e.getMessage());
186185
} catch (NoSuchFieldException ignore) {
187186
}

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import java.util.Collections;
1414
import java.util.List;
1515
import java.util.Map;
16-
17-
import org.apache.commons.lang3.Validate;
16+
import java.util.Objects;
1817

1918
import com.sun.codemodel.JClass;
2019
import com.sun.codemodel.JCodeModel;
@@ -33,7 +32,7 @@ public JavaTypeParser() {
3332
}
3433

3534
public JavaTypeParser(Map<String, JClass> knownClasses) {
36-
Validate.notNull(knownClasses);
35+
Objects.requireNonNull(knownClasses, "Known classes must not be null. Use empty map instead of null to indicate no known classes.");
3736
this.typeToJTypeConvertingVisitor = new TypeToJTypeConvertingVisitor(
3837
knownClasses);
3938

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import java.util.ArrayList;
1313
import java.util.List;
1414
import java.util.Map;
15-
16-
import org.apache.commons.lang3.Validate;
15+
import java.util.Objects;
1716

1817
import com.sun.codemodel.JClass;
1918
import com.sun.codemodel.JCodeModel;
@@ -25,7 +24,7 @@ public class TypeToJTypeConvertingVisitor extends
2524
private final Map<String, JClass> knownClasses;
2625

2726
public TypeToJTypeConvertingVisitor(Map<String, JClass> knownClasses) {
28-
Validate.notNull(knownClasses);
27+
Objects.requireNonNull(knownClasses, "Known classes must not be null. Use empty map instead of null to indicate no known classes.");
2928
this.knownClasses = knownClasses;
3029
}
3130

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import java.util.Arrays;
44
import java.util.Collection;
5+
import java.util.Objects;
56

67
import javax.xml.namespace.QName;
78

8-
import org.apache.commons.lang3.Validate;
99
import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin;
1010
import org.jvnet.jaxb2_commons.plugin.CustomizedIgnoring;
1111
import org.jvnet.jaxb2_commons.plugin.Ignoring;
@@ -97,7 +97,7 @@ public String getMode() {
9797
}
9898

9999
public void setMode(String mode) {
100-
Validate.notNull(mode);
100+
Objects.requireNonNull(mode, "Mode must not be null.");
101101
try {
102102
this.mode = Mode.valueOf(mode);
103103
} catch (IllegalArgumentException iaex) {

‎basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.Collection;
44
import java.util.ListIterator;
5+
import java.util.Objects;
56

6-
import org.apache.commons.lang3.Validate;
77
import org.jvnet.jaxb2_commons.plugin.codegenerator.Arguments;
88

99
import com.sun.codemodel.JBlock;
@@ -28,11 +28,11 @@ public class EqualsArguments implements Arguments<EqualsArguments> {
2828
public EqualsArguments(JCodeModel codeModel, JVar leftValue,
2929
JExpression leftHasSetValue, JVar rightValue,
3030
JExpression rightHasSetValue) {
31-
this.codeModel = Validate.notNull(codeModel);
32-
this.leftValue = Validate.notNull(leftValue);
33-
this.leftHasSetValue = Validate.notNull(leftHasSetValue);
34-
this.rightValue = Validate.notNull(rightValue);
35-
this.rightHasSetValue = Validate.notNull(rightHasSetValue);
31+
this.codeModel = Objects.requireNonNull(codeModel, "codeModel must not be null.");
32+
this.leftValue = Objects.requireNonNull(leftValue, "leftValue must not be null.");
33+
this.leftHasSetValue = Objects.requireNonNull(leftHasSetValue, "leftHasSetValue must not be null.");
34+
this.rightValue = Objects.requireNonNull(rightValue, "rightValue must not be null.");
35+
this.rightHasSetValue = Objects.requireNonNull(rightHasSetValue, "rightHasSetValue must not be null.");
3636
}
3737

3838
private JCodeModel getCodeModel() {

0 commit comments

Comments
 (0)