HSEARCH-581 No longer use Core's Helper classes

Make use of Hibernate Commons Annotations instead We need to limit our dependencies to Core esp to non public contracts git-svn-id: https://svn.jboss.org/repos/hibernate/search/trunk@20243 1b8cb986-b30d-0410-93ca-fae66ebed9b2
hibernate · Aug 24, 2010 · 3fe4b8a · 3fe4b8a
1 parent 7715b74
commit 3fe4b8a
Show file tree

Hide file tree

Showing 31 changed files with 35 additions and 33 deletions.
diff --git a/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java b/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java
@@ -27,12 +27,12 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.Environment;
 import org.hibernate.search.spi.WorkerBuildContext;
 import org.hibernate.search.backend.impl.TransactionalWorker;
 import org.hibernate.search.cfg.SearchConfiguration;
 import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
 
 /**
  * @author Emmanuel Bernard

diff --git a/...ch/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java b/...ch/src/main/java/org/hibernate/search/backend/configuration/ConfigurationParseHelper.java
@@ -26,7 +26,7 @@
 
 import java.util.Properties;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.SearchException;
 
 /**

diff --git a/...nate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java b/...nate-search/src/main/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
@@ -36,6 +36,7 @@
 import org.slf4j.Logger;
 
 import org.hibernate.annotations.common.AssertionFailure;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.Environment;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.spi.WorkerBuildContext;
@@ -60,7 +61,6 @@
 import org.hibernate.search.util.HibernateHelper;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
 
 /**
  * Batch work until {@link #performWorks} is called.

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigDecimalBridge.java
@@ -26,7 +26,7 @@
 
 import java.math.BigDecimal;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Map a BigDecimal element

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BigIntegerBridge.java
@@ -26,7 +26,7 @@
 
 import java.math.BigInteger;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Map a <code>BigInteger</code> element.

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java
@@ -24,8 +24,8 @@
  */
 package org.hibernate.search.bridge.builtin;
 
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.util.StringHelper;
 
 /**
  * Map a boolean field

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java
@@ -24,11 +24,11 @@
  */
 package org.hibernate.search.bridge.builtin;
 
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.annotations.Resolution;
 import org.hibernate.search.bridge.ParameterizedBridge;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.util.StringHelper;
 import org.apache.lucene.document.DateTools;
 
 import java.util.Date;

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CharacterBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/CharacterBridge.java
@@ -24,7 +24,7 @@
  */
 package org.hibernate.search.bridge.builtin;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Map a character element

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ClassBridge.java
@@ -24,10 +24,10 @@
  */
 package org.hibernate.search.bridge.builtin;
 
+import org.hibernate.annotations.common.util.ReflectHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.bridge.TwoWayStringBridge;
 import org.hibernate.search.SearchException;
-import org.hibernate.util.StringHelper;
-import org.hibernate.util.ReflectHelper;
 
 /**
  * Convert a Class back and forth

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DateBridge.java
@@ -30,11 +30,12 @@
 import java.util.Map;
 
 import org.apache.lucene.document.DateTools;
+
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.bridge.ParameterizedBridge;
 import org.hibernate.search.annotations.Resolution;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.util.StringHelper;
 
 /**
  * Bridge a java.util.Date to a String, truncated to the resolution

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DoubleBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/DoubleBridge.java
@@ -24,7 +24,7 @@
  */
 package org.hibernate.search.bridge.builtin;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Map a double element

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/EnumBridge.java
@@ -24,8 +24,8 @@
  */
 package org.hibernate.search.bridge.builtin;
 
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.bridge.TwoWayStringBridge;
-import org.hibernate.util.StringHelper;
 
 
 /**

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/FloatBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/FloatBridge.java
@@ -24,7 +24,7 @@
  */
 package org.hibernate.search.bridge.builtin;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Map a float element

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/IntegerBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/IntegerBridge.java
@@ -24,7 +24,7 @@
  */
 package org.hibernate.search.bridge.builtin;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Map an integer element

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/LongBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/LongBridge.java
@@ -24,7 +24,7 @@
  */
 package org.hibernate.search.bridge.builtin;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Map a long element

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ShortBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/ShortBridge.java
@@ -24,7 +24,7 @@
  */
 package org.hibernate.search.bridge.builtin;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 
 /**
  * Map a short element

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UriBridge.java
@@ -27,7 +27,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.bridge.TwoWayStringBridge;
 

diff --git a/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java b/hibernate-search/src/main/java/org/hibernate/search/bridge/builtin/UrlBridge.java
@@ -27,9 +27,9 @@
 import java.net.URL;
 import java.net.MalformedURLException;
 
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.bridge.TwoWayStringBridge;
 import org.hibernate.search.SearchException;
-import org.hibernate.util.StringHelper;
 
 /**
  * Bridge for <code>URL</code>s.

diff --git a/...nate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java b/...nate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderContainedEntity.java
@@ -46,6 +46,7 @@
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.XMember;
 import org.hibernate.annotations.common.reflection.XProperty;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.analyzer.Discriminator;
 import org.hibernate.search.annotations.AnalyzerDef;
@@ -71,7 +72,6 @@
 import org.hibernate.search.util.PassThroughAnalyzer;
 import org.hibernate.search.util.ReflectionHelper;
 import org.hibernate.search.util.ScopedAnalyzer;
-import org.hibernate.util.StringHelper;
 
 /**
  * Set up and provide a manager for classes which are indexed via <code>@IndexedEmbedded</code>, but themselves do not

diff --git a/hibernate-search/src/main/java/org/hibernate/search/engine/LoaderHelper.java b/hibernate-search/src/main/java/org/hibernate/search/engine/LoaderHelper.java
@@ -27,7 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.util.ReflectHelper;
+import org.hibernate.annotations.common.util.ReflectHelper;
+
 
 /**
  * @author Emmanuel Bernard

diff --git a/hibernate-search/src/main/java/org/hibernate/search/impl/ConfigContext.java b/hibernate-search/src/main/java/org/hibernate/search/impl/ConfigContext.java
@@ -34,15 +34,15 @@
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.search.Similarity;
 
+import org.hibernate.annotations.common.util.ReflectHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.Environment;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.cfg.SearchConfiguration;
 import org.hibernate.search.util.DelegateNamedAnalyzer;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.ReflectHelper;
-import org.hibernate.util.StringHelper;
 import org.slf4j.Logger;
 
 /**

diff --git a/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java b/hibernate-search/src/main/java/org/hibernate/search/impl/ImmutableSearchFactory.java
@@ -37,6 +37,7 @@
 import org.slf4j.Logger;
 
 import org.hibernate.annotations.common.AssertionFailure;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.Environment;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.Version;
@@ -72,7 +73,6 @@
 import org.hibernate.search.store.optimization.OptimizerStrategy;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
 
 /**
  * This implementation is never directly exposed to the user, it is always wrapped into a {@link org.hibernate.search.impl.MutableSearchFactory}

diff --git a/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java b/hibernate-search/src/main/java/org/hibernate/search/impl/SearchFactoryBuilder.java
@@ -45,6 +45,7 @@
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.Environment;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.Version;
@@ -89,7 +90,6 @@
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.search.util.PluginLoader;
 import org.hibernate.search.util.ReflectionHelper;
-import org.hibernate.util.StringHelper;
 
 /**
  * Build a search factory.

diff --git a/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexControl.java b/hibernate-search/src/main/java/org/hibernate/search/jmx/IndexControl.java
@@ -30,10 +30,10 @@
 import org.hibernate.CacheMode;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.annotations.common.util.ReflectHelper;
 import org.hibernate.search.FullTextSession;
 import org.hibernate.search.Search;
 import org.hibernate.search.util.JNDIHelper;
-import org.hibernate.util.ReflectHelper;
 
 
 /**

diff --git a/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java b/hibernate-search/src/main/java/org/hibernate/search/query/FullTextQueryImpl.java
@@ -58,6 +58,7 @@
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
+import org.hibernate.annotations.common.util.ReflectHelper;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.engine.query.ParameterMetadata;
 import org.hibernate.impl.AbstractQueryImpl;
@@ -86,7 +87,6 @@
 import org.hibernate.search.util.ContextHelper;
 import org.hibernate.search.util.LoggerFactory;
 import org.hibernate.transform.ResultTransformer;
-import org.hibernate.util.ReflectHelper;
 
 import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders;
 import static org.hibernate.search.util.FilterCacheModeTypeHelper.cacheInstance;

diff --git a/hibernate-search/src/main/java/org/hibernate/search/reader/ReaderProviderFactory.java b/hibernate-search/src/main/java/org/hibernate/search/reader/ReaderProviderFactory.java
@@ -27,11 +27,11 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.Environment;
 import org.hibernate.search.spi.BuildContext;
 import org.hibernate.search.cfg.SearchConfiguration;
 import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
 
 /**
  * @author Emmanuel Bernard

diff --git a/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java b/hibernate-search/src/main/java/org/hibernate/search/stat/StatisticsImpl.java
@@ -42,12 +42,12 @@
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
 
+import org.hibernate.annotations.common.util.ReflectHelper;
 import org.hibernate.search.ProjectionConstants;
 import org.hibernate.search.Version;
 import org.hibernate.search.engine.SearchFactoryImplementor;
 import org.hibernate.search.reader.ReaderProvider;
 import org.hibernate.search.store.DirectoryProvider;
-import org.hibernate.util.ReflectHelper;
 
 /**
  * A concurrent implementation of the {@code Statistics} interface.

diff --git a/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderFactory.java b/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderFactory.java
@@ -31,6 +31,7 @@
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.Environment;
 import org.hibernate.search.spi.WritableBuildContext;
 import org.hibernate.search.SearchException;
@@ -43,7 +44,6 @@
 import org.hibernate.search.store.optimization.NoOpOptimizerStrategy;
 import org.hibernate.search.store.optimization.OptimizerStrategy;
 import org.hibernate.search.util.PluginLoader;
-import org.hibernate.util.StringHelper;
 
 /**
  * Create a Lucene directory provider which can be configured

diff --git a/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java b/hibernate-search/src/main/java/org/hibernate/search/store/DirectoryProviderHelper.java
@@ -39,7 +39,7 @@
 import org.apache.lucene.store.SingleInstanceLockFactory;
 import org.slf4j.Logger;
 
-import org.hibernate.util.StringHelper;
+import org.hibernate.annotations.common.util.StringHelper;
 import org.hibernate.search.SearchException;
 import org.hibernate.search.util.FileHelper;
 import org.hibernate.search.util.LoggerFactory;

diff --git a/hibernate-search/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java b/hibernate-search/src/main/java/org/hibernate/search/util/HibernateSearchResourceLoader.java
@@ -35,7 +35,7 @@
 import org.apache.solr.common.ResourceLoader;
 import org.apache.solr.util.plugin.ResourceLoaderAware;
 
-import org.hibernate.util.ReflectHelper;
+import org.hibernate.annotations.common.util.ReflectHelper;
 import org.hibernate.search.SearchException;
 
 /**

diff --git a/hibernate-search/src/main/java/org/hibernate/search/util/PluginLoader.java b/hibernate-search/src/main/java/org/hibernate/search/util/PluginLoader.java
@@ -24,8 +24,8 @@
  */
 package org.hibernate.search.util;
 
+import org.hibernate.annotations.common.util.ReflectHelper;
 import org.hibernate.search.SearchException;
-import org.hibernate.util.ReflectHelper;
 
 /**
  * Utility class to load instances of other classes by using a fully qualified name,