Skip to content

Commit

Permalink
HSEARCH-2269 Moved *String2FieldBridge*Adaptor classes to an impl pac…
Browse files Browse the repository at this point in the history 
…kage that is accessible to other modules

This will allow to use them in the Elasticsearch module, while clearly notifying users they should not access this package.
The target package is already exported for OSGi.
  • Loading branch information
@yrodiere
yrodiere committed Oct 5, 2016
1 parent 925a14f commit 54f916b
Show file tree
Hide file tree
Showing 18 changed files with 20 additions and 16 deletions.
1 change: 1 addition & 0 deletions engine/src/main/java/org/hibernate/search/bridge/builtin/impl/BuiltinArrayBridge.java
View file
Expand Up @@ -11,6 +11,7 @@
import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.builtin.ArrayBridge;
import org.hibernate.search.bridge.builtin.DefaultStringBridge;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;

/**
* An implementation of {@link org.hibernate.search.bridge.builtin.ArrayBridge} that can be used with Hibernate Search query DSL.
Expand Down
1 change: 1 addition & 0 deletions engine/src/main/java/org/hibernate/search/bridge/builtin/impl/BuiltinIterableBridge.java
View file
Expand Up @@ -11,6 +11,7 @@
import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.builtin.DefaultStringBridge;
import org.hibernate.search.bridge.builtin.IterableBridge;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;

/**
* An implementation of {@link org.hibernate.search.bridge.builtin.IterableBridge} that can be used with Hibernate Search query DSL.
Expand Down
1 change: 1 addition & 0 deletions engine/src/main/java/org/hibernate/search/bridge/builtin/impl/BuiltinMapBridge.java
View file
Expand Up @@ -10,6 +10,7 @@
import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.builtin.DefaultStringBridge;
import org.hibernate.search.bridge.builtin.MapBridge;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;

/**
* An implementation of {@link org.hibernate.search.bridge.builtin.MapBridge} that can be used with Hibernate Search query DSL.
Expand Down
1 change: 1 addition & 0 deletions engine/src/main/java/org/hibernate/search/bridge/builtin/impl/NullEncodingFieldBridge.java
View file
Expand Up @@ -11,6 +11,7 @@
import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.bridge.LuceneOptions;
import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;

/**
* @author Davide D'Alto
Expand Down
4 changes: 2 additions & 2 deletions engine/src/main/java/org/hibernate/search/bridge/impl/BasicJDKTypesBridgeProvider.java
View file
Expand Up @@ -31,9 +31,9 @@
import org.hibernate.search.bridge.builtin.UUIDBridge;
import org.hibernate.search.bridge.builtin.UriBridge;
import org.hibernate.search.bridge.builtin.UrlBridge;
import org.hibernate.search.bridge.builtin.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.bridge.builtin.impl.TwoWayString2FieldBridgeIgnoreAnalyzerAdaptor;
import org.hibernate.search.bridge.spi.BridgeProvider;
import org.hibernate.search.bridge.util.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.bridge.util.impl.TwoWayString2FieldBridgeIgnoreAnalyzerAdaptor;
import org.hibernate.search.engine.service.spi.ServiceManager;

/**
Expand Down
4 changes: 2 additions & 2 deletions engine/src/main/java/org/hibernate/search/bridge/impl/BridgeFactory.java
View file
Expand Up @@ -30,9 +30,9 @@
import org.hibernate.search.bridge.builtin.impl.BuiltinArrayBridge;
import org.hibernate.search.bridge.builtin.impl.BuiltinIterableBridge;
import org.hibernate.search.bridge.builtin.impl.BuiltinMapBridge;
import org.hibernate.search.bridge.builtin.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.bridge.builtin.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.bridge.spi.IndexManagerTypeSpecificBridgeProvider;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.bridge.util.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.bridge.spi.BridgeProvider;
import org.hibernate.search.engine.service.classloading.spi.ClassLoaderService;
import org.hibernate.search.engine.service.spi.ServiceManager;
Expand Down
2 changes: 1 addition & 1 deletion engine/src/main/java/org/hibernate/search/bridge/impl/EnumBridgeProvider.java
View file
Expand Up @@ -9,8 +9,8 @@

import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.bridge.builtin.EnumBridge;
import org.hibernate.search.bridge.builtin.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.bridge.spi.BridgeProvider;
import org.hibernate.search.bridge.util.impl.TwoWayString2FieldBridgeAdaptor;

/**
* Provide a bridge for enums.
Expand Down
2 changes: 1 addition & 1 deletion engine/src/main/java/org/hibernate/search/bridge/impl/JavaTimeBridgeProvider.java
View file
Expand Up @@ -26,7 +26,6 @@
import java.util.Map;

import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.bridge.builtin.impl.TwoWayString2FieldBridgeIgnoreAnalyzerAdaptor;
import org.hibernate.search.bridge.builtin.time.impl.DurationBridge;
import org.hibernate.search.bridge.builtin.time.impl.InstantBridge;
import org.hibernate.search.bridge.builtin.time.impl.LocalDateBridge;
Expand All @@ -42,6 +41,7 @@
import org.hibernate.search.bridge.builtin.time.impl.ZoneOffsetBridge;
import org.hibernate.search.bridge.builtin.time.impl.ZonedDateTimeBridge;
import org.hibernate.search.bridge.spi.BridgeProvider;
import org.hibernate.search.bridge.util.impl.TwoWayString2FieldBridgeIgnoreAnalyzerAdaptor;
import org.hibernate.search.util.logging.impl.Log;
import org.hibernate.search.util.logging.impl.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...iltin/impl/String2FieldBridgeAdaptor.java → .../util/impl/String2FieldBridgeAdaptor.java
View file
Expand Up @@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.search.bridge.builtin.impl;
package org.hibernate.search.bridge.util.impl;

import org.apache.lucene.document.Document;

Expand Down
2 changes: 1 addition & 1 deletion ...impl/TwoWayString2FieldBridgeAdaptor.java → ...impl/TwoWayString2FieldBridgeAdaptor.java
View file
Expand Up @@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.search.bridge.builtin.impl;
package org.hibernate.search.bridge.util.impl;

import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
Expand Down
2 changes: 1 addition & 1 deletion ...ing2FieldBridgeIgnoreAnalyzerAdaptor.java → ...ing2FieldBridgeIgnoreAnalyzerAdaptor.java
View file
Expand Up @@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.search.bridge.builtin.impl;
package org.hibernate.search.bridge.util.impl;

import org.hibernate.search.bridge.TwoWayStringBridge;
import org.hibernate.search.bridge.spi.IgnoreAnalyzerBridge;
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/hibernate/search/engine/metadata/impl/AnnotationMetadataProvider.java
View file
Expand Up @@ -71,10 +71,10 @@
import org.hibernate.search.bridge.builtin.NumericFieldBridge;
import org.hibernate.search.bridge.builtin.impl.NullEncodingFieldBridge;
import org.hibernate.search.bridge.builtin.impl.NullEncodingTwoWayFieldBridge;
import org.hibernate.search.bridge.builtin.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.bridge.builtin.time.impl.NumericTimeBridge;
import org.hibernate.search.bridge.impl.BridgeFactory;
import org.hibernate.search.bridge.util.impl.NumericFieldUtils;
import org.hibernate.search.bridge.util.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.engine.BoostStrategy;
import org.hibernate.search.engine.impl.AnnotationProcessingHelper;
import org.hibernate.search.engine.impl.ConfigContext;
Expand Down
2 changes: 1 addition & 1 deletion engine/src/main/java/org/hibernate/search/engine/spi/DocumentBuilderIndexedEntity.java
View file
Expand Up @@ -49,8 +49,8 @@
import org.hibernate.search.bridge.builtin.NumericEncodingDateBridge;
import org.hibernate.search.bridge.builtin.NumericFieldBridge;
import org.hibernate.search.bridge.builtin.StringEncodingDateBridge;
import org.hibernate.search.bridge.builtin.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.bridge.spi.ConversionContext;
import org.hibernate.search.bridge.util.impl.TwoWayString2FieldBridgeAdaptor;
import org.hibernate.search.engine.ProjectionConstants;
import org.hibernate.search.engine.impl.ConfigContext;
import org.hibernate.search.engine.impl.FacetHandling;
Expand Down
2 changes: 1 addition & 1 deletion engine/src/test/java/org/hibernate/search/test/bridge/DefaultStringBridgeTest.java
View file
Expand Up @@ -16,7 +16,7 @@
import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.builtin.DefaultStringBridge;
import org.hibernate.search.bridge.builtin.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.cfg.spi.SearchConfiguration;
import org.hibernate.search.engine.impl.ConfigContext;
import org.hibernate.search.engine.metadata.impl.AnnotationMetadataProvider;
Expand Down
2 changes: 1 addition & 1 deletion orm/src/test/java/org/hibernate/search/test/bridge/provider/MovieBridgeProvider.java
View file
Expand Up @@ -9,8 +9,8 @@

import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.builtin.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.bridge.spi.BridgeProvider;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;

/**
* @author Emmanuel Bernard
Expand Down
2 changes: 1 addition & 1 deletion orm/src/test/java/org/hibernate/search/test/bridge/provider/TheaterBridgeProvider1.java
View file
Expand Up @@ -9,8 +9,8 @@

import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.builtin.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.bridge.spi.BridgeProvider;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;

/**
* @author Emmanuel Bernard
Expand Down
2 changes: 1 addition & 1 deletion orm/src/test/java/org/hibernate/search/test/bridge/provider/TheaterBridgeProvider2.java
View file
Expand Up @@ -9,8 +9,8 @@

import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.bridge.StringBridge;
import org.hibernate.search.bridge.builtin.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.bridge.spi.BridgeProvider;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;

/**
* @author Emmanuel Bernard
Expand Down
2 changes: 1 addition & 1 deletion orm/src/test/java/org/hibernate/search/test/query/dsl/DSLTest.java
View file
Expand Up @@ -40,7 +40,7 @@
import org.hibernate.search.FullTextSession;
import org.hibernate.search.Search;
import org.hibernate.search.annotations.Factory;
import org.hibernate.search.bridge.builtin.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.bridge.util.impl.String2FieldBridgeAdaptor;
import org.hibernate.search.cfg.Environment;
import org.hibernate.search.cfg.SearchMapping;
import org.hibernate.search.exception.SearchException;
Expand Down

0 comments on commit 54f916b

Please sign in to comment.