From 4a47f00602f12fe7cccc3e94d456c895ebb8477a Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Wed, 3 Apr 2013 17:18:42 +0100 Subject: [PATCH] HSEARCH-1292 Fixes spaces between parenthesis --- .../backend/impl/TransactionalWorker.java | 2 +- .../search/bridge/BridgeException.java | 8 ++- .../search/bridge/builtin/BooleanBridge.java | 2 +- .../search/bridge/builtin/CalendarBridge.java | 35 +++++----- .../builtin/DoubleNumericFieldBridge.java | 2 +- .../builtin/FloatNumericFieldBridge.java | 2 +- .../builtin/IntegerNumericFieldBridge.java | 2 +- .../builtin/LongNumericFieldBridge.java | 2 +- .../bridge/builtin/NumericFieldBridge.java | 2 +- .../impl/TwoWayString2FieldBridgeAdaptor.java | 2 +- .../bridge/util/impl/NumericFieldUtils.java | 2 +- .../search/cfg/AnalyzerDefMapping.java | 14 ++-- .../search/cfg/CalendarBridgeMapping.java | 16 ++--- .../search/cfg/ClassBridgeMapping.java | 27 ++++---- .../search/cfg/ContainedInMapping.java | 2 +- .../search/cfg/DateBridgeMapping.java | 17 +++-- .../search/cfg/EntityDescriptor.java | 2 +- .../search/cfg/FieldBridgeDirectMapping.java | 4 +- .../search/cfg/FieldBridgeMapping.java | 6 +- .../search/cfg/FullTextFilterDefMapping.java | 16 ++--- .../search/cfg/IndexEmbeddedMapping.java | 16 ++--- .../search/cfg/NumericFieldMapping.java | 7 +- .../hibernate/search/cfg/PropertyMapping.java | 18 +++--- .../search/cfg/ProvidedIdMapping.java | 14 ++-- .../hibernate/search/cfg/SearchMapping.java | 4 +- .../search/cfg/TokenFilterDefMapping.java | 12 ++-- .../engine/spi/AbstractDocumentBuilder.java | 4 +- .../impl/IncrementalSearchConfiguration.java | 2 +- .../search/impl/SearchMappingBuilder.java | 24 +++---- .../avro/impl/AvroDeserializer.java | 64 +++++++++---------- .../avro/impl/AvroSerializer.java | 22 +++---- .../serialization/impl/CopyTokenStream.java | 8 +-- ...ableSerializationLuceneWorkSerializer.java | 6 +- .../impl/SerializationHelper.java | 10 +-- .../impl/SerializableDoubleField.java | 3 +- .../impl/SerializableFloatField.java | 2 +- .../impl/SerializableIntField.java | 2 +- .../impl/SerializableLongField.java | 3 +- .../impl/SerializableNumericField.java | 1 + .../impl/SerializableReaderField.java | 1 + .../impl/SerializableStringField.java | 1 + .../impl/SerializableTokenStreamField.java | 1 + .../javaserialization/impl/Update.java | 1 + .../query/dsl/impl/BooleanQueryBuilder.java | 11 ++-- .../query/dsl/impl/ConnectedFuzzyContext.java | 6 +- ...onnectedMultiFieldsPhraseQueryBuilder.java | 6 +- ...ConnectedMultiFieldsRangeQueryBuilder.java | 4 +- .../dsl/impl/ConnectedPhraseContext.java | 2 +- .../impl/ConnectedPhraseMatchingContext.java | 2 +- .../query/dsl/impl/ConnectedRangeContext.java | 2 +- .../impl/ConnectedRangeMatchingContext.java | 2 +- .../dsl/impl/ConnectedSpatialContext.java | 2 +- .../impl/ConnectedSpatialMatchingContext.java | 8 +-- .../query/dsl/impl/ConnectedTermContext.java | 10 +-- .../dsl/impl/ConnectedWildcardContext.java | 4 +- .../query/engine/impl/TimeoutManagerImpl.java | 2 +- .../spatial/SpatialFieldBridgeByQuadTree.java | 8 +-- .../spatial/impl/DistanceComparator.java | 4 +- .../hibernate/search/spatial/impl/Point.java | 2 +- .../search/spatial/impl/QuadTreeFilter.java | 2 +- .../search/spatial/impl/SpatialHelper.java | 21 +++--- .../impl/SpatialQueryBuilderFromPoint.java | 2 +- .../store/impl/FSMasterDirectoryProvider.java | 2 +- .../store/impl/IdHashShardingStrategy.java | 2 +- .../impl/ExplicitOnlyOptimizerStrategy.java | 2 +- .../impl/ConfigurationParseHelper.java | 18 +++--- .../configuration/impl/MaskedProperty.java | 2 +- .../search/util/impl/ScopedAnalyzer.java | 2 +- .../CacheManagerServiceProvider.java | 6 +- .../impl/InfinispanDirectoryProvider.java | 2 +- .../impl/EventSourceTransactionContext.java | 8 +-- .../AbstractJMSHibernateSearchController.java | 2 +- .../impl/IdentifierProducer.java | 2 +- .../impl/OptionallyWrapInJTATransaction.java | 4 +- ...FullTextSharedSessionBuilderDelegator.java | 2 +- .../query/hibernate/impl/AbstractLoader.java | 2 +- .../impl/CriteriaObjectsInitializer.java | 2 +- .../impl/LookupObjectsInitializer.java | 2 +- .../impl/MultiClassesQueryLoader.java | 2 +- .../hibernate/impl/ProjectionLoader.java | 18 +++--- 80 files changed, 289 insertions(+), 282 deletions(-) diff --git a/engine/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java b/engine/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java index ce022663875..7c348c4156e 100644 --- a/engine/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java +++ b/engine/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java @@ -74,7 +74,7 @@ public void performWork(Work work, TransactionContext transactionContext) { && factory.getDocumentBuilderContainedEntity( entityType ) == null ) { throw new SearchException( "Unable to perform work. Entity Class is not @Indexed nor hosts @ContainedIn: " + entityType ); } - work = interceptWork(indexBindingForEntity, work); + work = interceptWork( indexBindingForEntity, work ); if (work == null) { //nothing to do return; diff --git a/engine/src/main/java/org/hibernate/search/bridge/BridgeException.java b/engine/src/main/java/org/hibernate/search/bridge/BridgeException.java index c0523371db1..0872e56159c 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/BridgeException.java +++ b/engine/src/main/java/org/hibernate/search/bridge/BridgeException.java @@ -34,19 +34,21 @@ * @author Emmanuel Bernard */ public class BridgeException extends SearchException { + public BridgeException() { super(); } public BridgeException(String message) { - super(message); + super( message ); } public BridgeException(String message, Throwable cause) { - super(message, cause); + super( message, cause ); } public BridgeException(Throwable cause) { - super(cause); + super( cause ); } + } diff --git a/engine/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java b/engine/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java index 4f7b7f96d67..545220e2774 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java +++ b/engine/src/main/java/org/hibernate/search/bridge/builtin/BooleanBridge.java @@ -34,7 +34,7 @@ public class BooleanBridge implements TwoWayStringBridge { public Boolean stringToObject(String stringValue) { - if ( StringHelper.isEmpty(stringValue) ) return null; + if ( StringHelper.isEmpty( stringValue ) ) return null; return Boolean.valueOf( stringValue ); } diff --git a/engine/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java b/engine/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java index 8dbad799ef1..58c51c7dacf 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java +++ b/engine/src/main/java/org/hibernate/search/bridge/builtin/CalendarBridge.java @@ -62,26 +62,27 @@ public void setParameterValues(Map parameters) { this.resolution = DateResolutionUtil.getLuceneResolution( hibResolution ); } - public Object stringToObject(String stringValue) { + public Object stringToObject(String stringValue) { if ( StringHelper.isEmpty( stringValue ) ) { - return null; - } - try { - Date date = DateTools.stringToDate( stringValue ); - Calendar calendar = Calendar.getInstance(); - calendar.setTime( date ); - return calendar; - } catch (ParseException e) { - throw new SearchException( "Unable to parse into calendar: " + stringValue, e ); - } + return null; + } + try { + Date date = DateTools.stringToDate( stringValue ); + Calendar calendar = Calendar.getInstance(); + calendar.setTime( date ); + return calendar; + } + catch ( ParseException e ) { + throw new SearchException( "Unable to parse into calendar: " + stringValue, e ); + } } public String objectToString(Object object) { - if (object == null) { - return null; - } - Calendar calendar = (Calendar)object; - return DateTools.dateToString(calendar.getTime(),resolution); - } + if ( object == null ) { + return null; + } + Calendar calendar = (Calendar) object; + return DateTools.dateToString( calendar.getTime(), resolution ); + } } diff --git a/engine/src/main/java/org/hibernate/search/bridge/builtin/DoubleNumericFieldBridge.java b/engine/src/main/java/org/hibernate/search/bridge/builtin/DoubleNumericFieldBridge.java index b643d580592..34099174f65 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/builtin/DoubleNumericFieldBridge.java +++ b/engine/src/main/java/org/hibernate/search/bridge/builtin/DoubleNumericFieldBridge.java @@ -30,6 +30,6 @@ public class DoubleNumericFieldBridge extends NumericFieldBridge { public Object get(String name, Document document) { - return Double.valueOf(document.getFieldable(name).stringValue()); + return Double.valueOf( document.getFieldable( name ).stringValue() ); } } diff --git a/engine/src/main/java/org/hibernate/search/bridge/builtin/FloatNumericFieldBridge.java b/engine/src/main/java/org/hibernate/search/bridge/builtin/FloatNumericFieldBridge.java index 40c91cd64aa..3ac859af44f 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/builtin/FloatNumericFieldBridge.java +++ b/engine/src/main/java/org/hibernate/search/bridge/builtin/FloatNumericFieldBridge.java @@ -30,6 +30,6 @@ public class FloatNumericFieldBridge extends NumericFieldBridge { public Object get(String name, Document document) { - return Float.valueOf(document.getFieldable(name).stringValue()); + return Float.valueOf( document.getFieldable( name ).stringValue() ); } } diff --git a/engine/src/main/java/org/hibernate/search/bridge/builtin/IntegerNumericFieldBridge.java b/engine/src/main/java/org/hibernate/search/bridge/builtin/IntegerNumericFieldBridge.java index 1e3438091f8..a3a5f6ad23d 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/builtin/IntegerNumericFieldBridge.java +++ b/engine/src/main/java/org/hibernate/search/bridge/builtin/IntegerNumericFieldBridge.java @@ -30,6 +30,6 @@ public class IntegerNumericFieldBridge extends NumericFieldBridge { public Object get(String name, Document document) { - return Integer.valueOf(document.getFieldable(name).stringValue()); + return Integer.valueOf( document.getFieldable( name ).stringValue() ); } } diff --git a/engine/src/main/java/org/hibernate/search/bridge/builtin/LongNumericFieldBridge.java b/engine/src/main/java/org/hibernate/search/bridge/builtin/LongNumericFieldBridge.java index 480829fe20a..67e14db5cef 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/builtin/LongNumericFieldBridge.java +++ b/engine/src/main/java/org/hibernate/search/bridge/builtin/LongNumericFieldBridge.java @@ -30,6 +30,6 @@ public class LongNumericFieldBridge extends NumericFieldBridge { public Object get(String name, Document document) { - return Long.valueOf(document.getFieldable(name).stringValue()); + return Long.valueOf( document.getFieldable( name ).stringValue() ); } } diff --git a/engine/src/main/java/org/hibernate/search/bridge/builtin/NumericFieldBridge.java b/engine/src/main/java/org/hibernate/search/bridge/builtin/NumericFieldBridge.java index 9b84eaf6154..8b3f044bc82 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/builtin/NumericFieldBridge.java +++ b/engine/src/main/java/org/hibernate/search/bridge/builtin/NumericFieldBridge.java @@ -33,7 +33,7 @@ public abstract class NumericFieldBridge implements TwoWayFieldBridge { public void set(String name, Object value, Document document, LuceneOptions luceneOptions) { if (value != null) { - luceneOptions.addNumericFieldToDocument(name, value, document); + luceneOptions.addNumericFieldToDocument( name, value, document ); } } diff --git a/engine/src/main/java/org/hibernate/search/bridge/builtin/impl/TwoWayString2FieldBridgeAdaptor.java b/engine/src/main/java/org/hibernate/search/bridge/builtin/impl/TwoWayString2FieldBridgeAdaptor.java index a0c583d2b4e..6b8f0a2a81e 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/builtin/impl/TwoWayString2FieldBridgeAdaptor.java +++ b/engine/src/main/java/org/hibernate/search/bridge/builtin/impl/TwoWayString2FieldBridgeAdaptor.java @@ -54,7 +54,7 @@ public Object get(String name, Document document) { return stringBridge.stringToObject( null ); } else { - String stringValue = DocumentBuilderHelper.extractStringFromFieldable(field); + String stringValue = DocumentBuilderHelper.extractStringFromFieldable( field ); return stringBridge.stringToObject( stringValue ); } } diff --git a/engine/src/main/java/org/hibernate/search/bridge/util/impl/NumericFieldUtils.java b/engine/src/main/java/org/hibernate/search/bridge/util/impl/NumericFieldUtils.java index dc16a9a7528..1a565946c8a 100644 --- a/engine/src/main/java/org/hibernate/search/bridge/util/impl/NumericFieldUtils.java +++ b/engine/src/main/java/org/hibernate/search/bridge/util/impl/NumericFieldUtils.java @@ -76,7 +76,7 @@ else if ( to != null ) { * @return the created Query */ public static Query createExactMatchQuery(String fieldName, Object value) { - return createNumericRangeQuery(fieldName, value, value, true, true); + return createNumericRangeQuery( fieldName, value, value, true, true ); } public static void setNumericValue(Object value, NumericField numericField) { diff --git a/engine/src/main/java/org/hibernate/search/cfg/AnalyzerDefMapping.java b/engine/src/main/java/org/hibernate/search/cfg/AnalyzerDefMapping.java index 6bd09be0f56..aa5c9f162c2 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/AnalyzerDefMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/AnalyzerDefMapping.java @@ -40,7 +40,7 @@ public class AnalyzerDefMapping { AnalyzerDefMapping(String name, Class tokenizerFactory, SearchMapping mapping) { this.mapping = mapping; this.analyzerDef = new HashMap(); - mapping.addAnalyzerDef(analyzerDef); + mapping.addAnalyzerDef( analyzerDef ); analyzerDef.put( "name", name ); tokenizer = new HashMap(); tokenizer.put( "factory", tokenizerFactory ); @@ -51,9 +51,9 @@ public class AnalyzerDefMapping { * {@code @TokenizerDef(, ... params={@Parameter(name="name", value="value"), ...}) } */ public AnalyzerDefMapping tokenizerParam(String name, String value) { - Map param = SearchMapping.addElementToAnnotationArray(tokenizer, "params"); - param.put("name", name); - param.put("value", value); + Map param = SearchMapping.addElementToAnnotationArray( tokenizer, "params" ); + param.put( "name", name ); + param.put( "value", value ); return this; } @@ -61,15 +61,15 @@ public AnalyzerDefMapping tokenizerParam(String name, String value) { * {@code @TokenFilterDef(factory=factory) } */ public TokenFilterDefMapping filter(Class factory) { - return new TokenFilterDefMapping(factory, analyzerDef, mapping); + return new TokenFilterDefMapping( factory, analyzerDef, mapping ); } public AnalyzerDefMapping analyzerDef(String name, Class tokenizerFactory) { - return new AnalyzerDefMapping(name, tokenizerFactory, mapping); + return new AnalyzerDefMapping( name, tokenizerFactory, mapping ); } public EntityMapping entity(Class entityType) { - return new EntityMapping(entityType,mapping); + return new EntityMapping( entityType, mapping ); } } diff --git a/engine/src/main/java/org/hibernate/search/cfg/CalendarBridgeMapping.java b/engine/src/main/java/org/hibernate/search/cfg/CalendarBridgeMapping.java index a45b54a6916..f652c819617 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/CalendarBridgeMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/CalendarBridgeMapping.java @@ -39,31 +39,31 @@ public class CalendarBridgeMapping { private PropertyDescriptor property; public CalendarBridgeMapping(SearchMapping mapping,EntityDescriptor entity,PropertyDescriptor property, Resolution resolution) { - if (resolution == null) { - throw new SearchException("Resolution required in order to index calendar property"); + if ( resolution == null ) { + throw new SearchException( "Resolution required in order to index calendar property" ); } this.mapping = mapping; this.resolution = new HashMap(); this.entity = entity; this.property = property; - this.resolution.put("resolution", resolution); - property.setCalendarBridge(this.resolution); + this.resolution.put( "resolution", resolution ); + property.setCalendarBridge( this.resolution ); } public FieldMapping field() { - return new FieldMapping(property, entity, mapping); + return new FieldMapping( property, entity, mapping ); } public PropertyMapping property(String name, ElementType type) { - return new PropertyMapping(name, type, entity, mapping); + return new PropertyMapping( name, type, entity, mapping ); } public AnalyzerDefMapping analyzerDef(String name, Class tokenizerFactory) { - return new AnalyzerDefMapping(name, tokenizerFactory, mapping); + return new AnalyzerDefMapping( name, tokenizerFactory, mapping ); } public EntityMapping entity(Class entityType) { - return new EntityMapping(entityType, mapping); + return new EntityMapping( entityType, mapping ); } } diff --git a/engine/src/main/java/org/hibernate/search/cfg/ClassBridgeMapping.java b/engine/src/main/java/org/hibernate/search/cfg/ClassBridgeMapping.java index 92ac596a418..578ff240025 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/ClassBridgeMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/ClassBridgeMapping.java @@ -43,41 +43,41 @@ public class ClassBridgeMapping { public ClassBridgeMapping(SearchMapping mapping, EntityDescriptor entity, Class impl) { this.mapping = mapping; this.entity = entity; - this.classBridge = new HashMap(); - entity.addClassBridgeDef(classBridge); - if (impl != null) { - this.classBridge.put("impl", impl); + this.classBridge = new HashMap(); + entity.addClassBridgeDef( classBridge ); + if ( impl != null ) { + this.classBridge.put( "impl", impl ); } } public ClassBridgeMapping name(String name) { - this.classBridge.put("name", name); + this.classBridge.put( "name", name ); return this; } public ClassBridgeMapping store(Store store) { - this.classBridge.put("store", store); + this.classBridge.put( "store", store ); return this; } public ClassBridgeMapping index(Index index) { - this.classBridge.put("index", index); + this.classBridge.put( "index", index ); return this; } public ClassBridgeMapping analyze(Analyze analyze) { - this.classBridge.put("analyze", analyze); + this.classBridge.put( "analyze", analyze ); return this; } public ClassBridgeMapping norms(Norms norms) { - this.classBridge.put("norms", norms); + this.classBridge.put( "norms", norms ); return this; } public ClassBridgeMapping termVector(TermVector termVector) { - this.classBridge.put("termVector", termVector); + this.classBridge.put( "termVector", termVector ); return this; } @@ -102,11 +102,10 @@ public ClassBridgeMapping analyzer(String analyzerDef) { return this; } - public ClassBridgeMapping param(String name, String value) { - Map param = SearchMapping.addElementToAnnotationArray(classBridge, "params"); - param.put("name", name); - param.put("value", value); + Map param = SearchMapping.addElementToAnnotationArray( classBridge, "params" ); + param.put( "name", name ); + param.put( "value", value ); return this; } diff --git a/engine/src/main/java/org/hibernate/search/cfg/ContainedInMapping.java b/engine/src/main/java/org/hibernate/search/cfg/ContainedInMapping.java index 08a715f5021..045213dcab6 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/ContainedInMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/ContainedInMapping.java @@ -41,7 +41,7 @@ public ContainedInMapping(SearchMapping mapping,PropertyDescriptor property, Ent this.property = property; this.entity = entity; Map containedIn = new HashMap(); - property.setContainedIn(containedIn); + property.setContainedIn( containedIn ); } public FieldMapping field() { diff --git a/engine/src/main/java/org/hibernate/search/cfg/DateBridgeMapping.java b/engine/src/main/java/org/hibernate/search/cfg/DateBridgeMapping.java index eadb7176914..d680aa4bc10 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/DateBridgeMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/DateBridgeMapping.java @@ -39,32 +39,31 @@ public class DateBridgeMapping { private PropertyDescriptor property; public DateBridgeMapping(SearchMapping mapping,EntityDescriptor entity,PropertyDescriptor property, Resolution resolution) { - if (resolution == null) { - throw new SearchException("Resolution required in order to index calendar property"); + if ( resolution == null ) { + throw new SearchException( "Resolution required in order to index calendar property" ); } this.mapping = mapping; this.resolution = new HashMap(); this.entity = entity; this.property = property; - this.resolution.put("resolution", resolution); - property.setDateBridge(this.resolution); + this.resolution.put( "resolution", resolution ); + property.setDateBridge( this.resolution ); } - public FieldMapping field() { - return new FieldMapping(property, entity, mapping); + return new FieldMapping( property, entity, mapping ); } public PropertyMapping property(String name, ElementType type) { - return new PropertyMapping(name, type, entity, mapping); + return new PropertyMapping( name, type, entity, mapping ); } public AnalyzerDefMapping analyzerDef(String name, Class tokenizerFactory) { - return new AnalyzerDefMapping(name, tokenizerFactory, mapping); + return new AnalyzerDefMapping( name, tokenizerFactory, mapping ); } public EntityMapping entity(Class entityType) { - return new EntityMapping(entityType, mapping); + return new EntityMapping( entityType, mapping ); } } diff --git a/engine/src/main/java/org/hibernate/search/cfg/EntityDescriptor.java b/engine/src/main/java/org/hibernate/search/cfg/EntityDescriptor.java index 9b2f012d0be..9e94579ae42 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/EntityDescriptor.java +++ b/engine/src/main/java/org/hibernate/search/cfg/EntityDescriptor.java @@ -119,7 +119,7 @@ public Set> getClassBridgeDefs() { } public void addSpatial(Map spatial) { - spatials.add(spatial); + spatials.add( spatial ); } public Set> getSpatials() { diff --git a/engine/src/main/java/org/hibernate/search/cfg/FieldBridgeDirectMapping.java b/engine/src/main/java/org/hibernate/search/cfg/FieldBridgeDirectMapping.java index 601cdcfee4e..c2f76473edb 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/FieldBridgeDirectMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/FieldBridgeDirectMapping.java @@ -45,8 +45,8 @@ public FieldBridgeDirectMapping(PropertyDescriptor property, EntityDescriptor en public FieldBridgeDirectMapping param(String name, String value) { Map param = SearchMapping.addElementToAnnotationArray( fieldBridgeAnn, "params" ); - param.put("name", name); - param.put("value", value); + param.put( "name", name ); + param.put( "value", value ); return this; } diff --git a/engine/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java b/engine/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java index 79dabcdd08a..49b13c91145 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/FieldBridgeMapping.java @@ -57,9 +57,9 @@ public FieldBridgeMapping(Class impl, Map field, } public FieldBridgeMapping param(String name, String value) { - Map param = SearchMapping.addElementToAnnotationArray(bridge, "params"); - param.put("name", name); - param.put("value", value); + Map param = SearchMapping.addElementToAnnotationArray( bridge, "params" ); + param.put( "name", name ); + param.put( "value", value ); return this; } diff --git a/engine/src/main/java/org/hibernate/search/cfg/FullTextFilterDefMapping.java b/engine/src/main/java/org/hibernate/search/cfg/FullTextFilterDefMapping.java index 3bf1b254ebb..d4473e6829d 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/FullTextFilterDefMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/FullTextFilterDefMapping.java @@ -40,10 +40,10 @@ public class FullTextFilterDefMapping { public FullTextFilterDefMapping(SearchMapping mapping, String name, Class impl) { this.mapping = mapping; - this.fullTextFilterDef =new HashMap(); - this.fullTextFilterDef.put("name", name); - this.fullTextFilterDef.put("impl", impl); - mapping.addFulltextFilterDef(fullTextFilterDef); + this.fullTextFilterDef = new HashMap(); + this.fullTextFilterDef.put( "name", name ); + this.fullTextFilterDef.put( "impl", impl ); + mapping.addFulltextFilterDef( fullTextFilterDef ); } /** @@ -53,19 +53,19 @@ public FullTextFilterDefMapping(SearchMapping mapping, String name, Class imp * @return FullTextFilterDefMapping */ public FullTextFilterDefMapping cache(FilterCacheModeType cache) { - this.fullTextFilterDef.put("cache", cache); + this.fullTextFilterDef.put( "cache", cache ); return this; } public FullTextFilterDefMapping fullTextFilterDef(String name, Class impl) { - return new FullTextFilterDefMapping(mapping, name, impl); + return new FullTextFilterDefMapping( mapping, name, impl ); } public AnalyzerDefMapping analyzerDef(String name, Class tokenizerFactory) { - return new AnalyzerDefMapping(name, tokenizerFactory, mapping); + return new AnalyzerDefMapping( name, tokenizerFactory, mapping ); } public EntityMapping entity(Class entityType) { - return new EntityMapping(entityType, mapping); + return new EntityMapping( entityType, mapping ); } } diff --git a/engine/src/main/java/org/hibernate/search/cfg/IndexEmbeddedMapping.java b/engine/src/main/java/org/hibernate/search/cfg/IndexEmbeddedMapping.java index 5de0838fb5a..aac5276b0b2 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/IndexEmbeddedMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/IndexEmbeddedMapping.java @@ -41,38 +41,38 @@ public IndexEmbeddedMapping(SearchMapping mapping, PropertyDescriptor property, this.indexEmbedded = new HashMap(); this.property = property; this.entity = entity; - this.property.setIndexEmbedded(indexEmbedded); + this.property.setIndexEmbedded( indexEmbedded ); } public IndexEmbeddedMapping prefix(String prefix) { - this.indexEmbedded.put("prefix",prefix); + this.indexEmbedded.put( "prefix", prefix ); return this; } public IndexEmbeddedMapping targetElement(Class targetElement) { - this.indexEmbedded.put("targetElement",targetElement); + this.indexEmbedded.put( "targetElement", targetElement ); return this; } public IndexEmbeddedMapping depth(int depth) { - this.indexEmbedded.put("depth", depth); + this.indexEmbedded.put( "depth", depth ); return this; } public PropertyMapping property(String name, ElementType type) { - return new PropertyMapping(name, type, entity, mapping); + return new PropertyMapping( name, type, entity, mapping ); } public AnalyzerDefMapping analyzerDef(String name, Class tokenizerFactory) { - return new AnalyzerDefMapping(name, tokenizerFactory, mapping); + return new AnalyzerDefMapping( name, tokenizerFactory, mapping ); } public EntityMapping entity(Class entityType) { - return new EntityMapping(entityType, mapping); + return new EntityMapping( entityType, mapping ); } public FieldMapping field() { - return new FieldMapping(property, entity, mapping); + return new FieldMapping( property, entity, mapping ); } } diff --git a/engine/src/main/java/org/hibernate/search/cfg/NumericFieldMapping.java b/engine/src/main/java/org/hibernate/search/cfg/NumericFieldMapping.java index 88a1c91f9b2..302e9f23e62 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/NumericFieldMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/NumericFieldMapping.java @@ -27,15 +27,16 @@ * @author Gustavo Fernandes */ public class NumericFieldMapping extends FieldMapping { + private final Map numericField = new HashMap(); public NumericFieldMapping(PropertyDescriptor property, EntityDescriptor entity, SearchMapping mapping) { - super(property,entity,mapping); - property.addNumericField(numericField); + super( property, entity, mapping ); + property.addNumericField( numericField ); } public NumericFieldMapping precisionStep(int precisionStep) { - numericField.put("precisionStep", precisionStep); + numericField.put( "precisionStep", precisionStep ); return this; } diff --git a/engine/src/main/java/org/hibernate/search/cfg/PropertyMapping.java b/engine/src/main/java/org/hibernate/search/cfg/PropertyMapping.java index c52de6bc229..b79df07e6df 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/PropertyMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/PropertyMapping.java @@ -46,7 +46,7 @@ public class PropertyMapping { public PropertyMapping(String name, ElementType type, EntityDescriptor entity, SearchMapping mapping) { this.mapping = mapping; this.entity = entity; - this.property = entity.getProperty(name, type); + this.property = entity.getProperty( name, type ); } protected PropertyMapping(PropertyDescriptor property, EntityDescriptor entity, SearchMapping mapping) { @@ -86,35 +86,35 @@ public CalendarBridgeMapping calendarBridge(Resolution resolution) { public PropertyMapping analyzerDiscriminator(Class discriminator) { Map analyzerDiscriminatorAnn = new HashMap(); analyzerDiscriminatorAnn.put( "impl", discriminator ); - property.setAnalyzerDiscriminator(analyzerDiscriminatorAnn); + property.setAnalyzerDiscriminator( analyzerDiscriminatorAnn ); return this; } public PropertyMapping dynamicBoost(Class impl) { final Map dynamicBoostAnn = new HashMap(); - dynamicBoostAnn.put("impl", impl); - property.setDynamicBoost(dynamicBoostAnn); + dynamicBoostAnn.put( "impl", impl ); + property.setDynamicBoost( dynamicBoostAnn ); return this; } public PropertyMapping property(String name, ElementType type) { - return new PropertyMapping(name, type, entity, mapping); + return new PropertyMapping( name, type, entity, mapping ); } public AnalyzerDefMapping analyzerDef(String name, Class tokenizerFactory) { - return new AnalyzerDefMapping(name, tokenizerFactory, mapping); + return new AnalyzerDefMapping( name, tokenizerFactory, mapping ); } public EntityMapping entity(Class entityType) { - return new EntityMapping(entityType, mapping); + return new EntityMapping( entityType, mapping ); } public IndexEmbeddedMapping indexEmbedded() { - return new IndexEmbeddedMapping(mapping,property,entity); + return new IndexEmbeddedMapping( mapping, property, entity ); } public ContainedInMapping containedIn() { - return new ContainedInMapping(mapping, property, entity); + return new ContainedInMapping( mapping, property, entity ); } public PropertyMapping bridge(Class fieldBridge) { diff --git a/engine/src/main/java/org/hibernate/search/cfg/ProvidedIdMapping.java b/engine/src/main/java/org/hibernate/search/cfg/ProvidedIdMapping.java index e48ca318fe5..0eea9c2935a 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/ProvidedIdMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/ProvidedIdMapping.java @@ -37,13 +37,13 @@ public class ProvidedIdMapping { public ProvidedIdMapping(SearchMapping searchMapping, EntityDescriptor entity) { this.searchMapping = searchMapping; - this.entity =entity; + this.entity = entity; providedIdMapping = new HashMap(); - entity.setProvidedId(providedIdMapping); + entity.setProvidedId( providedIdMapping ); } public ProvidedIdMapping name(String name) { - this.providedIdMapping.put("name", name); + this.providedIdMapping.put( "name", name ); return this; } @@ -52,19 +52,19 @@ public FieldBridgeMapping bridge(Class impl) { } public FullTextFilterDefMapping fullTextFilterDef(String name, Class impl) { - return new FullTextFilterDefMapping(searchMapping, name, impl); + return new FullTextFilterDefMapping( searchMapping, name, impl ); } public PropertyMapping property(String name, ElementType type) { - return new PropertyMapping(name, type, entity, searchMapping); + return new PropertyMapping( name, type, entity, searchMapping ); } public AnalyzerDefMapping analyzerDef(String name, Class tokenizerFactory) { - return new AnalyzerDefMapping(name, tokenizerFactory, searchMapping); + return new AnalyzerDefMapping( name, tokenizerFactory, searchMapping ); } public EntityMapping entity(Class entityType) { - return new EntityMapping(entityType, searchMapping); + return new EntityMapping( entityType, searchMapping ); } } diff --git a/engine/src/main/java/org/hibernate/search/cfg/SearchMapping.java b/engine/src/main/java/org/hibernate/search/cfg/SearchMapping.java index d70e33c66c1..1cd32163ea9 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/SearchMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/SearchMapping.java @@ -92,14 +92,14 @@ void addAnalyzerDef(Map analyzerDef) { EntityDescriptor getEntity(Class entityType) { EntityDescriptor entity = entities.get( entityType ); if (entity == null) { - entity = new EntityDescriptor(entityType); + entity = new EntityDescriptor( entityType ); entities.put( entityType, entity ); } return entity; } void addFulltextFilterDef(Map fullTextFilterDef) { - fullTextFilterDefs.add(fullTextFilterDef); + fullTextFilterDefs.add( fullTextFilterDef ); } } diff --git a/engine/src/main/java/org/hibernate/search/cfg/TokenFilterDefMapping.java b/engine/src/main/java/org/hibernate/search/cfg/TokenFilterDefMapping.java index 1f62fb337c2..a1e24642252 100644 --- a/engine/src/main/java/org/hibernate/search/cfg/TokenFilterDefMapping.java +++ b/engine/src/main/java/org/hibernate/search/cfg/TokenFilterDefMapping.java @@ -47,9 +47,9 @@ public class TokenFilterDefMapping { * {@code @TokenFilterDef(, ... params={@Parameter(name="name", value="value"), ...} } */ public TokenFilterDefMapping param(String name, String value) { - Map param = SearchMapping.addElementToAnnotationArray(filter, "params"); - param.put("name", name); - param.put("value", value); + Map param = SearchMapping.addElementToAnnotationArray( filter, "params" ); + param.put( "name", name ); + param.put( "value", value ); return this; } @@ -57,7 +57,7 @@ public TokenFilterDefMapping param(String name, String value) { * {@code @TokenFilterDef(factory=factory)} */ public TokenFilterDefMapping filter(Class factory) { - return new TokenFilterDefMapping(factory, analyzerDef, mapping ); + return new TokenFilterDefMapping( factory, analyzerDef, mapping ); } public EntityMapping entity(Class entityType) { @@ -65,11 +65,11 @@ public EntityMapping entity(Class entityType) { } public AnalyzerDefMapping analyzerDef(String name, Class tokenizerFactory) { - return new AnalyzerDefMapping(name, tokenizerFactory, mapping); + return new AnalyzerDefMapping( name, tokenizerFactory, mapping ); } public FullTextFilterDefMapping fullTextFilterDef(String name, Class impl) { - return new FullTextFilterDefMapping(mapping, name, impl ); + return new FullTextFilterDefMapping( mapping, name, impl ); } } diff --git a/engine/src/main/java/org/hibernate/search/engine/spi/AbstractDocumentBuilder.java b/engine/src/main/java/org/hibernate/search/engine/spi/AbstractDocumentBuilder.java index 051708605ae..b520a2cdf84 100644 --- a/engine/src/main/java/org/hibernate/search/engine/spi/AbstractDocumentBuilder.java +++ b/engine/src/main/java/org/hibernate/search/engine/spi/AbstractDocumentBuilder.java @@ -1061,7 +1061,7 @@ private void bindFieldAnnotation(XClass classHostingMember, } FieldMetadata fieldMetadata = new FieldMetadata( prefix, member, fieldAnnotation, numericFieldAnnotation, null, context, reflectionManager ); - fieldMetadata.appendToPropertiesMetadata(propertiesMetadata); + fieldMetadata.appendToPropertiesMetadata( propertiesMetadata ); addToScopedAnalyzer( fieldMetadata.getFieldName(), fieldMetadata.getAnalyzer(), fieldMetadata.getIndex() ); if ( member.isCollection() ) { @@ -1082,7 +1082,7 @@ private void bindSpatialAnnotation(XClass classHostingMember, FieldMetadata fieldMetadata = new FieldMetadata( prefix, member, null, null, spatialAnnotation, context, reflectionManager ); - fieldMetadata.appendToPropertiesMetadata(propertiesMetadata); + fieldMetadata.appendToPropertiesMetadata( propertiesMetadata ); if ( member.isCollection() ) { fieldCollectionRoles.add( StringHelper.qualify( classHostingMember.getName(), member.getName() ) ); } diff --git a/engine/src/main/java/org/hibernate/search/impl/IncrementalSearchConfiguration.java b/engine/src/main/java/org/hibernate/search/impl/IncrementalSearchConfiguration.java index 3b2f3f8c7d9..9d37d119b57 100644 --- a/engine/src/main/java/org/hibernate/search/impl/IncrementalSearchConfiguration.java +++ b/engine/src/main/java/org/hibernate/search/impl/IncrementalSearchConfiguration.java @@ -68,7 +68,7 @@ public Class getClassMapping(String name) { } public String getProperty(String propertyName) { - return properties.getProperty(propertyName ); + return properties.getProperty( propertyName ); } public Properties getProperties() { diff --git a/engine/src/main/java/org/hibernate/search/impl/SearchMappingBuilder.java b/engine/src/main/java/org/hibernate/search/impl/SearchMappingBuilder.java index edfca7887a5..cbee538e36b 100644 --- a/engine/src/main/java/org/hibernate/search/impl/SearchMappingBuilder.java +++ b/engine/src/main/java/org/hibernate/search/impl/SearchMappingBuilder.java @@ -75,38 +75,38 @@ public static SearchMapping getSearchMapping(SearchConfiguration cfg) { mapping = (SearchMapping) programmaticConfig; return mapping; } - Class clazz = getProgrammaticMappingClass(programmaticConfig); + Class clazz = getProgrammaticMappingClass( programmaticConfig ); Method[] methods = clazz.getDeclaredMethods(); int count = 0; - for (Method method : methods) { - if (method.isAnnotationPresent(Factory.class)) { + for ( Method method : methods ) { + if ( method.isAnnotationPresent( Factory.class ) ) { count++; ReflectionHelper.setAccessible( method ); - mapping = getNewInstanceOfSearchMapping(clazz, method); + mapping = getNewInstanceOfSearchMapping( clazz, method ); } } - validateMappingFactoryDefinition(count, clazz); + validateMappingFactoryDefinition( count, clazz ); return mapping; } private static SearchMapping getNewInstanceOfSearchMapping(Class clazz, Method method) { SearchMapping mapping = null; try { - LOG.debugf("invoking factory method [ %s.%s ] to get search mapping instance", clazz.getName(), method.getName()); + LOG.debugf( "invoking factory method [ %s.%s ] to get search mapping instance", clazz.getName(), method.getName() ); Object instance = clazz.newInstance(); - mapping = (SearchMapping) method.invoke(instance); + mapping = (SearchMapping) method.invoke( instance ); } catch (Exception e) { - throw new SearchException("Unable to call the factory method: " + clazz.getName() + "." + method.getName(), e); + throw new SearchException( "Unable to call the factory method: " + clazz.getName() + "." + method.getName(), e ); } return mapping; } private static void validateMappingFactoryDefinition(int count, Class factory) { - if (count == 0) { - throw new SearchException("No @Factory method defined for building programmatic api on " + factory); + if ( count == 0 ) { + throw new SearchException( "No @Factory method defined for building programmatic api on " + factory ); } - if (count > 1) { - throw new SearchException("Multiple @Factory methods defined. Only one factory method required. " + factory); + if ( count > 1 ) { + throw new SearchException( "Multiple @Factory methods defined. Only one factory method required. " + factory ); } } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/avro/impl/AvroDeserializer.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/avro/impl/AvroDeserializer.java index adfc74bc0e7..50c8e3152ec 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/avro/impl/AvroDeserializer.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/avro/impl/AvroDeserializer.java @@ -84,10 +84,10 @@ public void deserialize(byte[] data, LuceneWorksBuilder hydrator) { } Decoder decoder = DecoderFactory.get().binaryDecoder( inputStream, null ); - GenericDatumReader reader = new GenericDatumReader( protocol.getType("Message") ); + GenericDatumReader reader = new GenericDatumReader( protocol.getType( "Message" ) ); GenericRecord result; try { - result = reader.read(null, decoder); + result = reader.read( null, decoder ); } catch ( IOException e ) { throw log.unableToDeserializeAvroStream( e ); @@ -105,7 +105,7 @@ else if ( "PurgeAll".equals( schema ) ) { hydrator.addPurgeAllLuceneWork( asClass( operation, "class" ) ); } else if ( "Delete".equals( schema ) ) { - processId(operation, hydrator); + processId( operation, hydrator ); hydrator.addDeleteLuceneWork( asClass( operation, "class" ), conversionContext ); @@ -113,7 +113,7 @@ else if ( "Delete".equals( schema ) ) { else if ( "Add".equals( schema ) ) { buildLuceneDocument( asGenericRecord( operation, "document" ), hydrator ); Map analyzers = getAnalyzers( operation ); - processId(operation, hydrator); + processId( operation, hydrator ); hydrator.addAddLuceneWork( asClass( operation, "class" ), analyzers, @@ -123,7 +123,7 @@ else if ( "Add".equals( schema ) ) { else if ( "Update".equals( schema ) ) { buildLuceneDocument( asGenericRecord( operation, "document" ), hydrator ); Map analyzers = getAnalyzers( operation ); - processId(operation, hydrator); + processId( operation, hydrator ); hydrator.addUpdateLuceneWork( asClass( operation, "class" ), analyzers, @@ -142,16 +142,16 @@ private String asClass(GenericRecord operation, String attribute) { } private List asListOfString(GenericRecord result, String attribute) { - return (List) result.get(attribute); + return (List) result.get( attribute ); } private void processId(GenericRecord operation, LuceneWorksBuilder hydrator) { - GenericRecord id = (GenericRecord)operation.get("id"); + GenericRecord id = (GenericRecord) operation.get( "id" ); Object value = id.get( "value" ); - if (value instanceof ByteBuffer) { + if ( value instanceof ByteBuffer ) { hydrator.addIdAsJavaSerialized( asByteArray( ( ByteBuffer ) value ) ); } - else if (value instanceof Utf8) { + else if ( value instanceof Utf8 ) { hydrator.addId( value.toString() ); } else { @@ -196,7 +196,7 @@ else if ( "NumericFloatField".equals( schema ) ) { asString( field, "name" ), asInt( field, "precisionStep" ), asStore( field ), - asBoolean(field, "indexed"), + asBoolean( field, "indexed" ), asFloat( field, "boost" ), asBoolean( field, "omitNorms" ), asBoolean( field, "omitTermFreqAndPositions" ) @@ -208,7 +208,7 @@ else if ( "NumericLongField".equals( schema ) ) { asString( field, "name" ), asInt( field, "precisionStep" ), asStore( field ), - asBoolean(field, "indexed"), + asBoolean( field, "indexed" ), asFloat( field, "boost" ), asBoolean( field, "omitNorms" ), asBoolean( field, "omitTermFreqAndPositions" ) @@ -250,7 +250,7 @@ else if ( "StringField".equals( schema ) ) { ); } else if ( "TokenStreamField".equals( schema ) ) { - buildAttributes(field, "value", hydrator); + buildAttributes( field, "value", hydrator ); hydrator.addFieldWithTokenStreamData( asString( field, "name" ), asTermVector( field ), @@ -270,7 +270,7 @@ else if ( "ReaderField".equals( schema ) ) { ); } else { - throw log.cannotDeserializeField(schema); + throw log.cannotDeserializeField( schema ); } } } @@ -278,7 +278,7 @@ else if ( "ReaderField".equals( schema ) ) { private void buildAttributes(GenericRecord record, String field, LuceneWorksBuilder hydrator) { List> tokens = (List>) record.get( field ); for ( List token : tokens ) { - for(Object attribute : token) { + for ( Object attribute : token ) { buildAttribute( attribute, hydrator ); } hydrator.addToken(); @@ -296,22 +296,22 @@ else if ( "CharTermAttribute".equals( name ) ) { hydrator.addCharTermAttribute( (CharSequence) record.get( "sequence" ) ); } else if ( "PayloadAttribute".equals( name ) ) { - hydrator.addPayloadAttribute( asByteArray(record, "payload") ); + hydrator.addPayloadAttribute( asByteArray( record, "payload") ); } else if ( "KeywordAttribute".equals( name ) ) { - hydrator.addKeywordAttribute( asBoolean(record, "isKeyword") ); + hydrator.addKeywordAttribute( asBoolean( record, "isKeyword") ); } else if ( "PositionIncrementAttribute".equals( name ) ) { - hydrator.addPositionIncrementAttribute( asInt(record, "positionIncrement") ); + hydrator.addPositionIncrementAttribute( asInt( record, "positionIncrement") ); } else if ( "FlagsAttribute".equals( name ) ) { - hydrator.addFlagsAttribute( asInt(record, "flags") ); + hydrator.addFlagsAttribute( asInt( record, "flags") ); } else if ( "TypeAttribute".equals( name ) ) { - hydrator.addTypeAttribute( asString(record, "type") ); + hydrator.addTypeAttribute( asString( record, "type") ); } else if ( "OffsetAttribute".equals( name ) ) { - hydrator.addOffsetAttribute( asInt(record, "startOffset"), asInt(record, "endOffset") ); + hydrator.addOffsetAttribute( asInt( record, "startOffset"), asInt( record, "endOffset" ) ); } else { log.unknownAttributeSerializedRepresentation( name ); @@ -326,54 +326,54 @@ else if ( "OffsetAttribute".equals( name ) ) { } private GenericRecord asGenericRecord(GenericRecord operation, String field) { - return (GenericRecord) operation.get(field); + return (GenericRecord) operation.get( field ); } private List asListOfGenericRecords(GenericRecord result, String field) { - return (List) result.get(field); + return (List) result.get( field ); } private float asFloat(GenericRecord record, String field) { - return ( (Float) record.get(field) ).floatValue(); + return ( (Float) record.get( field ) ).floatValue(); } private int asInt(GenericRecord record, String field) { - return ( (Integer) record.get(field) ).intValue(); + return ( (Integer) record.get( field ) ).intValue(); } private long asLong(GenericRecord record, String field) { - return ( (Long) record.get(field) ).longValue(); + return ( (Long) record.get( field ) ).longValue(); } private double asDouble(GenericRecord record, String field) { - return ( (Double) record.get(field) ).doubleValue(); + return ( (Double) record.get( field ) ).doubleValue(); } private String asString(GenericRecord record, String field) { - return record.get(field).toString(); + return record.get( field ).toString(); } private boolean asBoolean(GenericRecord record, String field) { - return ( (Boolean) record.get(field) ).booleanValue(); + return ( (Boolean) record.get( field ) ).booleanValue(); } private SerializableStore asStore(GenericRecord field) { - String string = field.get("store").toString(); + String string = field.get( "store" ).toString(); return SerializableStore.valueOf( string ); } private SerializableIndex asIndex(GenericRecord field) { - String string = field.get("index").toString(); + String string = field.get( "index" ).toString(); return SerializableIndex.valueOf( string ); } private SerializableTermVector asTermVector(GenericRecord field) { - String string = field.get("termVector").toString(); + String string = field.get( "termVector" ).toString(); return SerializableTermVector.valueOf( string ); } private byte[] asByteArray(GenericRecord operation, String field) { - ByteBuffer buffer = (ByteBuffer) operation.get(field); + ByteBuffer buffer = (ByteBuffer) operation.get( field ); return asByteArray( buffer ); } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/avro/impl/AvroSerializer.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/avro/impl/AvroSerializer.java index 9ecf35be53a..55b6519a6c2 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/avro/impl/AvroSerializer.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/avro/impl/AvroSerializer.java @@ -192,7 +192,7 @@ public byte[] serialize() { encoder.flush(); } catch ( IOException e ) { - throw log.unableToSerializeInAvro(e); + throw log.unableToSerializeInAvro( e ); } return out.toByteArray(); } @@ -280,7 +280,7 @@ public void addFieldWithTokenStreamData(LuceneFieldContext context) { for(AttributeImpl attr : attrs) { elements.add( buildAttributeImpl( attr ) ); } - value.add(elements); + value.add( elements ); } field.put( "value", value ); field.put( "termVector", context.getTermVector() ); @@ -301,48 +301,48 @@ private Object buildAttributeImpl(AttributeImpl attr) { else if (attr instanceof CharTermAttributeImpl) { GenericRecord record = new GenericData.Record( protocol.getType( "CharTermAttribute" ) ); CharTermAttribute charAttr = (CharTermAttribute) attr; - record.put("sequence", charAttr.toString() ); + record.put( "sequence", charAttr.toString() ); return record; } else if (attr instanceof PayloadAttribute) { GenericRecord record = new GenericData.Record( protocol.getType( "PayloadAttribute" ) ); PayloadAttribute payloadAttr = (PayloadAttribute) attr; - record.put("payload", ByteBuffer.wrap( payloadAttr.getPayload().toByteArray() ) ); + record.put( "payload", ByteBuffer.wrap( payloadAttr.getPayload().toByteArray() ) ); return record; } else if (attr instanceof KeywordAttribute) { GenericRecord record = new GenericData.Record( protocol.getType( "KeywordAttribute" ) ); KeywordAttribute narrowedAttr = (KeywordAttribute) attr; - record.put("isKeyword", narrowedAttr.isKeyword() ); + record.put( "isKeyword", narrowedAttr.isKeyword() ); return record; } else if (attr instanceof PositionIncrementAttribute ) { GenericRecord record = new GenericData.Record( protocol.getType( "PositionIncrementAttribute" ) ); PositionIncrementAttribute narrowedAttr = (PositionIncrementAttribute) attr; - record.put("positionIncrement", narrowedAttr.getPositionIncrement() ); + record.put( "positionIncrement", narrowedAttr.getPositionIncrement() ); return record; } else if (attr instanceof FlagsAttribute ) { GenericRecord record = new GenericData.Record( protocol.getType( "FlagsAttribute" ) ); FlagsAttribute narrowedAttr = (FlagsAttribute) attr; - record.put("flags", narrowedAttr.getFlags() ); + record.put( "flags", narrowedAttr.getFlags() ); return record; } else if (attr instanceof TypeAttribute ) { GenericRecord record = new GenericData.Record( protocol.getType( "TypeAttribute" ) ); TypeAttribute narrowedAttr = (TypeAttribute) attr; - record.put("type", narrowedAttr.type() ); + record.put( "type", narrowedAttr.type() ); return record; } else if (attr instanceof OffsetAttribute ) { GenericRecord record = new GenericData.Record( protocol.getType( "OffsetAttribute" ) ); OffsetAttribute narrowedAttr = (OffsetAttribute) attr; - record.put("startOffset", narrowedAttr.startOffset() ); - record.put("endOffset", narrowedAttr.endOffset() ); + record.put( "startOffset", narrowedAttr.startOffset() ); + record.put( "endOffset", narrowedAttr.endOffset() ); return record; } else if (attr instanceof Serializable) { - return ByteBuffer.wrap( toByteArray(attr) ); + return ByteBuffer.wrap( toByteArray( attr ) ); } else { throw log.attributeNotRecognizedNorSerializable( attr.getClass() ); diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/CopyTokenStream.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/CopyTokenStream.java index cffec2040ff..31ff67d10fd 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/CopyTokenStream.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/CopyTokenStream.java @@ -71,21 +71,21 @@ public final boolean incrementToken() throws IOException { } // Since the TokenFilter can be reset, the tokens need to be preserved as immutable. - setState(index); + setState( index ); index++; return true; } private void setState(int localIndex) { - for ( AttributeImpl attr : cache.get(localIndex) ) { + for ( AttributeImpl attr : cache.get( localIndex ) ) { addAttributeImpl( attr ); } } @Override public final void end() throws IOException { - if (cache.size() > 0) { - setState(cache.size()-1); + if ( cache.size() > 0 ) { + setState( cache.size() - 1 ); } } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/PluggableSerializationLuceneWorkSerializer.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/PluggableSerializationLuceneWorkSerializer.java index 7432829b7e1..20a943a63a9 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/PluggableSerializationLuceneWorkSerializer.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/PluggableSerializationLuceneWorkSerializer.java @@ -84,17 +84,17 @@ else if (work instanceof PurgeAllLuceneWork) { serializer.addPurgeAll( work.getEntityClass().getName() ); } else if (work instanceof DeleteLuceneWork) { - processId(work, serializer); + processId( work, serializer ); serializer.addDelete( work.getEntityClass().getName() ); } else if (work instanceof AddLuceneWork ) { buildDocument( work.getDocument(), serializer ); - processId(work, serializer); + processId( work, serializer ); serializer.addAdd( work.getEntityClass().getName(), work.getFieldToAnalyzerMap() ); } else if (work instanceof UpdateLuceneWork ) { buildDocument( work.getDocument(), serializer ); - processId(work, serializer); + processId( work, serializer ); serializer.addUpdate( work.getEntityClass().getName(), work.getFieldToAnalyzerMap() ); } } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/SerializationHelper.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/SerializationHelper.java index bd26a101a1c..5e9477c1348 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/SerializationHelper.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/impl/SerializationHelper.java @@ -46,7 +46,7 @@ public static byte[] toByteArray(Serializable instance) { stream.close(); } catch ( IOException e ) { - throw log.failToSerializeObject(instance.getClass(), e); + throw log.failToSerializeObject( instance.getClass(), e ); } return out.toByteArray(); } @@ -58,10 +58,10 @@ public static T toInstance(byte[] data, Class clazz) { return (T) in.readObject(); } catch ( IOException e ) { - throw log.failToDeserializeObject(e); + throw log.failToDeserializeObject( e ); } catch ( ClassNotFoundException e ) { - throw log.failToDeserializeObject(e); + throw log.failToDeserializeObject( e ); } } @@ -72,10 +72,10 @@ public static Serializable toSerializable(byte[] data, ClassLoader loader) { return (Serializable) in.readObject(); } catch ( IOException e ) { - throw log.failToDeserializeObject(e); + throw log.failToDeserializeObject( e ); } catch ( ClassNotFoundException e ) { - throw log.failToDeserializeObject(e); + throw log.failToDeserializeObject( e ); } } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableDoubleField.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableDoubleField.java index 767fb1f3823..2323e024b7b 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableDoubleField.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableDoubleField.java @@ -26,10 +26,11 @@ * @author Emmanuel Bernard */ public class SerializableDoubleField extends SerializableNumericField { + private double value; public SerializableDoubleField(double value, LuceneNumericFieldContext context) { - super(context); + super( context ); this.value = value; } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableFloatField.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableFloatField.java index a5f3d7a6b64..7e132bef310 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableFloatField.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableFloatField.java @@ -29,7 +29,7 @@ public class SerializableFloatField extends SerializableNumericField { private float value; public SerializableFloatField(float value, LuceneNumericFieldContext context) { - super(context); + super( context ); this.value = value; } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableIntField.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableIntField.java index 0b96269e98d..100c60182dc 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableIntField.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableIntField.java @@ -29,7 +29,7 @@ public class SerializableIntField extends SerializableNumericField { private int value; public SerializableIntField(int value, LuceneNumericFieldContext context) { - super(context); + super( context ); this.value = value; } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableLongField.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableLongField.java index 2a1fe294239..9820848a4d8 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableLongField.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableLongField.java @@ -26,10 +26,11 @@ * @author Emmanuel Bernard */ public class SerializableLongField extends SerializableNumericField { + private long value; public SerializableLongField(long value, LuceneNumericFieldContext context) { - super(context); + super( context ); this.value = value; } diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableNumericField.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableNumericField.java index d4d06f52797..cdcad4a9890 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableNumericField.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableNumericField.java @@ -27,6 +27,7 @@ * @author Emmanuel Bernard */ public abstract class SerializableNumericField implements SerializableFieldable { + private String name; private int precisionStep; private SerializableStore store; diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableReaderField.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableReaderField.java index 7f86cb30721..2688a00ac26 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableReaderField.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableReaderField.java @@ -27,6 +27,7 @@ * @author Emmanuel Bernard */ public class SerializableReaderField extends SerializableField { + private byte[] value; private SerializableTermVector termVector; diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableStringField.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableStringField.java index 7d401033e07..47d2004ae87 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableStringField.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableStringField.java @@ -29,6 +29,7 @@ * @author Emmanuel Bernard */ public class SerializableStringField extends SerializableField { + private String value; private SerializableStore store; private SerializableIndex index; diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableTokenStreamField.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableTokenStreamField.java index f3670863871..527f0b6d62b 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableTokenStreamField.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/SerializableTokenStreamField.java @@ -28,6 +28,7 @@ * @author Emmanuel Bernard */ public class SerializableTokenStreamField extends SerializableField { + private SerializableTokenStream value; private SerializableTermVector termVector; diff --git a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/Update.java b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/Update.java index cb9130fc4c5..c415c025b43 100644 --- a/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/Update.java +++ b/engine/src/main/java/org/hibernate/search/indexes/serialization/javaserialization/impl/Update.java @@ -28,6 +28,7 @@ * @author Emmanuel Bernard */ public class Update implements Operation { + private String entityClassName; private Serializable id; private Map fieldToAnalyzerMap = new HashMap(); diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/BooleanQueryBuilder.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/BooleanQueryBuilder.java index 64f73187896..0c1a9c114ab 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/BooleanQueryBuilder.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/BooleanQueryBuilder.java @@ -41,17 +41,18 @@ * @author Emmanuel Bernard */ class BooleanQueryBuilder implements MustJunction { + private final List clauses; private final QueryCustomizer queryCustomizer; BooleanQueryBuilder() { - clauses = new ArrayList(5); + clauses = new ArrayList( 5 ); queryCustomizer = new QueryCustomizer(); } public BooleanJunction not() { final int lastIndex = clauses.size() -1; - final BooleanClause last = clauses.get(lastIndex); + final BooleanClause last = clauses.get( lastIndex ); if ( ! last.getOccur().equals( BooleanClause.Occur.MUST ) ) { throw new AssertionFailure( "Cannot negate class: " + last.getOccur() ); } @@ -80,7 +81,7 @@ public MustJunction withConstantScore() { } public MustJunction filteredBy(Filter filter) { - queryCustomizer.filteredBy(filter); + queryCustomizer.filteredBy( filter ); return this; } @@ -102,8 +103,8 @@ else if ( nbrOfClauses == 1 ) { } } - BooleanQuery query = new BooleanQuery( ); - for (BooleanClause clause : clauses) { + BooleanQuery query = new BooleanQuery(); + for ( BooleanClause clause : clauses ) { query.add( clause ); } return queryCustomizer.setWrappedQuery( query ).createQuery(); diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedFuzzyContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedFuzzyContext.java index 0c3baf876c5..08c364dc0a4 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedFuzzyContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedFuzzyContext.java @@ -44,11 +44,11 @@ public ConnectedFuzzyContext(QueryCustomizer queryCustomizer, QueryBuildingConte } public TermMatchingContext onField(String field) { - return new ConnectedTermMatchingContext(termContext, field, queryCustomizer, queryContext); + return new ConnectedTermMatchingContext( termContext, field, queryCustomizer, queryContext ); } public TermMatchingContext onFields(String... fields) { - return new ConnectedTermMatchingContext(termContext, fields, queryCustomizer, queryContext); + return new ConnectedTermMatchingContext( termContext, fields, queryCustomizer, queryContext ); } public ConnectedFuzzyContext withThreshold(float threshold) { @@ -72,7 +72,7 @@ public FuzzyContext withConstantScore() { } public FuzzyContext filteredBy(Filter filter) { - queryCustomizer.filteredBy(filter); + queryCustomizer.filteredBy( filter ); return this; } diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsPhraseQueryBuilder.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsPhraseQueryBuilder.java index cb9e74ddb0d..92906f5ac21 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsPhraseQueryBuilder.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsPhraseQueryBuilder.java @@ -105,8 +105,8 @@ public Query createQuery(FieldContext fieldContext) { } if ( positionIncrement > 0 ) { - position+=positionIncrement; - termsAtSamePosition = termsPerPosition.get(position); + position += positionIncrement; + termsAtSamePosition = termsPerPosition.get( position ); } if (termsAtSamePosition == null) { @@ -172,7 +172,7 @@ public Query createQuery(FieldContext fieldContext) { query.setSlop( phraseContext.getSlop() ); for ( Map.Entry> entry : termsPerPosition.entrySet() ) { final List value = entry.getValue(); - query.add( value.get(0), entry.getKey() ); + query.add( value.get( 0 ), entry.getKey() ); } perFieldQuery = query; } diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsRangeQueryBuilder.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsRangeQueryBuilder.java index 3c060957267..78114f02fab 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsRangeQueryBuilder.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedMultiFieldsRangeQueryBuilder.java @@ -97,13 +97,13 @@ private Query createQuery(FieldContext fieldContext, ConversionContext conversio final DocumentBuilderIndexedEntity documentBuilder = Helper.getDocumentBuilder( queryContext ); - FieldBridge fieldBridge = documentBuilder.getBridge(fieldContext.getField()); + FieldBridge fieldBridge = documentBuilder.getBridge( fieldContext.getField() ); final Object fromObject = rangeContext.getFrom(); final Object toObject = rangeContext.getTo(); - if (fieldBridge!=null && NumericFieldBridge.class.isAssignableFrom(fieldBridge.getClass())) { + if ( fieldBridge != null && NumericFieldBridge.class.isAssignableFrom( fieldBridge.getClass() ) ) { perFieldQuery = NumericFieldUtils.createNumericRangeQuery( fieldName, fromObject, diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedPhraseContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedPhraseContext.java index fed22c17e1d..15c7d3b0a9f 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedPhraseContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedPhraseContext.java @@ -64,7 +64,7 @@ public PhraseContext withConstantScore() { } public PhraseContext filteredBy(Filter filter) { - queryCustomizer.filteredBy(filter); + queryCustomizer.filteredBy( filter ); return this; } } diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedPhraseMatchingContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedPhraseMatchingContext.java index cb117b9e935..9de5ea849be 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedPhraseMatchingContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedPhraseMatchingContext.java @@ -60,7 +60,7 @@ public PhraseMatchingContext andField(String field) { } public PhraseTermination sentence(String sentence) { - phraseContext.setSentence(sentence); + phraseContext.setSentence( sentence ); return new ConnectedMultiFieldsPhraseQueryBuilder( phraseContext, queryCustomizer, fieldContexts, queryContext ); } diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedRangeContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedRangeContext.java index ffd2be6063c..dd37f27cd77 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedRangeContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedRangeContext.java @@ -56,7 +56,7 @@ public RangeContext withConstantScore() { } public RangeContext filteredBy(Filter filter) { - queryCustomizer.filteredBy(filter); + queryCustomizer.filteredBy( filter ); return this; } } diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedRangeMatchingContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedRangeMatchingContext.java index 4dfb5d2b6f3..43a80b0b474 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedRangeMatchingContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedRangeMatchingContext.java @@ -71,7 +71,7 @@ static class ConnectedFromRangeContext implements FromRangeContext { } public RangeTerminationExcludable to(T to) { - mother.rangeContext.setTo(to); + mother.rangeContext.setTo( to ); return new ConnectedMultiFieldsRangeQueryBuilder( mother.rangeContext, mother.queryCustomizer, diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedSpatialContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedSpatialContext.java index c40c0ef1f68..ace5872c41a 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedSpatialContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedSpatialContext.java @@ -70,7 +70,7 @@ public SpatialContext withConstantScore() { @Override public SpatialContext filteredBy(Filter filter) { - queryCustomizer.filteredBy(filter); + queryCustomizer.filteredBy( filter ); return this; } } diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedSpatialMatchingContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedSpatialMatchingContext.java index 1a92ba00b1d..3a84426bfd2 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedSpatialMatchingContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedSpatialMatchingContext.java @@ -59,8 +59,8 @@ public ConnectedWithinContext(ConnectedSpatialMatchingContext mother) { @Override public SpatialTermination ofCoordinates(Coordinates coordinates) { - mother.spatialContext.setCoordinates(coordinates); - return new ConnectedSpatialQueryBuilder(mother.spatialContext, mother.queryCustomizer, mother.queryContext, mother.queryBuilder); + mother.spatialContext.setCoordinates( coordinates ); + return new ConnectedSpatialQueryBuilder( mother.spatialContext, mother.queryCustomizer, mother.queryContext, mother.queryBuilder ); } @Override @@ -71,8 +71,8 @@ public LongitudeContext ofLatitude(double latitude) { @Override public SpatialTermination andLongitude(double longitude) { - mother.spatialContext.setCoordinates( Point.fromDegrees(latitude, longitude) ); - return new ConnectedSpatialQueryBuilder(mother.spatialContext, mother.queryCustomizer, mother.queryContext, mother.queryBuilder); + mother.spatialContext.setCoordinates( Point.fromDegrees( latitude, longitude ) ); + return new ConnectedSpatialQueryBuilder( mother.spatialContext, mother.queryCustomizer, mother.queryContext, mother.queryBuilder ); } } } diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedTermContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedTermContext.java index 931aa176cdc..641ba36d560 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedTermContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedTermContext.java @@ -42,15 +42,15 @@ class ConnectedTermContext implements TermContext { public ConnectedTermContext(QueryBuildingContext queryContext) { this.queryContext = queryContext; this.queryCustomizer = new QueryCustomizer(); - this.termContext = new TermQueryContext( TermQueryContext.Approximation.EXACT); + this.termContext = new TermQueryContext( TermQueryContext.Approximation.EXACT ); } public TermMatchingContext onField(String field) { - return new ConnectedTermMatchingContext( termContext, field, queryCustomizer, queryContext); + return new ConnectedTermMatchingContext( termContext, field, queryCustomizer, queryContext ); } public TermMatchingContext onFields(String... fields) { - return new ConnectedTermMatchingContext( termContext, fields, queryCustomizer, queryContext); + return new ConnectedTermMatchingContext( termContext, fields, queryCustomizer, queryContext ); } public FuzzyContext fuzzy() { @@ -58,7 +58,7 @@ public FuzzyContext fuzzy() { } public WildcardContext wildcard() { - return new ConnectedWildcardContext(queryCustomizer, queryContext); + return new ConnectedWildcardContext( queryCustomizer, queryContext ); } public ConnectedTermContext boostedTo(float boost) { @@ -72,7 +72,7 @@ public ConnectedTermContext withConstantScore() { } public ConnectedTermContext filteredBy(Filter filter) { - queryCustomizer.filteredBy(filter); + queryCustomizer.filteredBy( filter ); return this; } } diff --git a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedWildcardContext.java b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedWildcardContext.java index f913e796c6b..d631f56ed5e 100644 --- a/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedWildcardContext.java +++ b/engine/src/main/java/org/hibernate/search/query/dsl/impl/ConnectedWildcardContext.java @@ -40,7 +40,7 @@ class ConnectedWildcardContext implements WildcardContext { public ConnectedWildcardContext(QueryCustomizer queryCustomizer, QueryBuildingContext queryContext) { this.queryContext = queryContext; this.queryCustomizer = queryCustomizer; - this.termContext = new TermQueryContext(TermQueryContext.Approximation.WILDCARD); + this.termContext = new TermQueryContext( TermQueryContext.Approximation.WILDCARD ); } public TermMatchingContext onField(String field) { @@ -58,7 +58,7 @@ public WildcardContext withConstantScore() { } public WildcardContext filteredBy(Filter filter) { - queryCustomizer.filteredBy(filter); + queryCustomizer.filteredBy( filter ); return this; } } diff --git a/engine/src/main/java/org/hibernate/search/query/engine/impl/TimeoutManagerImpl.java b/engine/src/main/java/org/hibernate/search/query/engine/impl/TimeoutManagerImpl.java index 5b8a2cf9160..9d34d2dfcfe 100644 --- a/engine/src/main/java/org/hibernate/search/query/engine/impl/TimeoutManagerImpl.java +++ b/engine/src/main/java/org/hibernate/search/query/engine/impl/TimeoutManagerImpl.java @@ -62,7 +62,7 @@ public Long getTimeoutLeftInMilliseconds() { } public Long getTimeoutLeftInSeconds() { - return getTimeoutLeft(1000000000); + return getTimeoutLeft( 1000000000 ); } private Long getTimeoutLeft(long factor) { diff --git a/engine/src/main/java/org/hibernate/search/spatial/SpatialFieldBridgeByQuadTree.java b/engine/src/main/java/org/hibernate/search/spatial/SpatialFieldBridgeByQuadTree.java index cd31c57e1ae..bab61cfd5c7 100644 --- a/engine/src/main/java/org/hibernate/search/spatial/SpatialFieldBridgeByQuadTree.java +++ b/engine/src/main/java/org/hibernate/search/spatial/SpatialFieldBridgeByQuadTree.java @@ -77,23 +77,23 @@ public void set(String name, Object value, Document document, LuceneOptions luce if ( ( latitude != null ) && ( longitude != null ) ) { - if (quadTreeIndex) { + if ( quadTreeIndex ) { Point point = Point.fromDegrees( latitude, longitude ); for ( int i = topQuadTreeLevel; i <= bottomQuadTreeLevel; i++ ) { - luceneOptions.addFieldToDocument( SpatialHelper.formatFieldName(i, name), SpatialHelper.getQuadTreeCellId(point, i), document ); + luceneOptions.addFieldToDocument( SpatialHelper.formatFieldName( i, name ), SpatialHelper.getQuadTreeCellId( point, i ), document ); } } if ( numericFieldsIndex ) { luceneOptions.addNumericFieldToDocument( - SpatialHelper.formatLatitude(name), + SpatialHelper.formatLatitude( name ), latitude, document ); luceneOptions.addNumericFieldToDocument( - SpatialHelper.formatLongitude(name), + SpatialHelper.formatLongitude( name ), longitude, document ); diff --git a/engine/src/main/java/org/hibernate/search/spatial/impl/DistanceComparator.java b/engine/src/main/java/org/hibernate/search/spatial/impl/DistanceComparator.java index c8e948a4df0..ebc86b39c27 100644 --- a/engine/src/main/java/org/hibernate/search/spatial/impl/DistanceComparator.java +++ b/engine/src/main/java/org/hibernate/search/spatial/impl/DistanceComparator.java @@ -44,8 +44,8 @@ public DistanceComparator(Point center, int hitsCount, String fieldname) { this.distances = new IntToDoubleMap( hitsCount ); this.latitudeValues = new IntToDoubleMap( hitsCount ); this.longitudeValues = new IntToDoubleMap( hitsCount ); - this.latitudeField = SpatialHelper.formatLatitude(fieldname); - this.longitudeField = SpatialHelper.formatLongitude(fieldname); + this.latitudeField = SpatialHelper.formatLatitude( fieldname ); + this.longitudeField = SpatialHelper.formatLongitude( fieldname ); } @Override diff --git a/engine/src/main/java/org/hibernate/search/spatial/impl/Point.java b/engine/src/main/java/org/hibernate/search/spatial/impl/Point.java index 6e727145142..3e5cd016715 100644 --- a/engine/src/main/java/org/hibernate/search/spatial/impl/Point.java +++ b/engine/src/main/java/org/hibernate/search/spatial/impl/Point.java @@ -179,7 +179,7 @@ public final double getDistanceTo(final double latitude,final double longitude) final double dLon= (destinationLongitudeRadians - getLongitudeRad())/2.0d; final double a= Math.pow( Math.sin( dLat ), 2) + Math.pow( Math.sin( dLon ), 2) * Math.cos( getLatitudeRad()) * Math.cos( destinationLatitudeRadians ); - final double c= 2.0d * Math.atan2(Math.sqrt( a ), Math.sqrt( 1.0d - a )); + final double c = 2.0d * Math.atan2( Math.sqrt( a ), Math.sqrt( 1.0d - a ) ); return c * GeometricConstants.EARTH_MEAN_RADIUS_KM; } diff --git a/engine/src/main/java/org/hibernate/search/spatial/impl/QuadTreeFilter.java b/engine/src/main/java/org/hibernate/search/spatial/impl/QuadTreeFilter.java index e0c8ca20a6d..9885f14040a 100644 --- a/engine/src/main/java/org/hibernate/search/spatial/impl/QuadTreeFilter.java +++ b/engine/src/main/java/org/hibernate/search/spatial/impl/QuadTreeFilter.java @@ -84,7 +84,7 @@ public DocIdSet getDocIdSet(IndexReader reader) throws IOException { public String toString() { final StringBuilder sb = new StringBuilder(); sb.append( "QuadTreeFilter" ); - sb.append( "{quadTreeCellsIds=" ).append(quadTreeCellsIds); + sb.append( "{quadTreeCellsIds=" ).append( quadTreeCellsIds ); sb.append( ", fieldName='" ).append( fieldName ).append( '\'' ); sb.append( '}' ); return sb.toString(); diff --git a/engine/src/main/java/org/hibernate/search/spatial/impl/SpatialHelper.java b/engine/src/main/java/org/hibernate/search/spatial/impl/SpatialHelper.java index 19b56c56f5b..c2925cd7628 100644 --- a/engine/src/main/java/org/hibernate/search/spatial/impl/SpatialHelper.java +++ b/engine/src/main/java/org/hibernate/search/spatial/impl/SpatialHelper.java @@ -71,7 +71,7 @@ public static String getQuadTreeCellId(Point point, int quadTreeLevel) { GeometricConstants.PROJECTED_LATITUDE_RANGE, quadTreeLevel ); - return formatQuadTreeCellId(longitudeCellIndex, latitudeCellIndex); + return formatQuadTreeCellId( longitudeCellIndex, latitudeCellIndex ); } /** @@ -131,19 +131,16 @@ public static List getQuadTreeCellsIds(Point lowerLeft, Point upperRight quadTreeLevel ); - int startX, endX; - startX= Math.min(Math.min(Math.min(lowerLeftXIndex,upperLeftXIndex),upperRightXIndex),lowerRightXIndex); - endX= Math.max(Math.max(Math.max(lowerLeftXIndex,upperLeftXIndex),upperRightXIndex),lowerRightXIndex); + final int startX = Math.min( Math.min( Math.min( lowerLeftXIndex, upperLeftXIndex ), upperRightXIndex ), lowerRightXIndex ); + final int endX = Math.max( Math.max( Math.max( lowerLeftXIndex, upperLeftXIndex ), upperRightXIndex ), lowerRightXIndex ); - int startY, endY; - startY= Math.min(Math.min(Math.min(lowerLeftYIndex,upperLeftYIndex),upperRightYIndex),lowerRightYIndex); - endY= Math.max(Math.max(Math.max(lowerLeftYIndex,upperLeftYIndex),upperRightYIndex),lowerRightYIndex); + final int startY = Math.min( Math.min( Math.min( lowerLeftYIndex, upperLeftYIndex ), upperRightYIndex ), lowerRightYIndex ); + final int endY = Math.max( Math.max( Math.max( lowerLeftYIndex, upperLeftYIndex ), upperRightYIndex ), lowerRightYIndex ); - List quadTreeCellsIds = new ArrayList((endX+1-startX)*(endY+1-startY)); - int xIndex, yIndex; - for ( xIndex = startX; xIndex <= endX; xIndex++ ) { - for ( yIndex = startY; yIndex <= endY; yIndex++ ) { - quadTreeCellsIds.add(formatQuadTreeCellId(xIndex, yIndex)); + List quadTreeCellsIds = new ArrayList( ( endX + 1 - startX ) * ( endY + 1 - startY ) ); + for ( int xIndex = startX; xIndex <= endX; xIndex++ ) { + for ( int yIndex = startY; yIndex <= endY; yIndex++ ) { + quadTreeCellsIds.add( formatQuadTreeCellId( xIndex, yIndex ) ); } } diff --git a/engine/src/main/java/org/hibernate/search/spatial/impl/SpatialQueryBuilderFromPoint.java b/engine/src/main/java/org/hibernate/search/spatial/impl/SpatialQueryBuilderFromPoint.java index ff1784149df..40c4f5c9cca 100644 --- a/engine/src/main/java/org/hibernate/search/spatial/impl/SpatialQueryBuilderFromPoint.java +++ b/engine/src/main/java/org/hibernate/search/spatial/impl/SpatialQueryBuilderFromPoint.java @@ -114,7 +114,7 @@ public static Filter buildDistanceFilter(Filter previousFilter, Point center, do * @see org.hibernate.search.spatial.Coordinates */ public static Query buildQuadTreeQuery(Point center, double radius, String fieldName) { - return new FilteredQuery( new MatchAllDocsQuery( ), buildQuadTreeFilter(center, radius, fieldName) ); + return new FilteredQuery( new MatchAllDocsQuery(), buildQuadTreeFilter( center, radius, fieldName ) ); } /** diff --git a/engine/src/main/java/org/hibernate/search/store/impl/FSMasterDirectoryProvider.java b/engine/src/main/java/org/hibernate/search/store/impl/FSMasterDirectoryProvider.java index 26c5df99711..35f34e6a448 100644 --- a/engine/src/main/java/org/hibernate/search/store/impl/FSMasterDirectoryProvider.java +++ b/engine/src/main/java/org/hibernate/search/store/impl/FSMasterDirectoryProvider.java @@ -222,7 +222,7 @@ public void run() { long start = System.nanoTime();//keep time after lock is acquired for correct measure int oldIndex = current; int index = oldIndex == 1 ? 2 : 1; - File destinationFile = new File( destination, Integer.valueOf(index).toString() ); + File destinationFile = new File( destination, Integer.valueOf( index ).toString() ); try { log.tracef( "Copying %s into %s", source, destinationFile ); FileHelper.synchronize( source, destinationFile, true, copyChunkSize ); diff --git a/engine/src/main/java/org/hibernate/search/store/impl/IdHashShardingStrategy.java b/engine/src/main/java/org/hibernate/search/store/impl/IdHashShardingStrategy.java index 6e294e6e087..d8c1c6670cb 100644 --- a/engine/src/main/java/org/hibernate/search/store/impl/IdHashShardingStrategy.java +++ b/engine/src/main/java/org/hibernate/search/store/impl/IdHashShardingStrategy.java @@ -49,7 +49,7 @@ public IndexManager[] getIndexManagersForAllShards() { } public IndexManager getIndexManagerForAddition(Class entity, Serializable id, String idInString, Document document) { - return providers[ hashKey(idInString) ]; + return providers[hashKey( idInString )]; } public IndexManager[] getIndexManagersForDeletion(Class entity, Serializable id, String idInString) { diff --git a/engine/src/main/java/org/hibernate/search/store/optimization/impl/ExplicitOnlyOptimizerStrategy.java b/engine/src/main/java/org/hibernate/search/store/optimization/impl/ExplicitOnlyOptimizerStrategy.java index b2297c3d6a4..4fbd4943d01 100644 --- a/engine/src/main/java/org/hibernate/search/store/optimization/impl/ExplicitOnlyOptimizerStrategy.java +++ b/engine/src/main/java/org/hibernate/search/store/optimization/impl/ExplicitOnlyOptimizerStrategy.java @@ -56,7 +56,7 @@ public boolean performOptimization(IndexWriter writer) { boolean acquired = optimizerIsBusy.compareAndSet( false, true ); if ( acquired ) { try { - writer.forceMerge(1, true); + writer.forceMerge( 1, true ); } catch (IOException e) { throw new SearchException( "Unable to optimize directoryProvider: " + indexName, e ); diff --git a/engine/src/main/java/org/hibernate/search/util/configuration/impl/ConfigurationParseHelper.java b/engine/src/main/java/org/hibernate/search/util/configuration/impl/ConfigurationParseHelper.java index 8c41841e560..f353a02ceac 100644 --- a/engine/src/main/java/org/hibernate/search/util/configuration/impl/ConfigurationParseHelper.java +++ b/engine/src/main/java/org/hibernate/search/util/configuration/impl/ConfigurationParseHelper.java @@ -53,10 +53,10 @@ public abstract class ConfigurationParseHelper { */ public static URL locateConfig(final String path) { try { - return new URL(path); + return new URL( path ); } - catch(MalformedURLException e) { - return findAsResource(path); + catch ( MalformedURLException e ) { + return findAsResource( path ); } } @@ -74,19 +74,19 @@ public static URL findAsResource(final String path) { // First, try to locate this resource through the current // context classloader. ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - if (contextClassLoader!=null) { - url = contextClassLoader.getResource(path); + if ( contextClassLoader != null ) { + url = contextClassLoader.getResource( path ); } - if (url != null) + if ( url != null ) return url; // Next, try to locate this resource through this class's classloader - url = ConfigurationParseHelper.class.getClassLoader().getResource(path); - if (url != null) + url = ConfigurationParseHelper.class.getClassLoader().getResource( path ); + if ( url != null ) return url; // Next, try to locate this resource through the system classloader - url = ClassLoader.getSystemClassLoader().getResource(path); + url = ClassLoader.getSystemClassLoader().getResource( path ); // Anywhere else we should look? return url; diff --git a/engine/src/main/java/org/hibernate/search/util/configuration/impl/MaskedProperty.java b/engine/src/main/java/org/hibernate/search/util/configuration/impl/MaskedProperty.java index cd5dbbcebaf..2615be80bde 100644 --- a/engine/src/main/java/org/hibernate/search/util/configuration/impl/MaskedProperty.java +++ b/engine/src/main/java/org/hibernate/search/util/configuration/impl/MaskedProperty.java @@ -176,7 +176,7 @@ private synchronized void initPropertyNames() { if ( String.class.isInstance( key ) ) { String maskedProperty = (String) key; if ( maskedProperty.startsWith( radix ) ) { - maskedProperties.add(maskedProperty.substring( radix.length(), maskedProperty.length() ) ); + maskedProperties.add( maskedProperty.substring( radix.length(), maskedProperty.length() ) ); } } } diff --git a/engine/src/main/java/org/hibernate/search/util/impl/ScopedAnalyzer.java b/engine/src/main/java/org/hibernate/search/util/impl/ScopedAnalyzer.java index e7619af58f5..59b712ee215 100644 --- a/engine/src/main/java/org/hibernate/search/util/impl/ScopedAnalyzer.java +++ b/engine/src/main/java/org/hibernate/search/util/impl/ScopedAnalyzer.java @@ -84,7 +84,7 @@ public int getOffsetGap(Fieldable field) { } private Analyzer getAnalyzer( String fieldName ) { - Analyzer analyzer = scopedAnalyzers.get(fieldName); + Analyzer analyzer = scopedAnalyzers.get( fieldName ); if ( analyzer == null ) { analyzer = globalAnalyzer; } diff --git a/infinispan/src/main/java/org/hibernate/search/infinispan/CacheManagerServiceProvider.java b/infinispan/src/main/java/org/hibernate/search/infinispan/CacheManagerServiceProvider.java index d91a45cc86d..54cbcf28742 100644 --- a/infinispan/src/main/java/org/hibernate/search/infinispan/CacheManagerServiceProvider.java +++ b/infinispan/src/main/java/org/hibernate/search/infinispan/CacheManagerServiceProvider.java @@ -51,7 +51,7 @@ */ public class CacheManagerServiceProvider implements ServiceProvider { - private static final Log log = LoggerFactory.make(Log.class); + private static final Log log = LoggerFactory.make( Log.class ); /** * If no configuration is defined an no JNDI lookup name is provided, than a new Infinispan CacheManager @@ -118,7 +118,7 @@ private EmbeddedCacheManager locateCacheManager(String jndiNamespace, Properties } catch ( NamingException ne ) { String msg = "Unable to retrieve CacheManager from JNDI [" + jndiNamespace + "]"; - log.unableToRetrieveCacheManagerFromJndi(jndiNamespace, ne); + log.unableToRetrieveCacheManagerFromJndi( jndiNamespace, ne ); throw new SearchException( msg ); } finally { @@ -127,7 +127,7 @@ private EmbeddedCacheManager locateCacheManager(String jndiNamespace, Properties ctx.close(); } catch ( NamingException ne ) { - log.unableToReleaseInitialContext(ne); + log.unableToReleaseInitialContext( ne ); } } } diff --git a/infinispan/src/main/java/org/hibernate/search/infinispan/impl/InfinispanDirectoryProvider.java b/infinispan/src/main/java/org/hibernate/search/infinispan/impl/InfinispanDirectoryProvider.java index edc11bc37ff..08765f31b67 100644 --- a/infinispan/src/main/java/org/hibernate/search/infinispan/impl/InfinispanDirectoryProvider.java +++ b/infinispan/src/main/java/org/hibernate/search/infinispan/impl/InfinispanDirectoryProvider.java @@ -47,7 +47,7 @@ */ public class InfinispanDirectoryProvider implements org.hibernate.search.store.DirectoryProvider { - private static final Log log = LoggerFactory.make(Log.class); + private static final Log log = LoggerFactory.make( Log.class ); /** * Use {@link InfinispanIntegration.DEFAULT_LOCKING_CACHENAME} instead. diff --git a/orm/src/main/java/org/hibernate/search/backend/impl/EventSourceTransactionContext.java b/orm/src/main/java/org/hibernate/search/backend/impl/EventSourceTransactionContext.java index 8fa9bb1f6d1..7963cbfc85c 100644 --- a/orm/src/main/java/org/hibernate/search/backend/impl/EventSourceTransactionContext.java +++ b/orm/src/main/java/org/hibernate/search/backend/impl/EventSourceTransactionContext.java @@ -131,12 +131,12 @@ public void registerSynchronization(Synchronization synchronization) { private boolean isLocalTransaction() { //TODO make it better but I don't know how we can optimize it. - final TransactionManager transactionManager = getService(JtaPlatform.class).retrieveTransactionManager(); + final TransactionManager transactionManager = getService( JtaPlatform.class ).retrieveTransactionManager(); return transactionManager == null; } private T getService(Class serviceClass) { - return eventSource.getFactory().getServiceRegistry().getService(serviceClass); + return eventSource.getFactory().getServiceRegistry().getService( serviceClass ); } private FullTextIndexEventListener getIndexWorkFlushEventListener() { @@ -144,8 +144,8 @@ private FullTextIndexEventListener getIndexWorkFlushEventListener() { //for the "transient" case: might have been nullified. return flushListener; } - final Iterable listeners = getService(EventListenerRegistry.class) - .getEventListenerGroup(EventType.FLUSH).listeners(); + final Iterable listeners = getService( EventListenerRegistry.class ) + .getEventListenerGroup( EventType.FLUSH ).listeners(); for ( FlushEventListener listener : listeners ) { if ( FullTextIndexEventListener.class.isAssignableFrom( listener.getClass() ) ) { return (FullTextIndexEventListener) listener; diff --git a/orm/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java b/orm/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java index 2a2dede4a97..5f9ce27b539 100644 --- a/orm/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java +++ b/orm/src/main/java/org/hibernate/search/backend/impl/jms/AbstractJMSHibernateSearchController.java @@ -115,7 +115,7 @@ public void onMessage(Message message) { return; } finally { - cleanSessionIfNeeded(session); + cleanSessionIfNeeded( session ); } } diff --git a/orm/src/main/java/org/hibernate/search/batchindexing/impl/IdentifierProducer.java b/orm/src/main/java/org/hibernate/search/batchindexing/impl/IdentifierProducer.java index a2892d16a8a..503ee3c4832 100644 --- a/orm/src/main/java/org/hibernate/search/batchindexing/impl/IdentifierProducer.java +++ b/orm/src/main/java/org/hibernate/search/batchindexing/impl/IdentifierProducer.java @@ -93,7 +93,7 @@ public IdentifierProducer( public void run(StatelessSession upperSession) { log.trace( "started" ); try { - inTransactionWrapper(upperSession); + inTransactionWrapper( upperSession ); } catch (Throwable e) { errorHandler.handleException( log.massIndexerUnexpectedErrorMessage() , e ); diff --git a/orm/src/main/java/org/hibernate/search/batchindexing/impl/OptionallyWrapInJTATransaction.java b/orm/src/main/java/org/hibernate/search/batchindexing/impl/OptionallyWrapInJTATransaction.java index 0468431bfcc..e53f1d8c5e4 100644 --- a/orm/src/main/java/org/hibernate/search/batchindexing/impl/OptionallyWrapInJTATransaction.java +++ b/orm/src/main/java/org/hibernate/search/batchindexing/impl/OptionallyWrapInJTATransaction.java @@ -142,11 +142,11 @@ public void run() { } private TransactionManager getTransactionManager() { - return factory.getServiceRegistry().getService(JtaPlatform.class).retrieveTransactionManager(); + return factory.getServiceRegistry().getService( JtaPlatform.class ).retrieveTransactionManager(); } boolean wrapInTransaction() { - final TransactionFactory transactionFactory = factory.getServiceRegistry().getService(TransactionFactory.class); + final TransactionFactory transactionFactory = factory.getServiceRegistry().getService( TransactionFactory.class ); if ( !transactionFactory.compatibleWithJtaSynchronization() ) { //Today we only require a TransactionManager on JTA based transaction factories log.trace( "TransactionFactory does not require a TransactionManager: don't wrap in a JTA transaction" ); diff --git a/orm/src/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java b/orm/src/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java index 82f9768fe62..ff38c4e73a5 100644 --- a/orm/src/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java +++ b/orm/src/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java @@ -108,7 +108,7 @@ public FullTextSharedSessionBuilder connectionReleaseMode(ConnectionReleaseMode @Override public FullTextSharedSessionBuilder autoJoinTransactions(boolean autoJoinTransactions) { - builder.autoJoinTransactions(autoJoinTransactions); + builder.autoJoinTransactions( autoJoinTransactions ); return this; } diff --git a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/AbstractLoader.java b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/AbstractLoader.java index 848255b02b3..45c929ad5a1 100644 --- a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/AbstractLoader.java +++ b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/AbstractLoader.java @@ -58,7 +58,7 @@ public final Object load(EntityInfo entityInfo) { } public Object loadWithoutTiming(EntityInfo entityInfo) { - return executeLoad(entityInfo); + return executeLoad( entityInfo ); } public abstract Object executeLoad(EntityInfo entityInfo); diff --git a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/CriteriaObjectsInitializer.java b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/CriteriaObjectsInitializer.java index 4023e159f73..26078cfcc9a 100644 --- a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/CriteriaObjectsInitializer.java +++ b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/CriteriaObjectsInitializer.java @@ -99,7 +99,7 @@ public void initializeObjects(EntityInfo[] entityInfos, Long timeLeftInSecond = timeoutManager.getTimeoutLeftInSeconds(); if ( timeLeftInSecond != null ) { if (timeLeftInSecond == 0) { - timeoutManager.reactOnQueryTimeoutExceptionWhileExtracting(null); + timeoutManager.reactOnQueryTimeoutExceptionWhileExtracting( null ); } criteria.setTimeout( timeLeftInSecond.intValue() ); } diff --git a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/LookupObjectsInitializer.java b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/LookupObjectsInitializer.java index 4a4873dd88e..03ae5cdafef 100644 --- a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/LookupObjectsInitializer.java +++ b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/LookupObjectsInitializer.java @@ -58,7 +58,7 @@ public void initializeObjects(EntityInfo[] entityInfos, final int maxResults = entityInfos.length; if ( maxResults == 0 ) { if ( traceEnabled ) - log.tracef("No object to initialize", maxResults); + log.tracef( "No object to initialize", maxResults ); return; } diff --git a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/MultiClassesQueryLoader.java b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/MultiClassesQueryLoader.java index e7df40a09c2..e9d879b5f8a 100644 --- a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/MultiClassesQueryLoader.java +++ b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/MultiClassesQueryLoader.java @@ -80,7 +80,7 @@ public void setEntityTypes(Set> entityTypes) { } } else { - safeEntityTypes.addAll(entityTypes); + safeEntityTypes.addAll( entityTypes ); } entityMatadata = new ArrayList( safeEntityTypes.size() ); for (Class clazz : safeEntityTypes) { diff --git a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/ProjectionLoader.java b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/ProjectionLoader.java index f380f6c4ff2..9978cb09877 100644 --- a/orm/src/main/java/org/hibernate/search/query/hibernate/impl/ProjectionLoader.java +++ b/orm/src/main/java/org/hibernate/search/query/hibernate/impl/ProjectionLoader.java @@ -60,7 +60,7 @@ public void init(Session session, ObjectLoaderBuilder loaderBuilder, String[] aliases, TimeoutManager timeoutManager) { - init(session, searchFactoryImplementor, null, timeoutManager); //TODO why do we call this method? + init( session, searchFactoryImplementor, null, timeoutManager ); // TODO why do we call this method? this.transformer = transformer; this.aliases = aliases; this.loaderBuilder = loaderBuilder; @@ -74,7 +74,7 @@ public Object load(EntityInfo entityInfo) { entityInfo.populateWithEntityInstance( entityInstance ); } if ( transformer != null ) { - return transformer.transformTuple(entityInfo.getProjection(), aliases); + return transformer.transformTuple( entityInfo.getProjection(), aliases ); } else { return entityInfo.getProjection(); @@ -82,7 +82,7 @@ public Object load(EntityInfo entityInfo) { } public Object loadWithoutTiming(EntityInfo entityInfo) { - throw new AssertionFailure("This method is not meant to be used on ProjectionLoader"); + throw new AssertionFailure( "This method is not meant to be used on ProjectionLoader" ); } private boolean projectionEnabledOnThis(final EntityInfo entityInfo) { @@ -95,22 +95,22 @@ private boolean projectionEnabledOnThis(final EntityInfo entityInfo) { public List load(EntityInfo... entityInfos) { //no need to timeouManage here, the underlying loader is the real time consumer - List results = new ArrayList(entityInfos.length); + List results = new ArrayList( entityInfos.length ); if (entityInfos.length == 0) { return results; } if ( projectionEnabledOnThis( entityInfos[0] ) ) { Loader objectLoader = getObjectLoader(); - objectLoader.load(entityInfos); // load by batch - for (EntityInfo entityInfo : entityInfos) { + objectLoader.load( entityInfos ); // load by batch + for ( EntityInfo entityInfo : entityInfos ) { final Object entityInstance = objectLoader.loadWithoutTiming( entityInfo ); entityInfo.populateWithEntityInstance( entityInstance ); } } - for (EntityInfo entityInfo : entityInfos) { - if (transformer != null) { - results.add( transformer.transformTuple(entityInfo.getProjection(), aliases) ); + for ( EntityInfo entityInfo : entityInfos ) { + if ( transformer != null ) { + results.add( transformer.transformTuple( entityInfo.getProjection(), aliases ) ); } else { results.add( entityInfo.getProjection() );