[#540] Remove commons-lang3 and commons-text from jaxb-annox

jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/AnnotationTarget.java

@@ -36,7 +36,8 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.commons.lang3.Validate;
+import org.jvnet.jaxb.annox.util.StringUtils;
+import org.jvnet.jaxb.annox.util.Validate;
 import org.jvnet.jaxb.plugin.annotate.AnnotatePlugin;
 import org.jvnet.jaxb.plugin.removeannotation.RemoveAnnotationPlugin;
 import org.jvnet.jaxb.util.FieldAccessorUtils;
@@ -333,7 +334,7 @@ public static AnnotationTarget getAnnotationTarget(final Element element,
 				|| RemoveAnnotationPlugin.REMOVE_ANNOTATION_QNAME.equals(name)
 				|| RemoveAnnotationPlugin.REMOVE_ANNOTATION_FROM_PROPERTY_QNAME.equals(name)) {
 			final String target = element.getAttribute("target");
-			if (target == null || "".equals(target)) {
+			if (StringUtils.isEmpty(target)) {
 				return defaultAnnotationTarget;
 			} else {
 				return AnnotationTarget.getAnnotationTarget(target);

jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatePlugin.java

@@ -36,10 +36,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.commons.lang3.StringUtils;
 import org.jvnet.jaxb.annox.Constants;
 import org.jvnet.jaxb.annox.model.XAnnotation;
 import org.jvnet.jaxb.annox.parser.XAnnotationParser;
+import org.jvnet.jaxb.annox.util.StringUtils;
 import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin;
 import org.jvnet.jaxb.plugin.AnnotationTarget;
 import org.jvnet.jaxb.plugin.removeannotation.RemoveAnnotationPlugin;
@@ -431,7 +431,7 @@ private void annotate(final JCodeModel codeModel,
 				}
 			} else if (node.getNodeType() == Node.TEXT_NODE) {
 				final String nodeValue = node.getNodeValue();
-				if (nodeValue != null && StringUtils.isNotBlank(nodeValue)) {
+				if (nodeValue != null && !StringUtils.isBlank(nodeValue)) {
 					try {
 						final XAnnotation<?> annotation = getAnnotationParser()
 								.parse(nodeValue);

jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/removeannotation/RemoveAnnotationPlugin.java

@@ -37,8 +37,8 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.commons.lang3.StringUtils;
 import org.jvnet.jaxb.annox.Constants;
+import org.jvnet.jaxb.annox.util.StringUtils;
 import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin;
 import org.jvnet.jaxb.plugin.AnnotationTarget;
 import org.jvnet.jaxb.util.CustomizationUtils;

jaxb-annox-parent/jaxb-annox/pom.xml

@@ -41,14 +41,6 @@
       <artifactId>jaxb-runtime</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/annotation/AnnotationClassNotFoundException.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb.annox.annotation;
 
-import org.apache.commons.lang3.Validate;
+import java.util.Objects;
 
 public class AnnotationClassNotFoundException extends Exception {
 
@@ -10,7 +10,7 @@ public class AnnotationClassNotFoundException extends Exception {
 
 	public AnnotationClassNotFoundException(String className, Throwable cause) {
 		super("Annotation class [" + className + "] could not be found.", cause);
-		Validate.notNull(className);
+        Objects.requireNonNull(className, "className should not be null");
 		this.className = className;
 	}
 

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/javaparser/AnnotationExprParser.java

@@ -7,13 +7,12 @@
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.TypeDeclaration;
 import com.github.javaparser.ast.expr.AnnotationExpr;
+import org.jvnet.jaxb.annox.util.Validate;
 
 import java.io.StringReader;
 import java.text.MessageFormat;
 import java.util.List;
 
-import org.apache.commons.lang3.Validate;
-
 public class AnnotationExprParser {
 
 	public List<AnnotationExpr> parse(String text) throws ParseException {

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotatedElement.java

@@ -1,10 +1,10 @@
 package org.jvnet.jaxb.annox.model;
 
+import org.jvnet.jaxb.annox.util.Validate;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 
-import org.apache.commons.lang3.Validate;
-
 /**
  * Defines an annotated element.
  *

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotation.java

@@ -12,9 +12,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField;
 import org.jvnet.jaxb.annox.parser.XGenericFieldParser;
+import org.jvnet.jaxb.annox.util.Validate;
 
 /**
  * Defines an xannotation.

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationFieldValueVisitorAdapter.java

@@ -1,6 +1,5 @@
 //package org.jvnet.jaxb.annox.model;
 //
-//import org.apache.commons.lang3.Validate;
 //import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField;
 //import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField;
 //import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField;

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XAnnotationInvocationHandler.java

@@ -16,8 +16,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField;
+import org.jvnet.jaxb.annox.util.Validate;
 
 public final class XAnnotationInvocationHandler implements InvocationHandler {
 

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XClass.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb.annox.model;
 
-import org.apache.commons.lang3.Validate;
+import org.jvnet.jaxb.annox.util.Validate;
 
 /**
  * Defines an annotated class.

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XConstructor.java

@@ -3,8 +3,8 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.reflect.ParameterizedAnnotatedElement;
+import org.jvnet.jaxb.annox.util.Validate;
 
 /**
  * Defines an annotated constructor.

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XMember.java

@@ -2,9 +2,7 @@
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Member;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
+import java.util.Objects;
 
 /**
  * Defines an annotated member.
@@ -48,8 +46,7 @@ public XMember(final T member, final XAnnotation<?>[] xannotations) {
 
 	@Override
 	public int hashCode() {
-		return new HashCodeBuilder().append(getMember())
-				.append(getXAnnotations()).toHashCode();
+		return Objects.hash(getMember(), getXAnnotations());
 	}
 
 	@Override
@@ -63,7 +60,7 @@ public boolean equals(Object obj) {
 			return true;
 		}
 		final XMember<?> rhs = (XMember<?>) obj;
-		return new EqualsBuilder().append(getMember(), rhs.getMember())
-				.append(getXAnnotations(), rhs.getXAnnotations()).isEquals();
+		return Objects.equals(getMember(), rhs.getMember())
+            && Objects.equals(getXAnnotations(), rhs.getXAnnotations());
 	}
 }

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XMethod.java

@@ -3,8 +3,8 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.reflect.ParameterizedAnnotatedElement;
+import org.jvnet.jaxb.annox.util.Validate;
 
 /**
  * Defines an annotated method.

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XPackage.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb.annox.model;
 
-import org.apache.commons.lang3.Validate;
+import org.jvnet.jaxb.annox.util.Validate;
 
 /**
  * Defines an annotated package.

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/XParameter.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb.annox.model;
 
-import org.apache.commons.lang3.Validate;
+import org.jvnet.jaxb.annox.util.Validate;
 
 /**
  * Defines an annotated method or constructor parameter.

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XAnnotationField.java

@@ -1,7 +1,7 @@
 package org.jvnet.jaxb.annox.model.annotation.field;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor;
+import org.jvnet.jaxb.annox.util.Validate;
 
 /**
  * Defines an annotation field.

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/field/XArrayAnnotationField.java

@@ -3,10 +3,10 @@
 import java.lang.reflect.Array;
 import java.text.MessageFormat;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor;
 import org.jvnet.jaxb.annox.model.annotation.value.XAnnotationValue;
 import org.jvnet.jaxb.annox.util.ClassUtils;
+import org.jvnet.jaxb.annox.util.Validate;
 
 public class XArrayAnnotationField<T> extends XAnnotationField<T[]> {
 

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XArrayClassAnnotationValue.java

@@ -1,10 +1,10 @@
 package org.jvnet.jaxb.annox.model.annotation.value;
 
+import org.jvnet.jaxb.annox.util.Validate;
+
 import java.lang.reflect.Array;
 import java.util.Arrays;
 
-import org.apache.commons.lang3.Validate;
-
 public class XArrayClassAnnotationValue<A, I> extends
 		XDynamicAnnotationValue<Class<A>> {
 
@@ -15,8 +15,7 @@ public class XArrayClassAnnotationValue<A, I> extends
 	public XArrayClassAnnotationValue(
 			XClassByNameAnnotationValue<I> itemClassByNameAnnotationValue,
 			int dimension) {
-		this.itemClassByNameAnnotationValue = Validate
-				.notNull(itemClassByNameAnnotationValue);
+		this.itemClassByNameAnnotationValue = Validate.notNull(itemClassByNameAnnotationValue);
 		Validate.isTrue(dimension > 0);
 		this.dimension = dimension;
 		String arrayClassName = itemClassByNameAnnotationValue.getClassName();

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XEnumByNameAnnotationValue.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb.annox.model.annotation.value;
 
-import org.apache.commons.lang3.Validate;
+import org.jvnet.jaxb.annox.util.Validate;
 
 public class XEnumByNameAnnotationValue<E extends Enum<E>> extends
 		XDynamicAnnotationValue<E> {

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XStaticAnnotationValue.java

@@ -1,6 +1,6 @@
 package org.jvnet.jaxb.annox.model.annotation.value;
 
-import org.apache.commons.lang3.Validate;
+import org.jvnet.jaxb.annox.util.Validate;
 
 public abstract class XStaticAnnotationValue<T> extends XAnnotationValue<T> {
 

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XStringAnnotationValue.java

@@ -1,13 +1,13 @@
 package org.jvnet.jaxb.annox.model.annotation.value;
 
-import org.apache.commons.text.StringEscapeUtils;
+import org.jvnet.jaxb.annox.util.StringUtils;
 
 public class XStringAnnotationValue extends XStaticAnnotationValue<String> {
 
 	public XStringAnnotationValue(String value) {
         // fix JAP-9 issue : \ needs to be espaced for javaparser to work
         // but will then be escaped again by codemodel to generate annotation
-        super(StringEscapeUtils.unescapeJava(value));
+        super(StringUtils.unescapeJava(value));
 	}
 
 	@Override

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/model/annotation/value/XXAnnotationAnnotationValue.java

@@ -2,8 +2,8 @@
 
 import java.lang.annotation.Annotation;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.model.XAnnotation;
+import org.jvnet.jaxb.annox.util.Validate;
 
 public class XXAnnotationAnnotationValue<A extends Annotation> extends
 		XDynamicAnnotationValue<A> {

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XAnnotationParser.java

@@ -18,12 +18,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.commons.lang3.ClassUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.Constants;
 import org.jvnet.jaxb.annox.annotation.AnnotationClassNotFoundException;
 import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException;
@@ -34,6 +32,9 @@
 import org.jvnet.jaxb.annox.parser.exception.AnnotationElementParseException;
 import org.jvnet.jaxb.annox.parser.exception.AnnotationExpressionParseException;
 import org.jvnet.jaxb.annox.parser.exception.AnnotationStringParseException;
+import org.jvnet.jaxb.annox.util.ClassUtils;
+import org.jvnet.jaxb.annox.util.StringUtils;
+import org.jvnet.jaxb.annox.util.Validate;
 import org.w3c.dom.Element;
 
 public class XAnnotationParser {
@@ -63,7 +64,7 @@ public XAnnotationParser(ClassLoader classLoader) {
 	}
 
 	public XAnnotation<?> parse(final Annotation annotation) {
-		Validate.notNull(annotation, "Annotation must not be null.");
+		Objects.requireNonNull(annotation, "Annotation must not be null.");
 
 		final Class<? extends Annotation> annotationClass = annotation
 				.annotationType();
@@ -92,7 +93,7 @@ public XAnnotation<?>[] parse(final Annotation[] annotations) {
 	@SuppressWarnings("unchecked")
 	public XAnnotation<?> parse(final Element annotationElement)
 			throws AnnotationElementParseException {
-		Validate.notNull(annotationElement,
+        Objects.requireNonNull(annotationElement,
 				"Annotation element must not be null.");
 
 		final String name = annotationElement.getLocalName();
@@ -233,14 +234,13 @@ private List<AnnotationExpr> parseAnnotationExprs(
 	@SuppressWarnings("unchecked")
 	public XAnnotation<?> parse(final AnnotationExpr annotationElement)
 			throws AnnotationExpressionParseException {
-		Validate.notNull(annotationElement,
+        Objects.requireNonNull(annotationElement,
 				"Annotation expression must not be null.");
 		final String className = annotationElement.getName().toString();
 
 		try {
 
-			final Class<?> draftClass = ClassUtils.getClass(classLoader,
-					className);
+			final Class<?> draftClass = ClassUtils.getClass(classLoader, className);
 
 			if (!Annotation.class.isAssignableFrom(draftClass))
 				throw new AnnotationExpressionParseException(annotationElement,

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XArrayAnnotationFieldParser.java

@@ -8,8 +8,6 @@
 import java.text.MessageFormat;
 import java.util.List;
 
-import org.apache.commons.lang3.ClassUtils;
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException;
 import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField;
 import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField;
@@ -20,6 +18,8 @@
 import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor;
 import org.jvnet.jaxb.annox.parser.value.XAnnotationValueParser;
 import org.jvnet.jaxb.annox.util.AnnotationElementUtils;
+import org.jvnet.jaxb.annox.util.ClassUtils;
+import org.jvnet.jaxb.annox.util.Validate;
 import org.w3c.dom.Element;
 
 public class XArrayAnnotationFieldParser<T, V> extends

jaxb-annox-parent/jaxb-annox/src/main/java/org/jvnet/jaxb/annox/parser/XSingleAnnotationFieldParser.java

@@ -4,7 +4,6 @@
 
 import java.lang.annotation.Annotation;
 
-import org.apache.commons.lang3.Validate;
 import org.jvnet.jaxb.annox.annotation.NoSuchAnnotationFieldException;
 import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField;
 import org.jvnet.jaxb.annox.model.annotation.field.XSingleAnnotationField;
@@ -15,6 +14,7 @@
 import org.jvnet.jaxb.annox.parser.java.visitor.ExpressionVisitor;
 import org.jvnet.jaxb.annox.parser.value.XAnnotationValueParser;
 import org.jvnet.jaxb.annox.util.AnnotationElementUtils;
+import org.jvnet.jaxb.annox.util.Validate;
 import org.w3c.dom.Element;
 
 public class XSingleAnnotationFieldParser<T, V> extends