[hibernate-commits] Hibernate SVN: r15567 - in search/trunk: src/java/org/hibernate/search and 9 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Sun Nov 16 10:06:50 EST 2008
Author: sannegrinovero
Date: 2008-11-16 10:06:50 -0500 (Sun, 16 Nov 2008)
New Revision: 15567
Modified:
search/trunk/readme.txt
search/trunk/src/java/org/hibernate/search/FullTextQuery.java
search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java
search/trunk/src/java/org/hibernate/search/backend/Workspace.java
search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java
search/trunk/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java
search/trunk/src/java/org/hibernate/search/engine/FilterDef.java
search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
search/trunk/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java
search/trunk/src/java/org/hibernate/search/util/HibernateSearchResourceLoader.java
search/trunk/src/java/org/hibernate/search/util/WeakIdentityHashMap.java
Log:
Removal of old TODO, @SuppressWarnings which didn't apply anymore, unused imports and variables.
Fix some typos in comments and javadoc.
Modified: search/trunk/readme.txt
===================================================================
--- search/trunk/readme.txt 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/readme.txt 2008-11-16 15:06:50 UTC (rev 15567)
@@ -15,7 +15,7 @@
Hibernate Search is using Apache Lucene(tm) under the cover.
-Hibernate Requires Hibernate Core 3.3 and above.
+Hibernate Search Requires Hibernate Core 3.3 and above.
This version runs well with Hibernate Annotations 3.4.x and Hibernate EntityManager 3.4.x
Modified: search/trunk/src/java/org/hibernate/search/FullTextQuery.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/FullTextQuery.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/FullTextQuery.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -9,7 +9,7 @@
import org.hibernate.transform.ResultTransformer;
/**
- * The base interface for lucene powered searches.
+ * The base interface for Lucene powered searches.
*
* @author Hardy Ferentschik
* @author Emmanuel Bernard
Modified: search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -31,7 +31,6 @@
* If the filter accept parameters, an @Key method must be present as well
*
*/
- @SuppressWarnings("unchecked")
Class<?> impl();
/**
Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -36,7 +36,6 @@
* @author Hardy Ferentschik
* @author Sanne Grinovero
*/
-//TODO introduce the notion of read only IndexReader? We cannot enforce it because Lucene uses abstract classes, not interfaces.
//TODO renaming to "DirectoryWorkspace" would be nice.
public class Workspace {
Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -3,8 +3,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -159,12 +157,12 @@
}
}
}
- if (fallBack != null) {
+ if ( fallBack != null ) {
Enumeration<?> fallBackNames = fallBack.propertyNames();
while ( fallBackNames.hasMoreElements() ) {
Object key = fallBackNames.nextElement();
if ( String.class.isInstance( key ) ) {
- maskedProperties.add( (String) key );
+ maskedProperties.add( key );
}
}
}
Modified: search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -133,7 +133,7 @@
+ impl );
}
if ( cb.params().length > 0 && ParameterizedBridge.class.isAssignableFrom( impl ) ) {
- Map params = new HashMap( cb.params().length );
+ Map<String, String> params = new HashMap<String, String>( cb.params().length );
for ( Parameter param : cb.params() ) {
params.put( param.name(), param.value() );
}
@@ -175,7 +175,7 @@
bridge = builtInBridges.get( returnType.getName() );
if ( bridge == null && returnType.isEnum() ) {
bridge = new TwoWayString2FieldBridgeAdaptor(
- new EnumBridge( (Class<? extends Enum>) reflectionManager.toClass( returnType ) )
+ new EnumBridge( reflectionManager.toClass( returnType ) )
);
}
}
@@ -209,7 +209,7 @@
);
}
if ( bridgeAnn.params().length > 0 && ParameterizedBridge.class.isAssignableFrom( impl ) ) {
- Map params = new HashMap( bridgeAnn.params().length );
+ Map<String, String> params = new HashMap<String, String>( bridgeAnn.params().length );
for ( Parameter param : bridgeAnn.params() ) {
params.put( param.name(), param.value() );
}
Modified: search/trunk/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/cfg/SearchConfigurationFromHibernateCore.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -59,7 +59,6 @@
private static class ClassIterator implements Iterator<Class<?>> {
private Iterator hibernatePersistentClassIterator;
private Class<?> future;
- private Class<?> current;
private ClassIterator(Iterator hibernatePersistentClassIterator) {
this.hibernatePersistentClassIterator = hibernatePersistentClassIterator;
Modified: search/trunk/src/java/org/hibernate/search/engine/FilterDef.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/FilterDef.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/engine/FilterDef.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -16,7 +16,6 @@
* @author Emmanuel Bernard
*/
//TODO serialization
- at SuppressWarnings("unchecked")
public class FilterDef {
private Method factoryMethod;
private Method keyMethod;
Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -12,7 +12,6 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.WeakHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantLock;
@@ -57,8 +56,6 @@
* @author Emmanuel Bernard
*/
public class SearchFactoryImpl implements SearchFactoryImplementor {
- private static final ThreadLocal<WeakHashMap<SearchConfiguration, SearchFactoryImpl>> contexts =
- new ThreadLocal<WeakHashMap<SearchConfiguration, SearchFactoryImpl>>();
static {
Version.touch();
Modified: search/trunk/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/reader/NotSharedReaderProvider.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -18,7 +18,7 @@
*/
public class NotSharedReaderProvider implements ReaderProvider {
@SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
- public IndexReader openReader(DirectoryProvider[] directoryProviders) {
+ public IndexReader openReader(DirectoryProvider... directoryProviders) {
final int length = directoryProviders.length;
IndexReader[] readers = new IndexReader[length];
try {
Modified: search/trunk/src/java/org/hibernate/search/util/HibernateSearchResourceLoader.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/util/HibernateSearchResourceLoader.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/util/HibernateSearchResourceLoader.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.BufferedReader;
-import java.io.Reader;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
Modified: search/trunk/src/java/org/hibernate/search/util/WeakIdentityHashMap.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/util/WeakIdentityHashMap.java 2008-11-15 15:23:25 UTC (rev 15566)
+++ search/trunk/src/java/org/hibernate/search/util/WeakIdentityHashMap.java 2008-11-16 15:06:50 UTC (rev 15567)
@@ -166,7 +166,7 @@
*/
public WeakIdentityHashMap() {
this.loadFactor = DEFAULT_LOAD_FACTOR;
- threshold = (int) ( DEFAULT_INITIAL_CAPACITY );
+ threshold = DEFAULT_INITIAL_CAPACITY;
table = new Entry[DEFAULT_INITIAL_CAPACITY];
}
More information about the hibernate-commits
mailing list