[hibernate-commits] Hibernate SVN: r19861 - in search/trunk/hibernate-search/src/main/java/org/hibernate/search: engine and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2010-06-30 09:38:13 -0400 (Wed, 30 Jun 2010)
New Revision: 19861

Modified:
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/lucene/QueueProcessors.java
   search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
Log:
Fix abusive raw use of generics params

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java	2010-06-30 13:25:04 UTC (rev 19860)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java	2010-06-30 13:38:13 UTC (rev 19861)
@@ -49,7 +49,7 @@
 	
 	private final List<LuceneWork> queue;
 	private final SearchFactoryImplementor searchFactoryImplementor;
-	private final Map<DirectoryProvider,PerDPResources> resourcesMap;
+	private final Map<DirectoryProvider<?>,PerDPResources> resourcesMap;
 	private final boolean sync;
 	private final ErrorHandler errorHandler;
 	
@@ -58,7 +58,7 @@
 
 	LuceneBackendQueueProcessor(List<LuceneWork> queue,
 			SearchFactoryImplementor searchFactoryImplementor,
-			Map<DirectoryProvider,PerDPResources> resourcesMap,
+			Map<DirectoryProvider<?>,PerDPResources> resourcesMap,
 			boolean syncMode) {
 		this.sync = syncMode;
 		this.queue = queue;

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/lucene/QueueProcessors.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/lucene/QueueProcessors.java	2010-06-30 13:25:04 UTC (rev 19860)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/lucene/QueueProcessors.java	2010-06-30 13:38:13 UTC (rev 19861)
@@ -45,10 +45,11 @@
  */
 class QueueProcessors implements PerDirectoryWorkProcessor {
 	
-	private final Map<DirectoryProvider, PerDPResources> resourcesMap;
-	private final Map<DirectoryProvider, PerDPQueueProcessor> dpProcessors = new HashMap<DirectoryProvider, PerDPQueueProcessor>();
+	private final Map<DirectoryProvider<?>, PerDPResources> resourcesMap;
+	private final Map<DirectoryProvider<?>, PerDPQueueProcessor> dpProcessors
+			= new HashMap<DirectoryProvider<?>, PerDPQueueProcessor>();
 	
-	QueueProcessors(Map<DirectoryProvider, PerDPResources> resourcesMap) {
+	QueueProcessors(Map<DirectoryProvider<?>, PerDPResources> resourcesMap) {
 		this.resourcesMap = resourcesMap;
 	}
 

Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java	2010-06-30 13:25:04 UTC (rev 19860)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java	2010-06-30 13:38:13 UTC (rev 19861)
@@ -238,7 +238,7 @@
 	}
 
 	protected Analyzer getAnalyzer(org.hibernate.search.annotations.Analyzer analyzerAnn, ConfigContext context) {
-		Class analyzerClass = analyzerAnn == null ? void.class : analyzerAnn.impl();
+		Class<?> analyzerClass = analyzerAnn == null ? void.class : analyzerAnn.impl();
 		if ( analyzerClass == void.class ) {
 			String definition = analyzerAnn == null ? "" : analyzerAnn.definition();
 			if ( StringHelper.isEmpty( definition ) ) {
@@ -325,7 +325,7 @@
 						"Multiple Similarities defined in the same class hierarchy: " + beanClass.getName()
 				);
 			}
-			Class similarityClass = similarityAnn.impl();
+			Class<?> similarityClass = similarityAnn.impl();
 			try {
 				similarity = ( Similarity ) similarityClass.newInstance();
 			}
@@ -751,16 +751,16 @@
 			throw new AssertionFailure( "A non indexed entity is post processed" );
 		}
 		//this method does not requires synchronization
-		Class plainClass = reflectionManager.toClass( beanClass );
+		Class<?> plainClass = reflectionManager.toClass( beanClass );
 		Set<Class<?>> tempMappedSubclasses = new HashSet<Class<?>>();
 		//together with the caller this creates a o(2), but I think it's still faster than create the up hierarchy for each class
-		for ( Class currentClass : indexedClasses ) {
+		for ( Class<?> currentClass : indexedClasses ) {
 			if ( plainClass != currentClass && plainClass.isAssignableFrom( currentClass ) ) {
 				tempMappedSubclasses.add( currentClass );
 			}
 		}
 		this.mappedSubclasses = Collections.unmodifiableSet( tempMappedSubclasses );
-		Class superClass = plainClass.getSuperclass();
+		Class<?> superClass = plainClass.getSuperclass();
 		this.isRoot = true;
 		while ( superClass != null ) {
 			if ( indexedClasses.contains( superClass ) ) {