Hibernate SVN: r20798 - validator/branches.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-10-10 21:14:57 -0400 (Sun, 10 Oct 2010)
New Revision: 20798
Added:
validator/branches/Branch_3_0_0_GA_CP/
Log:
create cp branch for eap 4.x
Copied: validator/branches/Branch_3_0_0_GA_CP (from rev 20797, validator/tags/v3_0_0_GA)
14 years, 4 months
Hibernate SVN: r20797 - validator/branches.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-10-10 21:13:29 -0400 (Sun, 10 Oct 2010)
New Revision: 20797
Added:
validator/branches/Branch_3_1_0_GA_CP/
Log:
create cp branch for eap 5.x
Copied: validator/branches/Branch_3_1_0_GA_CP (from rev 20796, validator/tags/3.1.0.GA)
14 years, 4 months
Hibernate SVN: r20796 - in search/trunk/hibernate-search/src: main/java/org/hibernate/search/backend/impl/blackhole and 12 other directories.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2010-10-10 17:20:22 -0400 (Sun, 10 Oct 2010)
New Revision: 20796
Removed:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/v2/impl/
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/classloading/
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/optimizer/
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/blackhole/BlackHoleBackendQueueProcessorFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessorFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MappingModelMetadataProvider.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/QueryCustomization.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/BuildContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/WritableBuildContext.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/ReflectionHelper.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/configuration/mutablefactory/A.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/id/Foo.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/reader/functionality/TestableSharingBufferReaderProvider.java
Log:
fixing some javadoc typos and removing some unneeded import statements, and old empty packages
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -26,10 +26,8 @@
import java.util.Properties;
import java.util.List;
-import java.util.Set;
import org.hibernate.search.spi.WorkerBuildContext;
-import org.hibernate.search.store.DirectoryProvider;
/**
* Interface for different types of queue processor factories. Implementations need a no-arg constructor.
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/blackhole/BlackHoleBackendQueueProcessorFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/blackhole/BlackHoleBackendQueueProcessorFactory.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/blackhole/BlackHoleBackendQueueProcessorFactory.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -30,7 +30,6 @@
import org.hibernate.search.backend.UpdatableBackendQueueProcessorFactory;
import org.hibernate.search.spi.WorkerBuildContext;
-import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.store.DirectoryProvider;
import org.hibernate.search.util.LoggerFactory;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessorFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessorFactory.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/jgroups/JGroupsBackendQueueProcessorFactory.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -39,7 +39,6 @@
import org.hibernate.search.backend.UpdatableBackendQueueProcessorFactory;
import org.hibernate.search.spi.WorkerBuildContext;
import org.hibernate.search.SearchException;
-import org.hibernate.search.backend.BackendQueueProcessorFactory;
import org.hibernate.search.backend.LuceneWork;
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.store.DirectoryProvider;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -26,7 +26,6 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;
-import javax.management.ObjectName;
import org.apache.lucene.search.Similarity;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MappingModelMetadataProvider.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MappingModelMetadataProvider.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MappingModelMetadataProvider.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -44,7 +44,6 @@
import org.hibernate.annotations.common.reflection.Filter;
import org.hibernate.annotations.common.reflection.MetadataProvider;
import org.hibernate.annotations.common.reflection.ReflectionUtil;
-import org.hibernate.search.SearchException;
import org.hibernate.search.annotations.Analyzer;
import org.hibernate.search.annotations.AnalyzerDef;
import org.hibernate.search.annotations.AnalyzerDefs;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/impl/MassIndexerImpl.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -27,7 +27,6 @@
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
-import javax.management.ObjectName;
import org.slf4j.Logger;
@@ -39,7 +38,6 @@
import org.hibernate.search.batchindexing.MassIndexerProgressMonitor;
import org.hibernate.search.engine.SearchFactoryImplementor;
import org.hibernate.search.jmx.IndexingProgressMonitor;
-import org.hibernate.search.jmx.IndexingProgressMonitorMBean;
import org.hibernate.search.util.LoggerFactory;
/**
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/QueryCustomization.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/QueryCustomization.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/query/dsl/QueryCustomization.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -1,7 +1,6 @@
package org.hibernate.search.query.dsl;
import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.Query;
/**
* Operations common to all types of queries
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/BuildContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/BuildContext.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/BuildContext.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.search.spi;
import java.util.Set;
@@ -27,7 +50,7 @@
* to
* <code>
* void method() {
- * int size = directoryProviders().size();
+ * int size = directoryProviders.size();
* }
* </code>
* where directoryProviders is a class variable.
@@ -39,7 +62,7 @@
Set<DirectoryProvider<?>> getDirectoryProviders();
/**
- * This method cannot be used in intialize methods. start methods can use it though.
+ * This method cannot be used in initialize methods. start methods can use it though.
* @param provider
* @return
*/
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/WritableBuildContext.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/WritableBuildContext.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/spi/WritableBuildContext.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -1,3 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
package org.hibernate.search.spi;
import org.hibernate.search.backend.LuceneIndexingParameters;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/ReflectionHelper.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/ReflectionHelper.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/util/ReflectionHelper.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -26,7 +26,6 @@
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Member;
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import org.hibernate.annotations.common.reflection.XMember;
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/configuration/mutablefactory/A.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/configuration/mutablefactory/A.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/configuration/mutablefactory/A.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -1,9 +1,5 @@
package org.hibernate.search.test.configuration.mutablefactory;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-
import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Indexed;
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/containedIn/Entity1ForDoc0.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -4,9 +4,7 @@
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
import javax.persistence.Version;
/**
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/id/Foo.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/id/Foo.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/id/Foo.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -23,14 +23,10 @@
*/
package org.hibernate.search.test.id;
-import java.lang.annotation.Documented;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import org.hibernate.search.annotations.DocumentId;
-import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.Indexed;
/**
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/reader/functionality/TestableSharingBufferReaderProvider.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/reader/functionality/TestableSharingBufferReaderProvider.java 2010-10-10 21:13:35 UTC (rev 20795)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/reader/functionality/TestableSharingBufferReaderProvider.java 2010-10-10 21:20:22 UTC (rev 20796)
@@ -294,7 +294,7 @@
}
// @Override not defined in Lucene 3.0, existed before
- protected void doCommit() throws IOException {
+ protected void doCommit() {
throw new UnsupportedOperationException();
}
14 years, 4 months
Hibernate SVN: r20795 - search/trunk/hibernate-search-solr-analyzers.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2010-10-10 17:13:35 -0400 (Sun, 10 Oct 2010)
New Revision: 20795
Modified:
search/trunk/hibernate-search-solr-analyzers/
Log:
setting svn:ignore rules for eclipse on hibernate-search-solr-analyzers
Property changes on: search/trunk/hibernate-search-solr-analyzers
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.classpath
.project
14 years, 4 months
Hibernate SVN: r20793 - validator.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-10-09 16:49:52 -0400 (Sat, 09 Oct 2010)
New Revision: 20793
Added:
validator/patches/
Log:
creating patches directory for stliu
14 years, 4 months
Hibernate SVN: r20792 - entitymanager.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-10-09 16:49:33 -0400 (Sat, 09 Oct 2010)
New Revision: 20792
Added:
entitymanager/patches/
Log:
creating patches directory for stliu
14 years, 4 months
Hibernate SVN: r20790 - annotations.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-10-08 23:48:58 -0400 (Fri, 08 Oct 2010)
New Revision: 20790
Added:
annotations/patches/
Log:
create patches for one-off purpous
14 years, 4 months
Hibernate SVN: r20788 - validator/tags.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-10-08 08:59:30 -0400 (Fri, 08 Oct 2010)
New Revision: 20788
Added:
validator/tags/git-marker/
Log:
marker tag for vcs move to git on github
Copied: validator/tags/git-marker (from rev 20787, validator/trunk)
14 years, 4 months
Hibernate SVN: r20786 - in jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen: model and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-10-07 08:22:12 -0400 (Thu, 07 Oct 2010)
New Revision: 20786
Modified:
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/FileTimeStampChecker.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java
Log:
METAGEN-28 Unrelated coding style fixes
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationEmbeddable.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -46,7 +46,7 @@
public List<MetaAttribute> getMembers() {
if ( !initialized ) {
- context.logMessage( Diagnostic.Kind.OTHER, "Entity " + getQualifiedName() + " was lazily initialised." );
+ getContext().logMessage( Diagnostic.Kind.OTHER, "Entity " + getQualifiedName() + " was lazily initialised." );
init();
initialized = true;
}
@@ -57,10 +57,10 @@
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append( "AnnotationEmbeddable" );
- sb.append( "{element=" ).append( element );
+ sb.append( "{element=" ).append( getElement() );
sb.append( ", members=" );
if ( initialized ) {
- sb.append( members );
+ sb.append( getMembers() );
}
else {
sb.append( "[un-initalized]" );
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaAttribute.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -79,7 +79,7 @@
}
}
- public MetaEntity getParent() {
+ public MetaEntity getHostingEntity() {
return parent;
}
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaEntity.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -50,10 +50,10 @@
*/
public class AnnotationMetaEntity implements MetaEntity {
- protected final ImportContext importContext;
- protected final TypeElement element;
- protected final Map<String, MetaAttribute> members;
- protected Context context;
+ private final ImportContext importContext;
+ private final TypeElement element;
+ private final Map<String, MetaAttribute> members;
+ private Context context;
private AccessTypeInformation entityAccessTypeInfo;
@@ -75,19 +75,19 @@
return entityAccessTypeInfo;
}
- public Context getContext() {
+ public final Context getContext() {
return context;
}
- public String getSimpleName() {
+ public final String getSimpleName() {
return element.getSimpleName().toString();
}
- public String getQualifiedName() {
+ public final String getQualifiedName() {
return element.getQualifiedName().toString();
}
- public String getPackageName() {
+ public final String getPackageName() {
PackageElement packageOf = context.getElementUtils().getPackageOf( element );
return context.getElementUtils().getName( packageOf.getQualifiedName() ).toString();
}
@@ -117,6 +117,10 @@
return sb.toString();
}
+ protected TypeElement getElement() {
+ return element;
+ }
+
private void addPersistentMembers(List<? extends Element> membersOfClass, AccessType membersKind) {
for ( Element memberOfClass : membersOfClass ) {
AccessType forcedAccessType = TypeUtils.determineAnnotationSpecifiedAccessType( memberOfClass );
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/AnnotationMetaMap.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -37,7 +37,7 @@
}
public String getDeclarationString() {
- return "public static volatile " + getParent().importType( getMetaType() ) + "<" + getParent().importType( getParent().getQualifiedName() ) + ", " + getParent()
- .importType( keyType ) + ", " + getParent().importType( getTypeDeclaration() ) + "> " + getPropertyName() + ";";
+ return "public static volatile " + getHostingEntity().importType( getMetaType() ) + "<" + getHostingEntity().importType( getHostingEntity().getQualifiedName() ) + ", " + getHostingEntity()
+ .importType( keyType ) + ", " + getHostingEntity().importType( getTypeDeclaration() ) + "> " + getPropertyName() + ";";
}
}
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/model/MetaAttribute.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -31,5 +31,5 @@
String getTypeDeclaration();
- MetaEntity getParent();
+ MetaEntity getHostingEntity();
}
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/FileTimeStampChecker.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/FileTimeStampChecker.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/FileTimeStampChecker.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -28,9 +28,8 @@
*/
public class FileTimeStampChecker implements Serializable {
+ private Map<String, Long> lastModifiedCache;
- Map<String, Long> lastModifiedCache;
-
public FileTimeStampChecker() {
lastModifiedCache = new HashMap<String, Long>();
}
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaAttribute.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -28,21 +28,21 @@
*/
public abstract class XmlMetaAttribute implements MetaAttribute {
- protected final XmlMetaEntity parentEntity;
+ private final XmlMetaEntity hostingEntity;
private final String propertyName;
private final String type;
XmlMetaAttribute(XmlMetaEntity parent, String propertyName, String type) {
- this.parentEntity = parent;
+ this.hostingEntity = parent;
this.propertyName = propertyName;
this.type = type;
}
@Override
public String getDeclarationString() {
- return "public static volatile " + parentEntity.importType( getMetaType() )
- + "<" + parentEntity.importType( parentEntity.getQualifiedName() )
- + ", " + parentEntity.importType( getTypeDeclaration() )
+ return "public static volatile " + hostingEntity.importType( getMetaType() )
+ + "<" + hostingEntity.importType( hostingEntity.getQualifiedName() )
+ + ", " + hostingEntity.importType( getTypeDeclaration() )
+ "> " + getPropertyName() + ";";
}
@@ -54,8 +54,8 @@
return type;
}
- public MetaEntity getParent() {
- return parentEntity;
+ public MetaEntity getHostingEntity() {
+ return hostingEntity;
}
@Override
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaCollection.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -26,7 +26,7 @@
*/
public class XmlMetaCollection extends XmlMetaAttribute implements MetaCollection {
- String collectionType;
+ private String collectionType;
public XmlMetaCollection(XmlMetaEntity parent, String propertyName, String type, String collectionType) {
super(parent, propertyName, type);
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java 2010-10-07 12:21:20 UTC (rev 20785)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/xml/XmlMetaMap.java 2010-10-07 12:22:12 UTC (rev 20786)
@@ -19,6 +19,8 @@
package org.hibernate.jpamodelgen.xml;
+import org.hibernate.jpamodelgen.model.MetaEntity;
+
/**
* @author Hardy Ferentschik
*/
@@ -32,11 +34,18 @@
}
public String getDeclarationString() {
- return "public static volatile "
- + parentEntity.importType( getMetaType() )
- + "<" + parentEntity.importType( parentEntity.getQualifiedName() )
- + ", " + parentEntity.importType( keyType ) + ", "
- + parentEntity.importType( getTypeDeclaration() )
- + "> " + getPropertyName() + ";";
+ final MetaEntity hostingEntity = getHostingEntity();
+ return new StringBuilder().append( "public static volatile " )
+ .append( hostingEntity.importType( getMetaType() ) )
+ .append( "<" )
+ .append( hostingEntity.importType( hostingEntity.getQualifiedName() ) )
+ .append( ", " )
+ .append( hostingEntity.importType( keyType ) )
+ .append( ", " )
+ .append( hostingEntity.importType( getTypeDeclaration() ) )
+ .append( "> " )
+ .append( getPropertyName() )
+ .append( ";" )
+ .toString();
}
}
\ No newline at end of file
14 years, 4 months
Hibernate SVN: r20785 - in jpamodelgen/trunk/src: main/java/org/hibernate/jpamodelgen/util and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-10-07 08:21:20 -0400 (Thu, 07 Oct 2010)
New Revision: 20785
Added:
jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/
jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java
jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/PhoneNumber.java
jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/UserTypeTest.java
Modified:
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/TypeUtils.java
Log:
METAGEN-28 Added check for @Type to isBasicAttribute(). Made sure @Type is not directly referenced. Added test.
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java 2010-10-07 09:36:10 UTC (rev 20784)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java 2010-10-07 12:21:20 UTC (rev 20785)
@@ -59,6 +59,12 @@
*/
private static final String ORG_HIBERNATE_ANNOTATIONS_TARGET = "org.hibernate.annotations.Target";
+ /**
+ * FQCN of the Hibernate specific @Type annotation. We do not use the class directly to avoid depending on Hibernate
+ * Core.
+ */
+ private static final String ORG_HIBERNATE_ANNOTATIONS_TYPE = "org.hibernate.annotations.Type";
+
private final AnnotationMetaEntity entity;
private final Context context;
@@ -162,7 +168,7 @@
@Override
public AnnotationMetaAttribute visitExecutable(ExecutableType t, Element p) {
if ( !p.getKind().equals( ElementKind.METHOD ) ) {
- return null;
+ return null;
}
String string = p.getSimpleName().toString();
@@ -181,6 +187,11 @@
return true;
}
+ // METAGEN-28
+ if ( TypeUtils.getAnnotationMirror( element, ORG_HIBERNATE_ANNOTATIONS_TYPE ) != null ) {
+ return true;
+ }
+
BasicAttributeVisitor basicVisitor = new BasicAttributeVisitor( context );
return returnedElement.asType().accept( basicVisitor, returnedElement );
}
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/TypeUtils.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/TypeUtils.java 2010-10-07 09:36:10 UTC (rev 20784)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/util/TypeUtils.java 2010-10-07 12:21:20 UTC (rev 20785)
@@ -170,21 +170,21 @@
}
/**
- * Returns the annotation mirror for the specified annotation class from the {@code Element}.
+ * Checks whether the {@code Element} hosts the annotation with the given fully qualified class name.
*
* @param element the element to check for the hosted annotation
- * @param clazz the annotation class to check for
+ * @param fqcn the fully qualified class name of the annotation to check for
*
* @return the annotation mirror for the specified annotation class from the {@code Element} or {@code null} in case
* the {@code TypeElement} does not host the specified annotation.
*/
- public static AnnotationMirror getAnnotationMirror(Element element, Class<? extends Annotation> clazz) {
+ public static AnnotationMirror getAnnotationMirror(Element element, String fqcn) {
assert element != null;
- assert clazz != null;
+ assert fqcn != null;
AnnotationMirror mirror = null;
for ( AnnotationMirror am : element.getAnnotationMirrors() ) {
- if ( isAnnotationMirrorOfType( am, clazz ) ) {
+ if ( isAnnotationMirrorOfType( am, fqcn ) ) {
mirror = am;
break;
}
@@ -192,6 +192,20 @@
return mirror;
}
+ /**
+ * Checks whether the {@code Element} hosts an annotation of the specified class.
+ *
+ * @param element the element to check for the hosted annotation
+ * @param clazz the annotation class to check for
+ *
+ * @return the annotation mirror for the specified annotation class from the {@code Element} or {@code null} in case
+ * the {@code TypeElement} does not host the specified annotation.
+ */
+ public static AnnotationMirror getAnnotationMirror(Element element, Class<? extends Annotation> clazz) {
+ assert clazz != null;
+ return getAnnotationMirror( element, clazz.getName() );
+ }
+
public static Object getAnnotationValue(AnnotationMirror annotationMirror, String parameterValue) {
assert annotationMirror != null;
assert parameterValue != null;
Added: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java
===================================================================
--- jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java (rev 0)
+++ jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java 2010-10-07 12:21:20 UTC (rev 20785)
@@ -0,0 +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.
+ */
+
+// $Id:$
+package org.hibernate.jpamodelgen.test.usertype;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.Type;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Entity
+public class ContactDetails {
+ @Id
+ private long id;
+
+ @Type(type = "foo")
+ private PhoneNumber phoneNumber;
+}
+
+
Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/ContactDetails.java
___________________________________________________________________
Name: svn:keywords
+ Id
Added: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/PhoneNumber.java
===================================================================
--- jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/PhoneNumber.java (rev 0)
+++ jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/PhoneNumber.java 2010-10-07 12:21:20 UTC (rev 20785)
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+// $Id:$
+package org.hibernate.jpamodelgen.test.usertype;
+
+/**
+ * @author Hardy Ferentschik
+ */
+public class PhoneNumber {
+}
+
+
Property changes on: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/PhoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/UserTypeTest.java (from rev 20783, jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/typedmappedsuperclass/TypesMappedSuperclassTest.java)
===================================================================
--- jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/UserTypeTest.java (rev 0)
+++ jpamodelgen/trunk/src/test/java/org/hibernate/jpamodelgen/test/usertype/UserTypeTest.java 2010-10-07 12:21:20 UTC (rev 20785)
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+// $Id$
+
+package org.hibernate.jpamodelgen.test.usertype;
+
+import org.testng.annotations.Test;
+
+import org.hibernate.jpamodelgen.test.util.CompilationTest;
+
+import static org.hibernate.jpamodelgen.test.util.TestUtil.assertMetamodelClassGeneratedFor;
+import static org.hibernate.jpamodelgen.test.util.TestUtil.assertPresenceOfFieldInMetamodelFor;
+
+/**
+ * @author Hardy Ferentschik
+ * @see METAGEN-28
+ */
+public class UserTypeTest extends CompilationTest {
+ @Test
+ public void testCustomUserTypeInMetaModel() {
+ assertMetamodelClassGeneratedFor( ContactDetails.class );
+ assertPresenceOfFieldInMetamodelFor(
+ ContactDetails.class, "phoneNumber", "@Type annotated filed should be in metamodel"
+ );
+ }
+
+ @Override
+ protected String getPackageNameOfCurrentTest() {
+ return UserTypeTest.class.getPackage().getName();
+ }
+}
\ No newline at end of file
14 years, 4 months