HV-1114 Move the code generated by jaxb to its own package

hibernate · Oct 4, 2016 · 09cdccc · 09cdccc
1 parent 7fdccd4
commit 09cdccc
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 20 deletions.
diff --git a/engine/pom.xml b/engine/pom.xml
@@ -267,7 +267,7 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <packageName>org.hibernate.validator.internal.xml</packageName>
+                            <packageName>org.hibernate.validator.internal.xml.binding</packageName>
                             <extension>true</extension>
                             <!-- Generate correct getters for Boolean properties -->
                             <enableIntrospection>true</enableIntrospection>

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java
@@ -6,6 +6,10 @@
  */
 package org.hibernate.validator.internal.xml;
 
+import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.security.AccessController;
@@ -14,6 +18,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.validation.ParameterNameProvider;
 import javax.validation.ValidationException;
 
@@ -26,15 +31,16 @@
 import org.hibernate.validator.internal.metadata.raw.ConstrainedExecutable;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedParameter;
 import org.hibernate.validator.internal.metadata.raw.ExecutableElement;
-import org.hibernate.validator.internal.util.StringHelper;
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredConstructor;
 import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredMethod;
-
-import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
-import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;
-import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+import org.hibernate.validator.internal.xml.binding.ConstraintType;
+import org.hibernate.validator.internal.xml.binding.ConstructorType;
+import org.hibernate.validator.internal.xml.binding.CrossParameterType;
+import org.hibernate.validator.internal.xml.binding.MethodType;
+import org.hibernate.validator.internal.xml.binding.ParameterType;
+import org.hibernate.validator.internal.xml.binding.ReturnValueType;
 
 /**
  * Builder for constrained methods and constructors.

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedFieldBuilder.java
@@ -6,6 +6,9 @@
  */
 package org.hibernate.validator.internal.xml;
 
+import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+
 import java.lang.reflect.Field;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -23,9 +26,8 @@
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredField;
-
-import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
-import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+import org.hibernate.validator.internal.xml.binding.ConstraintType;
+import org.hibernate.validator.internal.xml.binding.FieldType;
 
 /**
  * Builder for constraint fields.

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedGetterBuilder.java
@@ -6,6 +6,9 @@
  */
 package org.hibernate.validator.internal.xml;
 
+import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+
 import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -24,9 +27,8 @@
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.privilegedactions.GetMethodFromPropertyName;
-
-import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
-import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+import org.hibernate.validator.internal.xml.binding.ConstraintType;
+import org.hibernate.validator.internal.xml.binding.GetterType;
 
 /**
  * Builder for constraint getters.

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedParameterBuilder.java
@@ -6,11 +6,15 @@
  */
 package org.hibernate.validator.internal.xml;
 
+import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+
 import java.lang.annotation.ElementType;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.validation.ParameterNameProvider;
 
 import org.hibernate.validator.internal.engine.valuehandling.UnwrapMode;
@@ -21,9 +25,8 @@
 import org.hibernate.validator.internal.metadata.raw.ConstrainedParameter;
 import org.hibernate.validator.internal.metadata.raw.ExecutableElement;
 import org.hibernate.validator.internal.util.ReflectionHelper;
-
-import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
-import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+import org.hibernate.validator.internal.xml.binding.ConstraintType;
+import org.hibernate.validator.internal.xml.binding.ParameterType;
 
 /**
  * Builder for constraint parameters.

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedTypeBuilder.java
@@ -6,6 +6,9 @@
  */
 package org.hibernate.validator.internal.xml;
 
+import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -15,9 +18,9 @@
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
 import org.hibernate.validator.internal.metadata.raw.ConfigurationSource;
 import org.hibernate.validator.internal.metadata.raw.ConstrainedType;
-
-import static org.hibernate.validator.internal.util.CollectionHelper.newArrayList;
-import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
+import org.hibernate.validator.internal.xml.binding.ClassType;
+import org.hibernate.validator.internal.xml.binding.ConstraintType;
+import org.hibernate.validator.internal.xml.binding.GroupSequenceType;
 
 /**
  * Builder for constraint types.

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/GroupConversionBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/GroupConversionBuilder.java
@@ -6,10 +6,12 @@
  */
 package org.hibernate.validator.internal.xml;
 
+import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;
+
 import java.util.List;
 import java.util.Map;
 
-import static org.hibernate.validator.internal.util.CollectionHelper.newHashMap;
+import org.hibernate.validator.internal.xml.binding.GroupConversionType;
 
 /**
  * Builder for group conversions.

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/MappingXmlParser.java b/engine/src/main/java/org/hibernate/validator/internal/xml/MappingXmlParser.java
@@ -45,6 +45,10 @@
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.privilegedactions.NewJaxbContext;
 import org.hibernate.validator.internal.util.privilegedactions.Unmarshal;
+import org.hibernate.validator.internal.xml.binding.BeanType;
+import org.hibernate.validator.internal.xml.binding.ConstraintDefinitionType;
+import org.hibernate.validator.internal.xml.binding.ConstraintMappingsType;
+import org.hibernate.validator.internal.xml.binding.ValidatedByType;
 import org.xml.sax.SAXException;
 
 /**

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/MetaConstraintBuilder.java b/engine/src/main/java/org/hibernate/validator/internal/xml/MetaConstraintBuilder.java
@@ -31,6 +31,11 @@
 import org.hibernate.validator.internal.util.logging.Log;
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.privilegedactions.GetMethod;
+import org.hibernate.validator.internal.xml.binding.AnnotationType;
+import org.hibernate.validator.internal.xml.binding.ConstraintType;
+import org.hibernate.validator.internal.xml.binding.ElementType;
+import org.hibernate.validator.internal.xml.binding.GroupsType;
+import org.hibernate.validator.internal.xml.binding.PayloadType;
 
 /**
  * Build meta constraint from XML

diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java b/engine/src/main/java/org/hibernate/validator/internal/xml/ValidationXmlParser.java
@@ -31,6 +31,10 @@
 import org.hibernate.validator.internal.util.logging.LoggerFactory;
 import org.hibernate.validator.internal.util.privilegedactions.NewJaxbContext;
 import org.hibernate.validator.internal.util.privilegedactions.Unmarshal;
+import org.hibernate.validator.internal.xml.binding.DefaultValidatedExecutableTypesType;
+import org.hibernate.validator.internal.xml.binding.ExecutableValidationType;
+import org.hibernate.validator.internal.xml.binding.PropertyType;
+import org.hibernate.validator.internal.xml.binding.ValidationConfigType;
 import org.xml.sax.SAXException;
 
 /**

diff --git a/pom.xml b/pom.xml
@@ -425,7 +425,7 @@
                         <!-- These classes are either imported from other sources and re-formatted
                         or generated or present significant reasons to not follow the rules. -->
                         <excludes>
-                            **/org/hibernate/validator/internal/xml/*.java,
+                            **/org/hibernate/validator/internal/xml/binding/*.java,
                             **/Log_$logger.java,
                             **/Messages_$bundle.java,
                             **/ConcurrentReferenceHashMap.java,