Resolved deprecated method(s).

plugins/src/main/java/org/jvnet/basicjaxb/plugin/codegenerator/AbstractCodeGenerationImplementor.java

@@ -1,6 +1,6 @@
 package org.jvnet.basicjaxb.plugin.codegenerator;
 
-import org.apache.commons.lang3.Validate;
+import static java.util.Objects.requireNonNull;
 
 import com.sun.codemodel.JCodeModel;
 
@@ -16,6 +16,6 @@ public JCodeModel getCodeModel()
 
 	public AbstractCodeGenerationImplementor(JCodeModel codeModel)
 	{
-		this.codeModel = Validate.notNull(codeModel);
+		this.codeModel = requireNonNull(codeModel);
 	}
 }

plugins/src/main/java/org/jvnet/basicjaxb/plugin/codegenerator/AbstractCodeGenerator.java

@@ -1,6 +1,6 @@
 package org.jvnet.basicjaxb.plugin.codegenerator;
 
-import org.apache.commons.lang3.Validate;
+import static java.util.Objects.requireNonNull;
 
 import com.sun.codemodel.JCodeModel;
 
@@ -27,8 +27,8 @@ public JCodeModel getCodeModel()
 
 	public AbstractCodeGenerator(CodeGenerator<A> codeGenerator, CodeGenerationImplementor<A> implementor)
 	{
-		this.codeGenerator = Validate.notNull(codeGenerator);
-		this.implementor = Validate.notNull(implementor);
+		this.codeGenerator = requireNonNull(codeGenerator);
+		this.implementor = requireNonNull(implementor);
 		this.codeModel = implementor.getCodeModel();
 	}
 }

plugins/src/main/java/org/jvnet/basicjaxb/plugin/codegenerator/CodeGenerationAbstraction.java

@@ -1,21 +1,22 @@
 package org.jvnet.basicjaxb.plugin.codegenerator;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import jakarta.xml.bind.JAXBElement;
-
-import org.apache.commons.lang3.Validate;
 import org.jvnet.basicjaxb.codemodel.JCMType;
 import org.jvnet.basicjaxb.codemodel.JCMTypeFactory;
 
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JType;
 
+import jakarta.xml.bind.JAXBElement;
+
 public class CodeGenerationAbstraction<A extends Arguments<A>> implements
 		CodeGenerator<A> {
 
@@ -29,7 +30,7 @@ public class CodeGenerationAbstraction<A extends Arguments<A>> implements
 
 	public CodeGenerationAbstraction(CodeGenerationImplementor<A> generationImplementor) {
 
-		this.implementor = Validate.notNull(generationImplementor);
+		this.implementor = requireNonNull(generationImplementor);
 		this.codeModel = generationImplementor.getCodeModel();
 
 		addCodeGenerator(this.codeModel.BOOLEAN, new BooleanCodeGenerator<A>(

plugins/src/main/java/org/jvnet/basicjaxb/plugin/codegenerator/JAXBElementCodeGenerator.java

@@ -1,5 +1,7 @@
 package org.jvnet.basicjaxb.plugin.codegenerator;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -23,7 +25,7 @@ public class JAXBElementCodeGenerator<A extends Arguments<A>> extends
 	public JAXBElementCodeGenerator(CodeGenerator<A> codeGenerator,
 			CodeGenerationImplementor<A> implementor, JCMTypeFactory typeFactory) {
 		super(codeGenerator, implementor);
-		this.typeFactory = Validate.notNull(typeFactory);
+		this.typeFactory = requireNonNull(typeFactory);
 	}
 
 	private JCMTypeFactory getTypeFactory() {

plugins/src/main/java/org/jvnet/basicjaxb/plugin/inheritance/util/JavaTypeParser.java

@@ -1,26 +1,25 @@
 package org.jvnet.basicjaxb.plugin.inheritance.util;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-
-import japa.parser.JavaParser;
-import japa.parser.ParseException;
-import japa.parser.ast.CompilationUnit;
-import japa.parser.ast.body.ClassOrInterfaceDeclaration;
-import japa.parser.ast.body.TypeDeclaration;
-import japa.parser.ast.type.ClassOrInterfaceType;
+import static java.util.Objects.requireNonNull;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.Validate;
-
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JType;
 
+import japa.parser.JavaParser;
+import japa.parser.ParseException;
+import japa.parser.ast.CompilationUnit;
+import japa.parser.ast.body.ClassOrInterfaceDeclaration;
+import japa.parser.ast.body.TypeDeclaration;
+import japa.parser.ast.type.ClassOrInterfaceType;
+
 /**
  * A utility to parse source code of a Java class into a {@link JClass}.
  */
@@ -35,7 +34,7 @@ public JavaTypeParser()
 
 	public JavaTypeParser(Map<String, JClass> knownClasses)
 	{
-		Validate.notNull(knownClasses);
+		requireNonNull(knownClasses);
 		this.typeToJTypeConvertingVisitor = new TypeToJTypeConvertingVisitor(knownClasses);
 	}
 

plugins/src/main/java/org/jvnet/basicjaxb/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java

@@ -1,23 +1,23 @@
 package org.jvnet.basicjaxb.plugin.inheritance.util;
 
-import japa.parser.ast.type.ClassOrInterfaceType;
-import japa.parser.ast.type.PrimitiveType;
-import japa.parser.ast.type.ReferenceType;
-import japa.parser.ast.type.Type;
-import japa.parser.ast.type.VoidType;
-import japa.parser.ast.type.WildcardType;
-import japa.parser.ast.visitor.GenericVisitorAdapter;
+import static java.util.Objects.requireNonNull;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.Validate;
-
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JType;
 
+import japa.parser.ast.type.ClassOrInterfaceType;
+import japa.parser.ast.type.PrimitiveType;
+import japa.parser.ast.type.ReferenceType;
+import japa.parser.ast.type.Type;
+import japa.parser.ast.type.VoidType;
+import japa.parser.ast.type.WildcardType;
+import japa.parser.ast.visitor.GenericVisitorAdapter;
+
 /**
  * <p>
  * Represents an operation to be performed on elements of an {@link JCodeModel} structure. 
@@ -42,7 +42,7 @@ public class TypeToJTypeConvertingVisitor extends GenericVisitorAdapter<JType, J
 
 	public TypeToJTypeConvertingVisitor(Map<String, JClass> knownClasses)
 	{
-		Validate.notNull(knownClasses);
+		requireNonNull(knownClasses);
 		this.knownClasses = knownClasses;
 	}
 

plugins/src/main/java/org/jvnet/basicjaxb/plugin/setters/SettersPlugin.java

@@ -1,6 +1,7 @@
 package org.jvnet.basicjaxb.plugin.setters;
 
 import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
 import static org.jvnet.basicjaxb.plugin.setters.Customizations.IGNORED_ELEMENT_NAME;
 import static org.jvnet.basicjaxb.util.CodeModelUtils.groupMethods;
 import static org.jvnet.basicjaxb.util.LocatorUtils.toLocation;
@@ -10,7 +11,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.basicjaxb.plugin.AbstractParameterizablePlugin;
 import org.jvnet.basicjaxb.plugin.AbstractPlugin;
 import org.jvnet.basicjaxb.plugin.CustomizedIgnoring;
@@ -141,7 +141,7 @@ public String getMode()
 	}
 	public void setMode(String mode)
 	{
-		Validate.notNull(mode);
+		requireNonNull(mode);
 		try
 		{
 			this.mode = Mode.valueOf(mode);

plugins/src/main/java/org/jvnet/basicjaxb/plugin/simpleequals/EqualsArguments.java

@@ -1,9 +1,10 @@
 package org.jvnet.basicjaxb.plugin.simpleequals;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.ListIterator;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.basicjaxb.plugin.codegenerator.Arguments;
 
 import com.sun.codemodel.JBlock;
@@ -28,11 +29,11 @@ public class EqualsArguments implements Arguments<EqualsArguments> {
 	public EqualsArguments(JCodeModel codeModel, JVar leftValue,
 			JExpression leftHasSetValue, JVar rightValue,
 			JExpression rightHasSetValue) {
-		this.codeModel = Validate.notNull(codeModel);
-		this.leftValue = Validate.notNull(leftValue);
-		this.leftHasSetValue = Validate.notNull(leftHasSetValue);
-		this.rightValue = Validate.notNull(rightValue);
-		this.rightHasSetValue = Validate.notNull(rightHasSetValue);
+		this.codeModel = requireNonNull(codeModel);
+		this.leftValue = requireNonNull(leftValue);
+		this.leftHasSetValue = requireNonNull(leftHasSetValue);
+		this.rightValue = requireNonNull(rightValue);
+		this.rightHasSetValue = requireNonNull(rightHasSetValue);
 	}
 
 	private JCodeModel getCodeModel() {

plugins/src/main/java/org/jvnet/basicjaxb/plugin/simpleequals/EqualsCodeGenerator.java

@@ -1,6 +1,7 @@
 package org.jvnet.basicjaxb.plugin.simpleequals;
 
-import org.apache.commons.lang3.Validate;
+import static java.util.Objects.requireNonNull;
+
 import org.jvnet.basicjaxb.plugin.codegenerator.CodeGenerationAbstraction;
 
 import com.sun.codemodel.JCodeModel;
@@ -9,6 +10,6 @@ public class EqualsCodeGenerator extends CodeGenerationAbstraction<EqualsArgumen
 {
 	public EqualsCodeGenerator(JCodeModel codeModel)
 	{
-		super(new EqualsCodeGenerationImplementor(Validate.notNull(codeModel)));
+		super(new EqualsCodeGenerationImplementor(requireNonNull(codeModel)));
 	}
 }

plugins/src/main/java/org/jvnet/basicjaxb/plugin/simplehashcode/HashCodeArguments.java

@@ -1,9 +1,10 @@
 package org.jvnet.basicjaxb.plugin.simplehashcode;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.ListIterator;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.basicjaxb.plugin.codegenerator.Arguments;
 
 import com.sun.codemodel.JBlock;
@@ -24,11 +25,11 @@ public class HashCodeArguments implements Arguments<HashCodeArguments> {
 
 	public HashCodeArguments(JCodeModel codeModel, JVar currentHashCode,
 			int multiplier, JVar value, JExpression hasSetValue) {
-		this.codeModel = Validate.notNull(codeModel);
-		this.currentHashCode = Validate.notNull(currentHashCode);
+		this.codeModel = requireNonNull(codeModel);
+		this.currentHashCode = requireNonNull(currentHashCode);
 		this.multiplier = multiplier;
-		this.value = Validate.notNull(value);
-		this.hasSetValue = Validate.notNull(hasSetValue);
+		this.value = requireNonNull(value);
+		this.hasSetValue = requireNonNull(hasSetValue);
 	}
 
 	private JCodeModel getCodeModel() {

plugins/src/main/java/org/jvnet/basicjaxb/plugin/simplehashcode/HashCodeCodeGenerator.java

@@ -1,6 +1,7 @@
 package org.jvnet.basicjaxb.plugin.simplehashcode;
 
-import org.apache.commons.lang3.Validate;
+import static java.util.Objects.requireNonNull;
+
 import org.jvnet.basicjaxb.plugin.codegenerator.CodeGenerationAbstraction;
 
 import com.sun.codemodel.JCodeModel;
@@ -9,6 +10,6 @@ public class HashCodeCodeGenerator extends CodeGenerationAbstraction<HashCodeArg
 {
 	public HashCodeCodeGenerator(JCodeModel codeModel)
 	{
-		super(new HashCodeCodeGenerationImplementor(Validate.notNull(codeModel)));
+		super(new HashCodeCodeGenerationImplementor(requireNonNull(codeModel)));
 	}
 }

plugins/src/main/java/org/jvnet/basicjaxb/plugin/simpletostring/ToStringArguments.java

@@ -1,10 +1,11 @@
 package org.jvnet.basicjaxb.plugin.simpletostring;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.ListIterator;
 import java.util.Map;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.basicjaxb.plugin.codegenerator.Arguments;
 
 import com.sun.codemodel.JBlock;
@@ -21,10 +22,10 @@ public class ToStringArguments implements Arguments<ToStringArguments>
 	public ToStringArguments(JCodeModel codeModel, JVar stringBuilder, JVar value, JExpression hasSetValue,
 		String fieldSeparator, String fieldName, boolean showChildItems, boolean hasDefaultValue)
 	{
-		this.codeModel = Validate.notNull(codeModel);
-		this.stringBuilder = Validate.notNull(stringBuilder);
-		this.value = Validate.notNull(value);
-		this.hasSetValue = Validate.notNull(hasSetValue);
+		this.codeModel = requireNonNull(codeModel);
+		this.stringBuilder = requireNonNull(stringBuilder);
+		this.value = requireNonNull(value);
+		this.hasSetValue = requireNonNull(hasSetValue);
 		this.fieldSeparator = fieldSeparator;
 		this.fieldName = fieldName;
 		this.showChildItems = showChildItems;

plugins/src/main/java/org/jvnet/basicjaxb/plugin/simpletostring/ToStringCodeGenerator.java

@@ -1,6 +1,7 @@
 package org.jvnet.basicjaxb.plugin.simpletostring;
 
-import org.apache.commons.lang3.Validate;
+import static java.util.Objects.requireNonNull;
+
 import org.jvnet.basicjaxb.plugin.codegenerator.CodeGenerationAbstraction;
 
 import com.sun.codemodel.JCodeModel;
@@ -9,6 +10,6 @@ public class ToStringCodeGenerator extends CodeGenerationAbstraction<ToStringArg
 {
 	public ToStringCodeGenerator(JCodeModel codeModel)
 	{
-		super(new ToStringCodeGenerationImplementor(Validate.notNull(codeModel)));
+		super(new ToStringCodeGenerationImplementor(requireNonNull(codeModel)));
 	}
 }

runtime/src/main/java/org/jvnet/basicjaxb/lang/Validate.java

@@ -1,5 +1,7 @@
 package org.jvnet.basicjaxb.lang;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -26,7 +28,7 @@ public static void notEmpty(@SuppressWarnings("rawtypes") Collection collection)
 	}
 
 	public static void noNullElements(Collection<?> collection) {
-		Validate.notNull(collection);
+		requireNonNull(collection);
 		int i = 0;
 		for (Iterator<?> it = collection.iterator(); it.hasNext(); i++) {
 			if (it.next() == null) {

runtime/src/main/java/org/jvnet/basicjaxb/xml/bind/model/concrete/CMAttributePropertyInfo.java

@@ -1,9 +1,10 @@
 package org.jvnet.basicjaxb.xml.bind.model.concrete;
 
+import static java.util.Objects.requireNonNull;
+
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 
-import org.jvnet.basicjaxb.lang.Validate;
 import org.jvnet.basicjaxb.xml.bind.model.MAttributePropertyInfo;
 import org.jvnet.basicjaxb.xml.bind.model.MClassInfo;
 import org.jvnet.basicjaxb.xml.bind.model.MPropertyInfoVisitor;
@@ -21,7 +22,7 @@ public CMAttributePropertyInfo(MPropertyInfoOrigin origin,
 			String defaultValue, NamespaceContext defaultValueNamespaceContext) {
 		super(origin, classInfo, privateName, false, typeInfo, required,
 				defaultValue, defaultValueNamespaceContext);
-		Validate.notNull(attributeName);
+		requireNonNull(attributeName);
 		this.attributeName = attributeName;
 	}
 

runtime/src/main/java/org/jvnet/basicjaxb/xml/bind/model/concrete/CMBuiltinLeafInfo.java

@@ -1,8 +1,9 @@
 package org.jvnet.basicjaxb.xml.bind.model.concrete;
 
+import static java.util.Objects.requireNonNull;
+
 import javax.xml.namespace.QName;
 
-import org.jvnet.basicjaxb.lang.Validate;
 import org.jvnet.basicjaxb.xml.bind.model.MBuiltinLeafInfo;
 import org.jvnet.basicjaxb.xml.bind.model.MCustomizations;
 import org.jvnet.basicjaxb.xml.bind.model.MTypeInfoVisitor;
@@ -17,9 +18,9 @@ public class CMBuiltinLeafInfo<T, C extends T> implements MBuiltinLeafInfo<T, C>
 
 	public CMBuiltinLeafInfo(MBuiltinLeafInfoOrigin origin, T targetType,
 			QName typeName) {
-		Validate.notNull(origin);
-		Validate.notNull(targetType);
-		Validate.notNull(typeName);
+		requireNonNull(origin);
+		requireNonNull(targetType);
+		requireNonNull(typeName);
 		this.origin = origin;
 		this.targetType = targetType;
 		this.typeName = typeName;