Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java?rev=1364535&r1=1364534&r2=1364535&view=diff ============================================================================== --- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java (original) +++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java Mon Jul 23 07:19:09 2012 @@ -16,27 +16,28 @@ */ package org.apache.stanbol.entityhub.servicesapi.query; - /** * Abstract base class for all types of Constraints. + * * @author Rupert Westenthaler - * + * */ public abstract class Constraint { /** - * Defines the enumeration of available Constraints. - * TODO Maybe we need a more "extensible" way to define different constraints - * in future + * Defines the enumeration of available Constraints. TODO Maybe we need a more "extensible" way to define + * different constraints in future + * * @author Rupert Westenthaler - * + * */ - public enum ConstraintType{ -// NOTE (2010-Nov-09,rw) Because a reference constraint is now a special kind of -// a value constraint. -// /** -// * Constraints a field to have a specific reference -// */ -// reference, + public enum ConstraintType { + // NOTE (2010-Nov-09,rw) Because a reference constraint is now a special + // kind of + // a value constraint. + // /** + // * Constraints a field to have a specific reference + // */ + // reference, /** * Constraints the value and possible the dataType */ @@ -55,19 +56,28 @@ public abstract class Constraint { */ similarity } + private final ConstraintType type; - protected Constraint(ConstraintType type){ - if(type == null){ + + protected Constraint(ConstraintType type) { + if (type == null) { throw new IllegalArgumentException("The ConstraintType MUST NOT be NULL"); } this.type = type; } + /** * Getter for the type of the constraint. + * * @return The type of the constraint */ - public final ConstraintType getType(){ + public final ConstraintType getType() { return type; } + @Override + public String toString() { + return String.format("Constraint [type :: %s][class :: %s]", type, getClass().toString()); + } + }
Modified: incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQuery.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQuery.java?rev=1364535&r1=1364534&r2=1364535&view=diff ============================================================================== --- incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQuery.java (original) +++ incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQuery.java Mon Jul 23 07:19:09 2012 @@ -27,10 +27,11 @@ import org.apache.stanbol.entityhub.serv /** * Adds the "selected field" to "SPARQL variable name" mapping + * * @author Rupert Westenthaler - * + * */ -public class SparqlFieldQuery extends FieldQueryImpl implements FieldQuery ,Cloneable { +public class SparqlFieldQuery extends FieldQueryImpl implements FieldQuery, Cloneable { /** * String used as prefix for variables generated for fields */ @@ -38,18 +39,21 @@ public class SparqlFieldQuery extends Fi private static final String ROOT_VAR_NAME = "id"; private int varNum; private final Map<String,String> field2VarMappings; - private final Map<String, String> unmodField2VarMappings; + private final Map<String,String> unmodField2VarMappings; private EndpointTypeEnum endpointType; + protected SparqlFieldQuery() { this(null); } - protected SparqlFieldQuery(EndpointTypeEnum endpointType){ + + protected SparqlFieldQuery(EndpointTypeEnum endpointType) { super(); - this.endpointType = endpointType != null?endpointType:EndpointTypeEnum.Standard; + this.endpointType = endpointType != null ? endpointType : EndpointTypeEnum.Standard; varNum = 0; - field2VarMappings = new HashMap<String, String>(); + field2VarMappings = new HashMap<String,String>(); unmodField2VarMappings = Collections.unmodifiableMap(field2VarMappings); } + public final EndpointTypeEnum getEndpointType() { return endpointType; } @@ -57,89 +61,110 @@ public class SparqlFieldQuery extends Fi public final void setEndpointType(EndpointTypeEnum endpointType) { this.endpointType = endpointType; } + /* * (non-Javadoc) - * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#addSelectedField(java.lang.String) + * + * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#addSelectedField (java.lang.String) */ @Override public void addSelectedField(String field) { super.addSelectedField(field); field2VarMappings.put(field, getFieldVar()); } + /* * (non-Javadoc) - * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#addSelectedFields(java.util.Collection) + * + * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#addSelectedFields (java.util.Collection) */ @Override public void addSelectedFields(Collection<String> fields) { super.addSelectedFields(fields); - for(String field : fields){ + for (String field : fields) { field2VarMappings.put(field, getFieldVar()); } } + /* * (non-Javadoc) - * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#removeSelectedField(java.lang.String) + * + * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#removeSelectedField (java.lang.String) */ @Override public void removeSelectedField(String field) { super.removeSelectedField(field); field2VarMappings.remove(field); } + /* * (non-Javadoc) - * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#removeSelectedFields(java.util.Collection) + * + * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#removeSelectedFields (java.util.Collection) */ @Override public void removeSelectedFields(Collection<String> fields) { super.removeSelectedFields(fields); - for(String field : fields){ + for (String field : fields) { field2VarMappings.remove(field); } } + /** * Getter for the variable name for a selected field - * @param field the selected field + * + * @param field + * the selected field * @return the variable name or <code>null</code> if the parsed field is not selected. */ - public String getVariableName(String field){ + public String getVariableName(String field) { return field2VarMappings.get(field); } + /** * Getter for the unmodifiable field name to variable name mapping. + * * @return */ - public Map<String,String> getFieldVariableMappings(){ + public Map<String,String> getFieldVariableMappings() { return unmodField2VarMappings; } - private String getFieldVar(){ + + private String getFieldVar() { varNum++; - return FIELD_VAR_PREFIX+varNum; + return FIELD_VAR_PREFIX + varNum; } - public String getRootVariableName(){ + + public String getRootVariableName() { return ROOT_VAR_NAME; } + /** * Clones the query (including the field to var name mapping) */ @Override public SparqlFieldQuery clone() { SparqlFieldQuery clone = super.copyTo(new SparqlFieldQuery()); - //Note: this uses the public API. However the field->ar mapping might still - //be different if any removeSelectedField(..) method was used on this - //instance. Because of that manually set the map and the value of the int. - //clone.field2VarMappings.clear(); //clear is not necessary, because the keys are equals! + // Note: this uses the public API. However the field->ar mapping might + // still + // be different if any removeSelectedField(..) method was used on this + // instance. Because of that manually set the map and the value of the + // int. + // clone.field2VarMappings.clear(); //clear is not necessary, because + // the keys are equals! clone.field2VarMappings.putAll(field2VarMappings); clone.varNum = varNum; return clone; } + @Override public int hashCode() { - return super.hashCode()+field2VarMappings.hashCode()+varNum+endpointType.ordinal(); + return super.hashCode() + field2VarMappings.hashCode() + varNum + endpointType.ordinal(); } /** * Removes also the field to var name mappings + * * @see org.apache.stanbol.entityhub.core.query.FieldQueryImpl#removeAllSelectedFields() */ @Override @@ -148,29 +173,35 @@ public class SparqlFieldQuery extends Fi field2VarMappings.clear(); varNum = 0; } + @Override public boolean equals(Object obj) { - return super.equals(obj) && obj instanceof SparqlFieldQuery && - ((SparqlFieldQuery)obj).field2VarMappings.equals(field2VarMappings) && - ((SparqlFieldQuery)obj).varNum == varNum && - ((SparqlFieldQuery)obj).endpointType == endpointType; + return super.equals(obj) && obj instanceof SparqlFieldQuery + && ((SparqlFieldQuery) obj).field2VarMappings.equals(field2VarMappings) + && ((SparqlFieldQuery) obj).varNum == varNum + && ((SparqlFieldQuery) obj).endpointType == endpointType; } + /** * Getter for the SPARQL SELECT representation of this FieldQuery + * * @return the SPARQL SELECT query */ - public String toSparqlSelect(boolean includeFields){ - return SparqlQueryUtils.createSparqlSelectQuery(this,includeFields,endpointType); + public String toSparqlSelect(boolean includeFields) { + return SparqlQueryUtils.createSparqlSelectQuery(this, includeFields, endpointType); } + /** * Getter for the SPARQL CONSTRUCT representation of this FieldQuery + * * @return the SPARQL CONSTRUCT query */ - public String toSparqlConstruct(){ - return SparqlQueryUtils.createSparqlConstructQuery(this,endpointType); + public String toSparqlConstruct() { + return SparqlQueryUtils.createSparqlConstructQuery(this, endpointType); } + @Override public String toString() { - return super.toString()+" field->variable mappings: "+field2VarMappings; + return super.toString() + " field->variable mappings: " + field2VarMappings; } } Modified: incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQueryFactory.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQueryFactory.java?rev=1364535&r1=1364534&r2=1364535&view=diff ============================================================================== --- incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQueryFactory.java (original) +++ incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQueryFactory.java Mon Jul 23 07:19:09 2012 @@ -18,37 +18,48 @@ package org.apache.stanbol.entityhub.que import org.apache.stanbol.entityhub.servicesapi.query.FieldQuery; import org.apache.stanbol.entityhub.servicesapi.query.FieldQueryFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class SparqlFieldQueryFactory implements FieldQueryFactory { private static SparqlFieldQueryFactory instance; - public static SparqlFieldQueryFactory getInstance(){ - if(instance == null){ + public static SparqlFieldQueryFactory getInstance() { + if (instance == null) { instance = new SparqlFieldQueryFactory(); } return instance; } - private SparqlFieldQueryFactory(){ + + private SparqlFieldQueryFactory() { super(); } + @Override public SparqlFieldQuery createFieldQuery() { return new SparqlFieldQuery(); } + /** * Utility Method to create an {@link SparqlFieldQuery} based on the parse {@link FieldQuery} - * @param parsedQuery the parsed Query + * + * @param parsedQuery + * the parsed Query */ public static SparqlFieldQuery getSparqlFieldQuery(FieldQuery parsedQuery) { - if(parsedQuery == null){ + Logger logger = LoggerFactory.getLogger(SparqlFieldQueryFactory.class); + + if (parsedQuery == null) { + logger.trace("Parsed query is null."); return null; - } else if(parsedQuery instanceof SparqlFieldQuery){ - return (SparqlFieldQuery)parsedQuery; + } else if (parsedQuery instanceof SparqlFieldQuery) { + logger.trace("Parsed query is a [SparqlFieldQuery]."); + return (SparqlFieldQuery) parsedQuery; } else { + logger.trace("Parsed query is a [{}].", parsedQuery.getClass().toString()); return parsedQuery.copyTo(new SparqlFieldQuery()); } } - }
