Skip to content

Commit

Permalink
HSEARCH-1292 Fixes spaces between parenthesis
Browse files Browse the repository at this point in the history
  • Loading branch information
DavideD authored and Sanne committed Apr 24, 2013
1 parent 054f945 commit 4a47f00
Show file tree
Hide file tree
Showing 80 changed files with 289 additions and 282 deletions.
Expand Up @@ -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;
Expand Down
Expand Up @@ -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 );
}

}
Expand Up @@ -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 );
}

Expand Down
Expand Up @@ -62,26 +62,27 @@ public void setParameterValues(Map<String,String> 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 );
}

}
Expand Up @@ -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() );
}
}
Expand Up @@ -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() );
}
}
Expand Up @@ -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() );
}
}
Expand Up @@ -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() );
}
}
Expand Up @@ -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 );
}
}

Expand Down
Expand Up @@ -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 );
}
}
Expand Down
Expand Up @@ -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) {
Expand Down
Expand Up @@ -40,7 +40,7 @@ public class AnalyzerDefMapping {
AnalyzerDefMapping(String name, Class<? extends TokenizerFactory> tokenizerFactory, SearchMapping mapping) {
this.mapping = mapping;
this.analyzerDef = new HashMap<String, Object>();
mapping.addAnalyzerDef(analyzerDef);
mapping.addAnalyzerDef( analyzerDef );
analyzerDef.put( "name", name );
tokenizer = new HashMap<String, Object>();
tokenizer.put( "factory", tokenizerFactory );
Expand All @@ -51,25 +51,25 @@ public class AnalyzerDefMapping {
* {@code &#064;TokenizerDef(, ... params={&#064;Parameter(name="name", value="value"), ...}) }
*/
public AnalyzerDefMapping tokenizerParam(String name, String value) {
Map<String, Object> param = SearchMapping.addElementToAnnotationArray(tokenizer, "params");
param.put("name", name);
param.put("value", value);
Map<String, Object> param = SearchMapping.addElementToAnnotationArray( tokenizer, "params" );
param.put( "name", name );
param.put( "value", value );
return this;
}

/**
* {@code &#064;TokenFilterDef(factory=factory) }
*/
public TokenFilterDefMapping filter(Class<? extends TokenFilterFactory> factory) {
return new TokenFilterDefMapping(factory, analyzerDef, mapping);
return new TokenFilterDefMapping( factory, analyzerDef, mapping );
}

public AnalyzerDefMapping analyzerDef(String name, Class<? extends TokenizerFactory> 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 );
}

}
Expand Up @@ -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<String, Object>();
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<? extends TokenizerFactory> 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 );
}

}
Expand Up @@ -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<String,Object>();
entity.addClassBridgeDef(classBridge);
if (impl != null) {
this.classBridge.put("impl", impl);
this.classBridge = new HashMap<String, Object>();
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;
}

Expand All @@ -102,11 +102,10 @@ public ClassBridgeMapping analyzer(String analyzerDef) {
return this;
}


public ClassBridgeMapping param(String name, String value) {
Map<String, Object> param = SearchMapping.addElementToAnnotationArray(classBridge, "params");
param.put("name", name);
param.put("value", value);
Map<String, Object> param = SearchMapping.addElementToAnnotationArray( classBridge, "params" );
param.put( "name", name );
param.put( "value", value );
return this;
}

Expand Down
Expand Up @@ -41,7 +41,7 @@ public ContainedInMapping(SearchMapping mapping,PropertyDescriptor property, Ent
this.property = property;
this.entity = entity;
Map<String, Object> containedIn = new HashMap<String, Object>();
property.setContainedIn(containedIn);
property.setContainedIn( containedIn );
}

public FieldMapping field() {
Expand Down
Expand Up @@ -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<String, Object>();
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<? extends TokenizerFactory> 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 );
}

}
Expand Up @@ -119,7 +119,7 @@ public Set<Map<String, Object>> getClassBridgeDefs() {
}

public void addSpatial(Map<String,Object> spatial) {
spatials.add(spatial);
spatials.add( spatial );
}

public Set<Map<String, Object>> getSpatials() {
Expand Down
Expand Up @@ -45,8 +45,8 @@ public FieldBridgeDirectMapping(PropertyDescriptor property, EntityDescriptor en

public FieldBridgeDirectMapping param(String name, String value) {
Map<String, Object> param = SearchMapping.addElementToAnnotationArray( fieldBridgeAnn, "params" );
param.put("name", name);
param.put("value", value);
param.put( "name", name );
param.put( "value", value );
return this;
}

Expand Down
Expand Up @@ -57,9 +57,9 @@ public FieldBridgeMapping(Class<?> impl, Map<String, Object> field,
}

public FieldBridgeMapping param(String name, String value) {
Map<String, Object> param = SearchMapping.addElementToAnnotationArray(bridge, "params");
param.put("name", name);
param.put("value", value);
Map<String, Object> param = SearchMapping.addElementToAnnotationArray( bridge, "params" );
param.put( "name", name );
param.put( "value", value );
return this;
}

Expand Down

0 comments on commit 4a47f00

Please sign in to comment.