From 105748e7dd956cc1132c50c6d92735b559bef35b Mon Sep 17 00:00:00 2001 From: Hardy Ferentschik Date: Mon, 16 Jan 2012 13:09:19 +0100 Subject: [PATCH] METAGEN-65 Updating the configuration of the maven annotation processor plugin --- .../src/main/docbook/en-US/master.xml | 10 +- .../jpamodelgen/AccessTypeInformation.java | 1 - .../hibernate/jpamodelgen/ClassWriter.java | 1 - .../org/hibernate/jpamodelgen/Context.java | 1 - .../jpamodelgen/ImportContextImpl.java | 383 +++++++++--------- .../JPAMetaModelEntityProcessor.java | 1 - .../MetaModelGenerationException.java | 1 - .../org/hibernate/jpamodelgen/Version.java | 1 - .../annotation/AnnotationEmbeddable.java | 135 +++--- .../annotation/AnnotationMetaAttribute.java | 197 +++++---- .../annotation/AnnotationMetaCollection.java | 81 ++-- .../annotation/AnnotationMetaEntity.java | 345 ++++++++-------- .../annotation/AnnotationMetaMap.java | 81 ++-- .../AnnotationMetaSingleAttribute.java | 77 ++-- .../MetaAttributeGenerationVisitor.java | 1 - .../jpamodelgen/model/ImportContext.java | 85 ++-- .../jpamodelgen/model/MetaAttribute.java | 1 - .../jpamodelgen/model/MetaCollection.java | 1 - .../jpamodelgen/model/MetaEntity.java | 1 - .../model/MetaSingleAttribute.java | 1 - .../jpamodelgen/xml/XmlMetaAttribute.java | 3 - .../jpamodelgen/xml/XmlMetaCollection.java | 2 - .../jpamodelgen/xml/XmlMetaEmbeddable.java | 2 - .../jpamodelgen/xml/XmlMetaEntity.java | 1 - .../hibernate/jpamodelgen/xml/XmlMetaMap.java | 2 - .../xml/XmlMetaSingleAttribute.java | 2 - .../hibernate/jpamodelgen/xml/XmlParser.java | 2 - .../src/test/java/DefaultPackageEntity.java | 1 - .../src/test/java/DefaultPackageTest.java | 1 - .../test/accesstype/AccessTypeTest.java | 1 - .../jpamodelgen/test/accesstype/Address.java | 1 - .../jpamodelgen/test/accesstype/Area.java | 1 - .../jpamodelgen/test/accesstype/Building.java | 2 - .../jpamodelgen/test/accesstype/Country.java | 2 - .../jpamodelgen/test/accesstype/Customer.java | 2 - .../jpamodelgen/test/accesstype/Detail.java | 2 - .../test/accesstype/Hominidae.java | 2 - .../jpamodelgen/test/accesstype/House.java | 2 - .../jpamodelgen/test/accesstype/Human.java | 2 - .../test/accesstype/Inhabitant.java | 2 - .../jpamodelgen/test/accesstype/Item.java | 2 - .../test/accesstype/LivingBeing.java | 2 - .../jpamodelgen/test/accesstype/Mammals.java | 2 - .../jpamodelgen/test/accesstype/Order.java | 2 - .../jpamodelgen/test/accesstype/Pet.java | 2 - .../jpamodelgen/test/accesstype/Product.java | 2 - .../jpamodelgen/test/accesstype/Shop.java | 2 - .../jpamodelgen/test/accesstype/User.java | 2 - .../jpamodelgen/test/arraytype/Image.java | 2 - .../test/arraytype/TemperatureSamples.java | 2 - .../jpamodelgen/test/blob/BlobEntity.java | 1 - .../jpamodelgen/test/blob/BlobTest.java | 2 - .../test/elementcollection/Cleaner.java | 2 - .../ElementCollectionTest.java | 2 - .../test/elementcollection/Hostel.java | 2 - .../test/elementcollection/Hotel.java | 2 - .../test/elementcollection/House.java | 2 - .../test/elementcollection/Room.java | 2 - .../EmbeddableMappedSuperClassTest.java | 1 - .../GeneratedAnnotationTest.java | 2 - .../GeneratedAnnotationTest2.java | 1 - .../jpamodelgen/test/generics/Child.java | 1 - .../test/generics/GenericsTest.java | 2 - .../jpamodelgen/test/generics/Parent.java | 1 - .../test/inheritance/AbstractEntity.java | 2 - .../jpamodelgen/test/inheritance/Area.java | 2 - .../test/inheritance/Building.java | 2 - .../test/inheritance/Customer.java | 2 - .../jpamodelgen/test/inheritance/House.java | 2 - .../test/inheritance/InheritanceTest.java | 2 - .../jpamodelgen/test/inheritance/Person.java | 2 - .../jpamodelgen/test/inheritance/User.java | 2 - .../jpamodelgen/test/mixedmode/Car.java | 2 - .../test/mixedmode/Coordinates.java | 2 - .../jpamodelgen/test/mixedmode/Insurance.java | 2 - .../jpamodelgen/test/mixedmode/Location.java | 2 - .../mixedmode/MixedConfigurationTest.java | 2 - .../jpamodelgen/test/mixedmode/Person.java | 2 - .../jpamodelgen/test/mixedmode/RentalCar.java | 2 - .../test/mixedmode/RentalCompany.java | 2 - .../jpamodelgen/test/mixedmode/Truck.java | 2 - .../jpamodelgen/test/mixedmode/Vehicle.java | 2 - .../test/mixedmode/XmlMetaCompleteTest.java | 2 - .../test/mixedmode/ZeroCoordinates.java | 2 - .../test/rawtypes/DeskWithRawType.java | 1 - .../test/rawtypes/EmployeeWithRawType.java | 1 - .../test/rawtypes/RawTypesTest.java | 2 - .../SeparateCompilationUnitsTest.java | 2 - .../AttachmentGroup.java | 1 - .../AttachmentGroupInTopic.java | 1 - .../AttachmentGroupPost.java | 1 - .../AttachmentGroupPostInTopic.java | 1 - .../test/typedmappedsuperclass/Post.java | 1 - .../TypesMappedSuperclassTest.java | 2 - .../test/typedmappedsuperclass/UserRole.java | 1 - .../test/usertype/UserTypeTest.java | 2 - .../test/util/CompilationTest.java | 2 - .../jpamodelgen/test/util/TestUtil.java | 2 - .../jpamodelgen/test/xmlmapped/Address.java | 2 - .../jpamodelgen/test/xmlmapped/Boy.java | 2 - .../jpamodelgen/test/xmlmapped/Building.java | 2 - .../jpamodelgen/test/xmlmapped/FakeHero.java | 2 - .../test/xmlmapped/IgnoreInvalidXmlTest.java | 2 - .../test/xmlmapped/LivingBeing.java | 2 - .../jpamodelgen/test/xmlmapped/Mammal.java | 2 - .../jpamodelgen/test/xmlmapped/Superhero.java | 2 - .../test/xmlmapped/XmlMappingTest.java | 2 - .../XmlMetaDataCompleteTest.java | 1 - .../jpamodelgen/test/xmlonly/XmlOnlyTest.java | 1 - 109 files changed, 695 insertions(+), 868 deletions(-) diff --git a/tooling/metamodel-generator/src/main/docbook/en-US/master.xml b/tooling/metamodel-generator/src/main/docbook/en-US/master.xml index 0341b0fd4006..6f8f52f05cf4 100644 --- a/tooling/metamodel-generator/src/main/docbook/en-US/master.xml +++ b/tooling/metamodel-generator/src/main/docbook/en-US/master.xml @@ -372,14 +372,19 @@ cq.where( cb.equal(itemNode.get(Item_.id), 5 ) ).distinct(true); <plugin> <groupId>org.bsc.maven</groupId> <artifactId>maven-processor-plugin</artifactId> - <version>1.3.7</version> + <version>2.0.5</version> <executions> <execution> <id>process</id> <goals> <goal>process</goal> </goals> - <phase>process-sources</phase> + <phase>generate-sources</phase> + <configuration> + <processors> + <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor> + </processors> + </configuration> </execution> </executions> <dependencies> @@ -387,7 +392,6 @@ cq.where( cb.equal(itemNode.get(Item_.id), 5 ) ).distinct(true); <groupId>org.hibernate</groupId> <artifactId>hibernate-jpamodelgen</artifactId> <version>&version;</version> - <scope>compile</scope> </dependency> </dependencies> </plugin> diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/AccessTypeInformation.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/AccessTypeInformation.java index 18daaa4b2400..dbb1b237fd1f 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/AccessTypeInformation.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/AccessTypeInformation.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen; import javax.persistence.AccessType; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java index a31f8e5cdccb..0773e2e2207d 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen; import java.io.IOException; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Context.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Context.java index 06c1327a6d64..6f46fc973d94 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Context.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Context.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen; import java.util.ArrayList; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java index 975071b4c33e..378775282a7e 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java @@ -1,192 +1,191 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hibernate.jpamodelgen; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.hibernate.jpamodelgen.model.ImportContext; - - -/** - * @author Max Andersen - * @author Hardy Ferentschik - * @author Emmanuel Bernard - */ -public class ImportContextImpl implements ImportContext { - - private Set imports = new TreeSet(); - private Set staticImports = new TreeSet(); - private Map simpleNames = new HashMap(); - - private String basePackage = ""; - - private static final Map PRIMITIVES = new HashMap(); - - static { - PRIMITIVES.put( "char", "Character" ); - - PRIMITIVES.put( "byte", "Byte" ); - PRIMITIVES.put( "short", "Short" ); - PRIMITIVES.put( "int", "Integer" ); - PRIMITIVES.put( "long", "Long" ); - - PRIMITIVES.put( "boolean", "Boolean" ); - - PRIMITIVES.put( "float", "Float" ); - PRIMITIVES.put( "double", "Double" ); - - } - - public ImportContextImpl(String basePackage) { - this.basePackage = basePackage; - } - - /** - * Add fqcn to the import list. Returns fqcn as needed in source code. - * Attempts to handle fqcn with array and generics references. - *

- * e.g. - * java.util.Collection imports java.util.Collection and returns Collection - * org.marvel.Hulk[] imports org.marvel.Hulk and returns Hulk - * - * @param fqcn Fully qualified class name - * - * @return import string - */ - public String importType(String fqcn) { - String result = fqcn; - - //if(fqcn==null) return "/** (null) **/"; - - String additionalTypePart = null; - if ( fqcn.indexOf( '<' ) >= 0 ) { - additionalTypePart = result.substring( fqcn.indexOf( '<' ) ); - result = result.substring( 0, fqcn.indexOf( '<' ) ); - fqcn = result; - } - else if ( fqcn.indexOf( '[' ) >= 0 ) { - additionalTypePart = result.substring( fqcn.indexOf( '[' ) ); - result = result.substring( 0, fqcn.indexOf( '[' ) ); - fqcn = result; - } - - String pureFqcn = fqcn.replace( '$', '.' ); - - boolean canBeSimple; - - String simpleName = unqualify( fqcn ); - if ( simpleNames.containsKey( simpleName ) ) { - String existingFqcn = simpleNames.get( simpleName ); - if ( existingFqcn.equals( pureFqcn ) ) { - canBeSimple = true; - } - else { - canBeSimple = false; - } - } - else { - canBeSimple = true; - simpleNames.put( simpleName, pureFqcn ); - imports.add( pureFqcn ); - } - - - if ( inSamePackage( fqcn ) || ( imports.contains( pureFqcn ) && canBeSimple ) ) { - result = unqualify( result ); // de-qualify - } - else if ( inJavaLang( fqcn ) ) { - result = result.substring( "java.lang.".length() ); - } - - if ( additionalTypePart != null ) { - result = result + additionalTypePart; - } - - result = result.replace( '$', '.' ); - return result; - } - - public String staticImport(String fqcn, String member) { - String local = fqcn + "." + member; - imports.add( local ); - staticImports.add( local ); - - if ( member.equals( "*" ) ) { - return ""; - } - else { - return member; - } - } - - private boolean inDefaultPackage(String className) { - return className.indexOf( "." ) < 0; - } - - private boolean isPrimitive(String className) { - return PRIMITIVES.containsKey( className ); - } - - private boolean inSamePackage(String className) { - String other = qualifier( className ); - return other == basePackage - || ( other != null && other.equals( basePackage ) ); - } - - private boolean inJavaLang(String className) { - return "java.lang".equals( qualifier( className ) ); - } - - public String generateImports() { - StringBuffer buf = new StringBuffer(); - - for ( String next : imports ) { - // don't add automatically "imported" stuff - if ( !isAutoImported( next ) ) { - if ( staticImports.contains( next ) ) { - buf.append( "import static " ).append( next ).append( ";\r\n" ); - } - else { - buf.append( "import " ).append( next ).append( ";\r\n" ); - } - } - } - - if ( buf.indexOf( "$" ) >= 0 ) { - return buf.toString(); - } - return buf.toString(); - } - - private boolean isAutoImported(String next) { - return isPrimitive( next ) || inDefaultPackage( next ) || inJavaLang( next ) || inSamePackage( next ); - } - - public static String unqualify(String qualifiedName) { - int loc = qualifiedName.lastIndexOf( '.' ); - return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( qualifiedName.lastIndexOf( '.' ) + 1 ); - } - - public static String qualifier(String qualifiedName) { - int loc = qualifiedName.lastIndexOf( "." ); - return ( loc < 0 ) ? "" : qualifiedName.substring( 0, loc ); - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.jpamodelgen; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import org.hibernate.jpamodelgen.model.ImportContext; + + +/** + * @author Max Andersen + * @author Hardy Ferentschik + * @author Emmanuel Bernard + */ +public class ImportContextImpl implements ImportContext { + + private Set imports = new TreeSet(); + private Set staticImports = new TreeSet(); + private Map simpleNames = new HashMap(); + + private String basePackage = ""; + + private static final Map PRIMITIVES = new HashMap(); + + static { + PRIMITIVES.put( "char", "Character" ); + + PRIMITIVES.put( "byte", "Byte" ); + PRIMITIVES.put( "short", "Short" ); + PRIMITIVES.put( "int", "Integer" ); + PRIMITIVES.put( "long", "Long" ); + + PRIMITIVES.put( "boolean", "Boolean" ); + + PRIMITIVES.put( "float", "Float" ); + PRIMITIVES.put( "double", "Double" ); + + } + + public ImportContextImpl(String basePackage) { + this.basePackage = basePackage; + } + + /** + * Add fqcn to the import list. Returns fqcn as needed in source code. + * Attempts to handle fqcn with array and generics references. + *

+ * e.g. + * java.util.Collection imports java.util.Collection and returns Collection + * org.marvel.Hulk[] imports org.marvel.Hulk and returns Hulk + * + * @param fqcn Fully qualified class name + * + * @return import string + */ + public String importType(String fqcn) { + String result = fqcn; + + //if(fqcn==null) return "/** (null) **/"; + + String additionalTypePart = null; + if ( fqcn.indexOf( '<' ) >= 0 ) { + additionalTypePart = result.substring( fqcn.indexOf( '<' ) ); + result = result.substring( 0, fqcn.indexOf( '<' ) ); + fqcn = result; + } + else if ( fqcn.indexOf( '[' ) >= 0 ) { + additionalTypePart = result.substring( fqcn.indexOf( '[' ) ); + result = result.substring( 0, fqcn.indexOf( '[' ) ); + fqcn = result; + } + + String pureFqcn = fqcn.replace( '$', '.' ); + + boolean canBeSimple; + + String simpleName = unqualify( fqcn ); + if ( simpleNames.containsKey( simpleName ) ) { + String existingFqcn = simpleNames.get( simpleName ); + if ( existingFqcn.equals( pureFqcn ) ) { + canBeSimple = true; + } + else { + canBeSimple = false; + } + } + else { + canBeSimple = true; + simpleNames.put( simpleName, pureFqcn ); + imports.add( pureFqcn ); + } + + + if ( inSamePackage( fqcn ) || ( imports.contains( pureFqcn ) && canBeSimple ) ) { + result = unqualify( result ); // de-qualify + } + else if ( inJavaLang( fqcn ) ) { + result = result.substring( "java.lang.".length() ); + } + + if ( additionalTypePart != null ) { + result = result + additionalTypePart; + } + + result = result.replace( '$', '.' ); + return result; + } + + public String staticImport(String fqcn, String member) { + String local = fqcn + "." + member; + imports.add( local ); + staticImports.add( local ); + + if ( member.equals( "*" ) ) { + return ""; + } + else { + return member; + } + } + + private boolean inDefaultPackage(String className) { + return className.indexOf( "." ) < 0; + } + + private boolean isPrimitive(String className) { + return PRIMITIVES.containsKey( className ); + } + + private boolean inSamePackage(String className) { + String other = qualifier( className ); + return other == basePackage + || ( other != null && other.equals( basePackage ) ); + } + + private boolean inJavaLang(String className) { + return "java.lang".equals( qualifier( className ) ); + } + + public String generateImports() { + StringBuffer buf = new StringBuffer(); + + for ( String next : imports ) { + // don't add automatically "imported" stuff + if ( !isAutoImported( next ) ) { + if ( staticImports.contains( next ) ) { + buf.append( "import static " ).append( next ).append( ";\r\n" ); + } + else { + buf.append( "import " ).append( next ).append( ";\r\n" ); + } + } + } + + if ( buf.indexOf( "$" ) >= 0 ) { + return buf.toString(); + } + return buf.toString(); + } + + private boolean isAutoImported(String next) { + return isPrimitive( next ) || inDefaultPackage( next ) || inJavaLang( next ) || inSamePackage( next ); + } + + public static String unqualify(String qualifiedName) { + int loc = qualifiedName.lastIndexOf( '.' ); + return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( qualifiedName.lastIndexOf( '.' ) + 1 ); + } + + public static String qualifier(String qualifiedName) { + int loc = qualifiedName.lastIndexOf( "." ); + return ( loc < 0 ) ? "" : qualifiedName.substring( 0, loc ); + } +} diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java index ad94c021180d..1f800d5ee583 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/JPAMetaModelEntityProcessor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen; import java.util.ArrayList; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/MetaModelGenerationException.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/MetaModelGenerationException.java index 90a6df991f60..1f9aeee2209c 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/MetaModelGenerationException.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/MetaModelGenerationException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen; /** diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Version.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Version.java index 6d8243507d5a..14597a9ab720 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Version.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Version.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen; /** diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java index 398b4b66da63..487d383f59b9 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java @@ -1,69 +1,68 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hibernate.jpamodelgen.annotation; - -import java.util.List; -import javax.lang.model.element.TypeElement; -import javax.tools.Diagnostic; - -import org.hibernate.jpamodelgen.Context; -import org.hibernate.jpamodelgen.model.MetaAttribute; - -/** - * @author Max Andersen - * @author Hardy Ferentschik - * @author Emmanuel Bernard - */ -public class AnnotationEmbeddable extends AnnotationMetaEntity { - - // Embeddables needs to be lazily initialized since the access type be determined by the class which is embedding - // the entity. This might not be known until annotations are processed. - // Also note, that if two different classes with different access types embed this entity the access type of the - // embeddable will be the one of the last embedding entity processed. The result is not determined (that's ok - // according to the spec) - private boolean initialized; - - public AnnotationEmbeddable(TypeElement element, Context context) { - super( element, context, true ); - } - - public List getMembers() { - if ( !initialized ) { - getContext().logMessage( Diagnostic.Kind.OTHER, "Entity " + getQualifiedName() + " was lazily initialised." ); - init(); - initialized = true; - } - return super.getMembers(); - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append( "AnnotationEmbeddable" ); - sb.append( "{element=" ).append( getElement() ); - sb.append( ", members=" ); - if ( initialized ) { - sb.append( getMembers() ); - } - else { - sb.append( "[un-initalized]" ); - } - sb.append( '}' ); - return sb.toString(); - } +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.jpamodelgen.annotation; + +import java.util.List; +import javax.lang.model.element.TypeElement; +import javax.tools.Diagnostic; + +import org.hibernate.jpamodelgen.Context; +import org.hibernate.jpamodelgen.model.MetaAttribute; + +/** + * @author Max Andersen + * @author Hardy Ferentschik + * @author Emmanuel Bernard + */ +public class AnnotationEmbeddable extends AnnotationMetaEntity { + + // Embeddables needs to be lazily initialized since the access type be determined by the class which is embedding + // the entity. This might not be known until annotations are processed. + // Also note, that if two different classes with different access types embed this entity the access type of the + // embeddable will be the one of the last embedding entity processed. The result is not determined (that's ok + // according to the spec) + private boolean initialized; + + public AnnotationEmbeddable(TypeElement element, Context context) { + super( element, context, true ); + } + + public List getMembers() { + if ( !initialized ) { + getContext().logMessage( Diagnostic.Kind.OTHER, "Entity " + getQualifiedName() + " was lazily initialised." ); + init(); + initialized = true; + } + return super.getMembers(); + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append( "AnnotationEmbeddable" ); + sb.append( "{element=" ).append( getElement() ); + sb.append( ", members=" ); + if ( initialized ) { + sb.append( getMembers() ); + } + else { + sb.append( "[un-initalized]" ); + } + sb.append( '}' ); + return sb.toString(); + } } \ No newline at end of file diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java index 031142de0f6b..347c598c9c46 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java @@ -1,99 +1,98 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hibernate.jpamodelgen.annotation; - -import java.beans.Introspector; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.util.Elements; - -import org.hibernate.jpamodelgen.model.MetaAttribute; -import org.hibernate.jpamodelgen.model.MetaEntity; - -/** - * Captures all information about an annotated persistent attribute. - * - * @author Max Andersen - * @author Hardy Ferentschik - * @author Emmanuel Bernard - */ -public abstract class AnnotationMetaAttribute implements MetaAttribute { - - private final Element element; - private final AnnotationMetaEntity parent; - private final String type; - - public AnnotationMetaAttribute(AnnotationMetaEntity parent, Element element, String type) { - this.element = element; - this.parent = parent; - this.type = type; - } - - public String getDeclarationString() { - return new StringBuilder().append( "public static volatile " ) - .append( parent.importType( getMetaType() ) ) - .append( "<" ) - .append( parent.importType( parent.getQualifiedName() ) ) - .append( ", " ) - .append( parent.importType( getTypeDeclaration() ) ) - .append( "> " ) - .append( getPropertyName() ) - .append( ";" ) - .toString(); - } - - public String getPropertyName() { - Elements elementsUtil = parent.getContext().getElementUtils(); - if ( element.getKind() == ElementKind.FIELD ) { - return element.getSimpleName().toString(); - } - else if ( element.getKind() == ElementKind.METHOD ) { - String name = element.getSimpleName().toString(); - if ( name.startsWith( "get" ) ) { - return elementsUtil.getName( Introspector.decapitalize( name.substring( "get".length() ) ) ).toString(); - } - else if ( name.startsWith( "is" ) ) { - return ( elementsUtil.getName( Introspector.decapitalize( name.substring( "is".length() ) ) ) ).toString(); - } - return elementsUtil.getName( Introspector.decapitalize( name ) ).toString(); - } - else { - return elementsUtil.getName( element.getSimpleName() + "/* " + element.getKind() + " */" ).toString(); - } - } - - public MetaEntity getHostingEntity() { - return parent; - } - - abstract public String getMetaType(); - - public String getTypeDeclaration() { - return type; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append( "AnnotationMetaAttribute" ); - sb.append( "{element=" ).append( element ); - sb.append( ", type='" ).append( type ).append( '\'' ); - sb.append( '}' ); - return sb.toString(); - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.jpamodelgen.annotation; + +import java.beans.Introspector; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.util.Elements; + +import org.hibernate.jpamodelgen.model.MetaAttribute; +import org.hibernate.jpamodelgen.model.MetaEntity; + +/** + * Captures all information about an annotated persistent attribute. + * + * @author Max Andersen + * @author Hardy Ferentschik + * @author Emmanuel Bernard + */ +public abstract class AnnotationMetaAttribute implements MetaAttribute { + + private final Element element; + private final AnnotationMetaEntity parent; + private final String type; + + public AnnotationMetaAttribute(AnnotationMetaEntity parent, Element element, String type) { + this.element = element; + this.parent = parent; + this.type = type; + } + + public String getDeclarationString() { + return new StringBuilder().append( "public static volatile " ) + .append( parent.importType( getMetaType() ) ) + .append( "<" ) + .append( parent.importType( parent.getQualifiedName() ) ) + .append( ", " ) + .append( parent.importType( getTypeDeclaration() ) ) + .append( "> " ) + .append( getPropertyName() ) + .append( ";" ) + .toString(); + } + + public String getPropertyName() { + Elements elementsUtil = parent.getContext().getElementUtils(); + if ( element.getKind() == ElementKind.FIELD ) { + return element.getSimpleName().toString(); + } + else if ( element.getKind() == ElementKind.METHOD ) { + String name = element.getSimpleName().toString(); + if ( name.startsWith( "get" ) ) { + return elementsUtil.getName( Introspector.decapitalize( name.substring( "get".length() ) ) ).toString(); + } + else if ( name.startsWith( "is" ) ) { + return ( elementsUtil.getName( Introspector.decapitalize( name.substring( "is".length() ) ) ) ).toString(); + } + return elementsUtil.getName( Introspector.decapitalize( name ) ).toString(); + } + else { + return elementsUtil.getName( element.getSimpleName() + "/* " + element.getKind() + " */" ).toString(); + } + } + + public MetaEntity getHostingEntity() { + return parent; + } + + abstract public String getMetaType(); + + public String getTypeDeclaration() { + return type; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append( "AnnotationMetaAttribute" ); + sb.append( "{element=" ).append( element ); + sb.append( ", type='" ).append( type ).append( '\'' ); + sb.append( '}' ); + return sb.toString(); + } +} diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaCollection.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaCollection.java index 4c2d9fe1c184..24e82419ab4f 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaCollection.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaCollection.java @@ -1,41 +1,40 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hibernate.jpamodelgen.annotation; - -import javax.lang.model.element.Element; - -import org.hibernate.jpamodelgen.model.MetaCollection; - -/** - * @author Max Andersen - * @author Hardy Ferentschik - * @author Emmanuel Bernard - */ -public class AnnotationMetaCollection extends AnnotationMetaAttribute implements MetaCollection { - private String collectionType; - - public AnnotationMetaCollection(AnnotationMetaEntity parent, Element element, String collectionType, String elementType) { - super( parent, element, elementType ); - this.collectionType = collectionType; - } - - @Override - public String getMetaType() { - return collectionType; - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.jpamodelgen.annotation; + +import javax.lang.model.element.Element; + +import org.hibernate.jpamodelgen.model.MetaCollection; + +/** + * @author Max Andersen + * @author Hardy Ferentschik + * @author Emmanuel Bernard + */ +public class AnnotationMetaCollection extends AnnotationMetaAttribute implements MetaCollection { + private String collectionType; + + public AnnotationMetaCollection(AnnotationMetaEntity parent, Element element, String collectionType, String elementType) { + super( parent, element, elementType ); + this.collectionType = collectionType; + } + + @Override + public String getMetaType() { + return collectionType; + } +} diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java index aeda843cf356..70b3683f8b38 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java @@ -1,173 +1,172 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hibernate.jpamodelgen.annotation; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.lang.model.element.Element; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.Name; -import javax.lang.model.element.PackageElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.ElementFilter; -import javax.persistence.AccessType; -import javax.persistence.Transient; - -import org.hibernate.jpamodelgen.AccessTypeInformation; -import org.hibernate.jpamodelgen.Context; -import org.hibernate.jpamodelgen.ImportContextImpl; -import org.hibernate.jpamodelgen.model.ImportContext; -import org.hibernate.jpamodelgen.model.MetaAttribute; -import org.hibernate.jpamodelgen.model.MetaEntity; -import org.hibernate.jpamodelgen.util.TypeUtils; - -/** - * Class used to collect meta information about an annotated entity. - * - * @author Max Andersen - * @author Hardy Ferentschik - * @author Emmanuel Bernard - */ -public class AnnotationMetaEntity implements MetaEntity { - - private final ImportContext importContext; - private final TypeElement element; - private final Map members; - private Context context; - - private AccessTypeInformation entityAccessTypeInfo; - - public AnnotationMetaEntity(TypeElement element, Context context) { - this( element, context, false ); - } - - protected AnnotationMetaEntity(TypeElement element, Context context, boolean lazilyInitialised) { - this.element = element; - this.context = context; - this.members = new HashMap(); - this.importContext = new ImportContextImpl( getPackageName() ); - if ( !lazilyInitialised ) { - init(); - } - } - - public AccessTypeInformation getEntityAccessTypeInfo() { - return entityAccessTypeInfo; - } - - public final Context getContext() { - return context; - } - - public final String getSimpleName() { - return element.getSimpleName().toString(); - } - - public final String getQualifiedName() { - return element.getQualifiedName().toString(); - } - - public final String getPackageName() { - PackageElement packageOf = context.getElementUtils().getPackageOf( element ); - return context.getElementUtils().getName( packageOf.getQualifiedName() ).toString(); - } - - public List getMembers() { - return new ArrayList( members.values() ); - } - - @Override - public boolean isMetaComplete() { - return false; - } - - public void mergeInMembers(Collection attributes) { - for ( MetaAttribute attribute : attributes ) { - members.put( attribute.getPropertyName(), attribute ); - } - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append( "AnnotationMetaEntity" ); - sb.append( "{element=" ).append( element ); - sb.append( ", members=" ).append( members ); - sb.append( '}' ); - return sb.toString(); - } - - protected TypeElement getElement() { - return element; - } - - private void addPersistentMembers(List membersOfClass, AccessType membersKind) { - for ( Element memberOfClass : membersOfClass ) { - AccessType forcedAccessType = TypeUtils.determineAnnotationSpecifiedAccessType( memberOfClass ); - if ( entityAccessTypeInfo.getAccessType() != membersKind && forcedAccessType == null ) { - continue; - } - - if ( TypeUtils.containsAnnotation( memberOfClass, Transient.class ) - || memberOfClass.getModifiers().contains( Modifier.TRANSIENT ) - || memberOfClass.getModifiers().contains( Modifier.STATIC ) ) { - continue; - } - - MetaAttributeGenerationVisitor visitor = new MetaAttributeGenerationVisitor( this, context ); - AnnotationMetaAttribute result = memberOfClass.asType().accept( visitor, memberOfClass ); - if ( result != null ) { - members.put( result.getPropertyName(), result ); - } - } - } - - protected final void init() { - TypeUtils.determineAccessTypeForHierarchy( element, context ); - entityAccessTypeInfo = context.getAccessTypeInfo( getQualifiedName() ); - - List fieldsOfClass = ElementFilter.fieldsIn( element.getEnclosedElements() ); - addPersistentMembers( fieldsOfClass, AccessType.FIELD ); - - List methodsOfClass = ElementFilter.methodsIn( element.getEnclosedElements() ); - addPersistentMembers( methodsOfClass, AccessType.PROPERTY ); - } - - public final String generateImports() { - return importContext.generateImports(); - } - - public final String importType(String fqcn) { - return importContext.importType( fqcn ); - } - - public final String staticImport(String fqcn, String member) { - return importContext.staticImport( fqcn, member ); - } - - public final String importType(Name qualifiedName) { - return importType( qualifiedName.toString() ); - } - - public final TypeElement getTypeElement() { - return element; - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.jpamodelgen.annotation; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.lang.model.element.Element; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.Name; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.util.ElementFilter; +import javax.persistence.AccessType; +import javax.persistence.Transient; + +import org.hibernate.jpamodelgen.AccessTypeInformation; +import org.hibernate.jpamodelgen.Context; +import org.hibernate.jpamodelgen.ImportContextImpl; +import org.hibernate.jpamodelgen.model.ImportContext; +import org.hibernate.jpamodelgen.model.MetaAttribute; +import org.hibernate.jpamodelgen.model.MetaEntity; +import org.hibernate.jpamodelgen.util.TypeUtils; + +/** + * Class used to collect meta information about an annotated entity. + * + * @author Max Andersen + * @author Hardy Ferentschik + * @author Emmanuel Bernard + */ +public class AnnotationMetaEntity implements MetaEntity { + + private final ImportContext importContext; + private final TypeElement element; + private final Map members; + private Context context; + + private AccessTypeInformation entityAccessTypeInfo; + + public AnnotationMetaEntity(TypeElement element, Context context) { + this( element, context, false ); + } + + protected AnnotationMetaEntity(TypeElement element, Context context, boolean lazilyInitialised) { + this.element = element; + this.context = context; + this.members = new HashMap(); + this.importContext = new ImportContextImpl( getPackageName() ); + if ( !lazilyInitialised ) { + init(); + } + } + + public AccessTypeInformation getEntityAccessTypeInfo() { + return entityAccessTypeInfo; + } + + public final Context getContext() { + return context; + } + + public final String getSimpleName() { + return element.getSimpleName().toString(); + } + + public final String getQualifiedName() { + return element.getQualifiedName().toString(); + } + + public final String getPackageName() { + PackageElement packageOf = context.getElementUtils().getPackageOf( element ); + return context.getElementUtils().getName( packageOf.getQualifiedName() ).toString(); + } + + public List getMembers() { + return new ArrayList( members.values() ); + } + + @Override + public boolean isMetaComplete() { + return false; + } + + public void mergeInMembers(Collection attributes) { + for ( MetaAttribute attribute : attributes ) { + members.put( attribute.getPropertyName(), attribute ); + } + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder(); + sb.append( "AnnotationMetaEntity" ); + sb.append( "{element=" ).append( element ); + sb.append( ", members=" ).append( members ); + sb.append( '}' ); + return sb.toString(); + } + + protected TypeElement getElement() { + return element; + } + + private void addPersistentMembers(List membersOfClass, AccessType membersKind) { + for ( Element memberOfClass : membersOfClass ) { + AccessType forcedAccessType = TypeUtils.determineAnnotationSpecifiedAccessType( memberOfClass ); + if ( entityAccessTypeInfo.getAccessType() != membersKind && forcedAccessType == null ) { + continue; + } + + if ( TypeUtils.containsAnnotation( memberOfClass, Transient.class ) + || memberOfClass.getModifiers().contains( Modifier.TRANSIENT ) + || memberOfClass.getModifiers().contains( Modifier.STATIC ) ) { + continue; + } + + MetaAttributeGenerationVisitor visitor = new MetaAttributeGenerationVisitor( this, context ); + AnnotationMetaAttribute result = memberOfClass.asType().accept( visitor, memberOfClass ); + if ( result != null ) { + members.put( result.getPropertyName(), result ); + } + } + } + + protected final void init() { + TypeUtils.determineAccessTypeForHierarchy( element, context ); + entityAccessTypeInfo = context.getAccessTypeInfo( getQualifiedName() ); + + List fieldsOfClass = ElementFilter.fieldsIn( element.getEnclosedElements() ); + addPersistentMembers( fieldsOfClass, AccessType.FIELD ); + + List methodsOfClass = ElementFilter.methodsIn( element.getEnclosedElements() ); + addPersistentMembers( methodsOfClass, AccessType.PROPERTY ); + } + + public final String generateImports() { + return importContext.generateImports(); + } + + public final String importType(String fqcn) { + return importContext.importType( fqcn ); + } + + public final String staticImport(String fqcn, String member) { + return importContext.staticImport( fqcn, member ); + } + + public final String importType(Name qualifiedName) { + return importType( qualifiedName.toString() ); + } + + public final TypeElement getTypeElement() { + return element; + } +} diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java index 074f5bac39eb..d455b0d131a1 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java @@ -1,41 +1,40 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hibernate.jpamodelgen.annotation; - -import javax.lang.model.element.Element; - -/** - * @author Max Andersen - * @author Hardy Ferentschik - * @author Emmanuel Bernard - */ -public class AnnotationMetaMap extends AnnotationMetaCollection { - - private final String keyType; - - public AnnotationMetaMap(AnnotationMetaEntity parent, Element element, String collectionType, - String keyType, String elementType) { - super( parent, element, collectionType, elementType ); - this.keyType = keyType; - } - - public String getDeclarationString() { - return "public static volatile " + getHostingEntity().importType( getMetaType() ) + "<" + getHostingEntity().importType( getHostingEntity().getQualifiedName() ) + ", " + getHostingEntity() - .importType( keyType ) + ", " + getHostingEntity().importType( getTypeDeclaration() ) + "> " + getPropertyName() + ";"; - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.jpamodelgen.annotation; + +import javax.lang.model.element.Element; + +/** + * @author Max Andersen + * @author Hardy Ferentschik + * @author Emmanuel Bernard + */ +public class AnnotationMetaMap extends AnnotationMetaCollection { + + private final String keyType; + + public AnnotationMetaMap(AnnotationMetaEntity parent, Element element, String collectionType, + String keyType, String elementType) { + super( parent, element, collectionType, elementType ); + this.keyType = keyType; + } + + public String getDeclarationString() { + return "public static volatile " + getHostingEntity().importType( getMetaType() ) + "<" + getHostingEntity().importType( getHostingEntity().getQualifiedName() ) + ", " + getHostingEntity() + .importType( keyType ) + ", " + getHostingEntity().importType( getTypeDeclaration() ) + "> " + getPropertyName() + ";"; + } +} diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java index 789c46eb14d3..fbdb007a82cb 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaSingleAttribute.java @@ -1,39 +1,38 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hibernate.jpamodelgen.annotation; - -import javax.lang.model.element.Element; - -import org.hibernate.jpamodelgen.model.MetaSingleAttribute; - -/** - * @author Max Andersen - * @author Hardy Ferentschik - * @author Emmanuel Bernard - */ -public class AnnotationMetaSingleAttribute extends AnnotationMetaAttribute implements MetaSingleAttribute { - - public AnnotationMetaSingleAttribute(AnnotationMetaEntity parent, Element element, String type) { - super( parent, element, type ); - } - - @Override - public final String getMetaType() { - return "javax.persistence.metamodel.SingularAttribute"; - } -} +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.jpamodelgen.annotation; + +import javax.lang.model.element.Element; + +import org.hibernate.jpamodelgen.model.MetaSingleAttribute; + +/** + * @author Max Andersen + * @author Hardy Ferentschik + * @author Emmanuel Bernard + */ +public class AnnotationMetaSingleAttribute extends AnnotationMetaAttribute implements MetaSingleAttribute { + + public AnnotationMetaSingleAttribute(AnnotationMetaEntity parent, Element element, String type) { + super( parent, element, type ); + } + + @Override + public final String getMetaType() { + return "javax.persistence.metamodel.SingularAttribute"; + } +} diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java index 9250ec5fbdd2..0f9cdf6fc632 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.annotation; import java.util.List; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java index 8aca6970822b..4e7f31e0c4fb 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java @@ -1,44 +1,43 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.hibernate.jpamodelgen.model; - -/** - * @author Max Andersen - * @author Hardy Ferentschik - * @author Emmanuel Bernard - */ -public interface ImportContext { - - /** - * Add fqcn to the import list. Returns fqcn as needed in source code. - * Attempts to handle fqcn with array and generics references. - *

- * e.g. - * java.util.Collection imports java.util.Collection and returns Collection - * org.marvel.Hulk[] imports org.marvel.Hulk and returns Hulk - * - * @param fqcn Fully qualified class name of the type to import. - * - * @return import string - */ - String importType(String fqcn); - - String staticImport(String fqcn, String member); - - String generateImports(); +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.hibernate.jpamodelgen.model; + +/** + * @author Max Andersen + * @author Hardy Ferentschik + * @author Emmanuel Bernard + */ +public interface ImportContext { + + /** + * Add fqcn to the import list. Returns fqcn as needed in source code. + * Attempts to handle fqcn with array and generics references. + *

+ * e.g. + * java.util.Collection imports java.util.Collection and returns Collection + * org.marvel.Hulk[] imports org.marvel.Hulk and returns Hulk + * + * @param fqcn Fully qualified class name of the type to import. + * + * @return import string + */ + String importType(String fqcn); + + String staticImport(String fqcn, String member); + + String generateImports(); } \ No newline at end of file diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java index a441f05fa276..bc1962a5b48c 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.model; /** diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaCollection.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaCollection.java index 80032bbc9e15..1f87e767530c 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaCollection.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaCollection.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.model; /** diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaEntity.java index 282cb4a3feac..2ab5b4e68c03 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaEntity.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaEntity.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.model; import java.util.List; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaSingleAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaSingleAttribute.java index 425ef5e26bd5..3527cfc56c5e 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaSingleAttribute.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/MetaSingleAttribute.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.model; /** diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java index 36e8bd3a4ef1..1e95be34c5c0 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - package org.hibernate.jpamodelgen.xml; import org.hibernate.jpamodelgen.model.MetaAttribute; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java index 17a7da080ad5..b704ccd52598 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.xml; import org.hibernate.jpamodelgen.model.MetaCollection; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEmbeddable.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEmbeddable.java index bfc6f2550e93..538ae9a7ca0a 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEmbeddable.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEmbeddable.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.xml; import java.util.List; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java index 23fe9cc4a271..6f071eb0f629 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaEntity.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.xml; import java.util.ArrayList; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java index 5d7bcf794744..9dcfd2d57e55 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.xml; import org.hibernate.jpamodelgen.model.MetaEntity; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java index 474205e7a40e..aee9b1743799 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaSingleAttribute.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.xml; import org.hibernate.jpamodelgen.model.MetaSingleAttribute; diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java index 0b066f3745fa..628e1523045e 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/xml/XmlParser.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.xml; import java.io.File; diff --git a/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java b/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java index c8412cdb1a8b..b25e3e94cbe2 100644 --- a/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java +++ b/tooling/metamodel-generator/src/test/java/DefaultPackageEntity.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import javax.persistence.Entity; import javax.persistence.Id; diff --git a/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java b/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java index 84cc11870ab2..f21d064d0d10 100644 --- a/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java +++ b/tooling/metamodel-generator/src/test/java/DefaultPackageTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.testng.annotations.Test; import org.hibernate.jpamodelgen.test.util.CompilationTest; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/AccessTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/AccessTypeTest.java index f3e6446ff618..983a5d1e7550 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/AccessTypeTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/AccessTypeTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.accesstype; import java.util.ArrayList; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java index 503830ec7966..3ce7d6421842 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Address.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.accesstype; import java.util.Set; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java index 4cf4e73a2091..e3874789be5a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Area.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.MappedSuperclass; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java index 36fce3fc1354..a5329aa1d696 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Building.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.MappedSuperclass; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java index 66f063e2d1df..f0399150cff3 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Country.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Embeddable; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java index 05a7bd7ac075..f0155ac63365 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Customer.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import java.util.Set; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java index 3bc5baac87cf..ec7223582ea7 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Detail.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Embeddable; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java index b3fc0b01d222..59b1fe351006 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Hominidae.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java index bc8538da33da..bc61e3f5a314 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/House.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Id; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java index 45d8f4446469..6b24fbf70aeb 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Human.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java index 04f48e6098be..49760be270ea 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Inhabitant.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import java.util.Set; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java index 81f3f99b04dc..101e35c11319 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Item.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import java.util.Map; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java index e1c8cb0f1cf1..37bf798b021d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/LivingBeing.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.MappedSuperclass; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java index fa2056cbf031..184a301dc93f 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Mammals.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Order.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Order.java index a7b1d4f94372..4b4188d51f17 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Order.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Order.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import java.util.Date; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java index d29a2faec54d..0f34967d2b1b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Pet.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Embeddable; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java index c3b9c106b78e..5fd6ef06ed6d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Product.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import java.math.BigDecimal; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java index 930c77888cee..fceaff3444ac 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/Shop.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java index a1146414d703..83ba6c81eae0 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/accesstype/User.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.accesstype; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java index 1b9bff3ee14e..4f653ff1c434 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/Image.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.arraytype; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java index 8a102a3b9df5..dd46d9f849f4 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/arraytype/TemperatureSamples.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.arraytype; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java index 58c37f1e8dcf..d0c3ffca0f3b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobEntity.java @@ -16,7 +16,6 @@ */ // $Id: User.java 17903 2009-11-04 13:22:37Z hardy.ferentschik $ - package org.hibernate.jpamodelgen.test.blob; import java.sql.Blob; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobTest.java index 0fe73b6b2103..53e1f7dd4c51 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/blob/BlobTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.blob; import org.testng.annotations.Test; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java index 2ba39f74f39e..1b81e5f0b111 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Cleaner.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.elementcollection; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/ElementCollectionTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/ElementCollectionTest.java index 7afe5f5cb6d0..b2fb1c6c1475 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/ElementCollectionTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/ElementCollectionTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.elementcollection; import java.util.ArrayList; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java index a75396a8f352..469d03f893b9 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hostel.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.elementcollection; import java.util.Map; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java index ffaa4488d547..79419090b031 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Hotel.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.elementcollection; import java.util.Map; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java index 90c1f0ab6318..97d0a71f83b9 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/House.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.elementcollection; import java.util.Map; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java index c6d406cbb65a..76c64bb1f6ad 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/elementcollection/Room.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.elementcollection; import java.math.BigDecimal; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java index cf66373d674c..93776b237cf3 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/embeddablemappedsuperclass/EmbeddableMappedSuperClassTest.java @@ -16,7 +16,6 @@ */ // $Id: BlobTest.java 20721 2010-09-27 12:40:10Z hardy.ferentschik $ - package org.hibernate.jpamodelgen.test.embeddablemappedsuperclass; import org.testng.annotations.Test; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest.java index a15cb79486fd..008be36a271b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.generatedannotation; import org.testng.annotations.Test; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest2.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest2.java index 4eee9d977280..4f8442d8b8d8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest2.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generatedannotation/GeneratedAnnotationTest2.java @@ -16,7 +16,6 @@ */ // $Id: GenericsTest.java 20721 2010-09-27 12:40:10Z hardy.ferentschik $ - package org.hibernate.jpamodelgen.test.generatedannotation; import java.util.HashMap; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java index a40788c69fcf..f4bd950f1e26 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Child.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.generics; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/GenericsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/GenericsTest.java index 38cedb836126..2c4fd593ecc0 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/GenericsTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/GenericsTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.generics; import org.testng.annotations.Test; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java index 7eaac12d5a20..c2f80313554f 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/generics/Parent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.generics; import java.util.Set; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/AbstractEntity.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/AbstractEntity.java index 4b346ddc724b..fad15d58ad52 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/AbstractEntity.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/AbstractEntity.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.inheritance; import javax.persistence.GeneratedValue; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Area.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Area.java index 0e53cd339ea3..5f38c184649d 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Area.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Area.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.inheritance; import javax.persistence.MappedSuperclass; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Building.java index 8ce237ccdc60..4633d0a211fa 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Building.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Building.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.inheritance; import java.sql.Date; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Customer.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Customer.java index bfb2d3df520b..92f1ebc2833b 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Customer.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Customer.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.inheritance; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/House.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/House.java index 0afdde749c04..91255a6e8a69 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/House.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/House.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.inheritance; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/InheritanceTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/InheritanceTest.java index 49c3248589e7..932fa79854fa 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/InheritanceTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/InheritanceTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.inheritance; import org.testng.annotations.Test; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Person.java index baf38caf8ac8..62acbf4f6a90 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Person.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/Person.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.inheritance; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/User.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/User.java index b9eb4831bd5f..d09374825962 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/User.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/User.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.inheritance; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Car.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Car.java index 21b0d2b29717..177a619c413e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Car.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Car.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java index 9afbb281c201..2225ea9e58f9 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Coordinates.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import javax.persistence.Embeddable; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java index 6ff64953ef3b..e0b6c28aaafc 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Insurance.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import javax.persistence.Embeddable; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java index 3362da1d001d..9bbdecbb6ee1 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Location.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import javax.persistence.Access; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/MixedConfigurationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/MixedConfigurationTest.java index fd1dceb8dd12..64913744bed3 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/MixedConfigurationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/MixedConfigurationTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import java.util.ArrayList; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java index 9e27c404c731..1b45a6f2f3bc 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Person.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java index 27d3aabe8ed3..ba2005d10c77 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCar.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java index 58b33b709b11..cb1888e7e602 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/RentalCompany.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Truck.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Truck.java index 6967cd2228b1..f7b12fb99ca8 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Truck.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Truck.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java index 54e7c99e788c..00d5814ac34a 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/Vehicle.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/XmlMetaCompleteTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/XmlMetaCompleteTest.java index 5e6f443c28f2..b2bacc5e4967 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/XmlMetaCompleteTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/XmlMetaCompleteTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import java.util.ArrayList; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java index e3be8bcb04bb..bc7e6ad10481 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/mixedmode/ZeroCoordinates.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.mixedmode; import javax.persistence.Embeddable; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java index 5dd0bcdfcdd7..d38c8008fc20 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/DeskWithRawType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.rawtypes; import java.util.Collection; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java index eef0b9ea39c7..7366eecef0da 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/EmployeeWithRawType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.rawtypes; import java.util.Collection; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/RawTypesTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/RawTypesTest.java index ad69cb7678b4..71e9e9e8bf8f 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/RawTypesTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/rawtypes/RawTypesTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.rawtypes; import org.testng.annotations.Test; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/SeparateCompilationUnitsTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/SeparateCompilationUnitsTest.java index e31a7ab6d760..07a615d3fead 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/SeparateCompilationUnitsTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/separatecompilationunits/SeparateCompilationUnitsTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.separatecompilationunits; import java.io.File; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroup.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroup.java index 822b698ea944..4f405c4d208e 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroup.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroup.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.typedmappedsuperclass; import java.util.Set; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupInTopic.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupInTopic.java index 384e6e2e4b94..ef41531a67e5 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupInTopic.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupInTopic.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.typedmappedsuperclass; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupPost.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupPost.java index ab59d1c3a04b..dfda76320ccd 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupPost.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupPost.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.typedmappedsuperclass; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupPostInTopic.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupPostInTopic.java index be3ffa62a854..6fa3abb83cbb 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupPostInTopic.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/AttachmentGroupPostInTopic.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.typedmappedsuperclass; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/Post.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/Post.java index 8cc221d33e4c..da47e1d87af5 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/Post.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/Post.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.typedmappedsuperclass; import javax.persistence.MappedSuperclass; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/TypesMappedSuperclassTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/TypesMappedSuperclassTest.java index b27561106d3f..2d95e86b79f3 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/TypesMappedSuperclassTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/TypesMappedSuperclassTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.typedmappedsuperclass; import org.testng.annotations.Test; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/UserRole.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/UserRole.java index afce2bad359c..b37c64754eec 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/UserRole.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/UserRole.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.typedmappedsuperclass; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/usertype/UserTypeTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/usertype/UserTypeTest.java index caa5921984e9..ee1e9e259598 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/usertype/UserTypeTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/usertype/UserTypeTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.usertype; import org.testng.annotations.Test; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java index 90d3378671d7..91fe8f1a8c79 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/CompilationTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.util; import java.io.File; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java index 929731c945e6..d36dbb512a12 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/util/TestUtil.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.util; import java.io.BufferedReader; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Address.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Address.java index 2e797e66112e..7bea103de103 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Address.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Address.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Boy.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Boy.java index 4b105a9ad9b4..ef8b25526778 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Boy.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Boy.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; import java.util.List; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java index 7ce2d87add2b..1c843978b315 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Building.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; import org.hibernate.jpamodelgen.test.accesstype.*; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/FakeHero.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/FakeHero.java index 7a0dc155f221..49415ef38726 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/FakeHero.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/FakeHero.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/IgnoreInvalidXmlTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/IgnoreInvalidXmlTest.java index 24afd7da0d24..901c3c6ad541 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/IgnoreInvalidXmlTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/IgnoreInvalidXmlTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; import java.util.ArrayList; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/LivingBeing.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/LivingBeing.java index 64076f7ac3a5..1c9ae45debee 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/LivingBeing.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/LivingBeing.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Mammal.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Mammal.java index eb9868f94b64..446c9fbcf925 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Mammal.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Mammal.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; /** diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java index 5262bba1a0bd..e8d4d4f6a7f4 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/Superhero.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; import javax.persistence.Entity; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/XmlMappingTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/XmlMappingTest.java index ecec25bc3ac2..cca10ab7fa12 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/XmlMappingTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmapped/XmlMappingTest.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.hibernate.jpamodelgen.test.xmlmapped; import java.util.HashMap; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/XmlMetaDataCompleteTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/XmlMetaDataCompleteTest.java index 82674f2f612e..fc62c4201e04 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/XmlMetaDataCompleteTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlmetacomplete/XmlMetaDataCompleteTest.java @@ -16,7 +16,6 @@ */ // $Id: XmlMappingTest.java 20721 2010-09-27 12:40:10Z hardy.ferentschik $ - package org.hibernate.jpamodelgen.test.xmlmetacomplete; import java.util.HashMap; diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlonly/XmlOnlyTest.java b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlonly/XmlOnlyTest.java index c95b8831f5f5..98a062d682a4 100644 --- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlonly/XmlOnlyTest.java +++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/xmlonly/XmlOnlyTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.hibernate.jpamodelgen.test.xmlonly; import java.util.HashMap;