Author: ogrisel
Date: Fri May 13 16:35:46 2011
New Revision: 1102806
URL: http://svn.apache.org/viewvc?rev=1102806&view=rev
Log:
fixed typos in the query API
Modified:
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/query/FieldQueryImpl.java
incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/JSONToFieldQuery.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java
Modified:
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/query/FieldQueryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/query/FieldQueryImpl.java?rev=1102806&r1=1102805&r2=1102806&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/query/FieldQueryImpl.java
(original)
+++
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/query/FieldQueryImpl.java
Fri May 13 16:35:46 2011
@@ -107,7 +107,7 @@ public class FieldQueryImpl implements C
/* (non-Javadoc)
* @see
org.apache.stanbol.entityhub.core.query.FieldQuery#isConstraint(java.lang.String)
*/
- public final boolean isConstraint(String field){
+ public final boolean isConstrained(String field){
return queryConstraint.containsKey(field);
}
/* (non-Javadoc)
Modified:
incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java?rev=1102806&r1=1102805&r2=1102806&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java
(original)
+++
incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java
Fri May 13 16:35:46 2011
@@ -92,7 +92,7 @@ public interface FieldQuery extends Quer
* @param field the field
* @return the state
*/
- boolean isConstraint(String field);
+ boolean isConstrained(String field);
/**
* Getter for the Constraint of a field
Modified:
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/JSONToFieldQuery.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/JSONToFieldQuery.java?rev=1102806&r1=1102805&r2=1102806&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/JSONToFieldQuery.java
(original)
+++
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/JSONToFieldQuery.java
Fri May 13 16:35:46 2011
@@ -63,7 +63,7 @@ public final class JSONToFieldQuery {
if(field == null || field.isEmpty()){
log.warn("The value of the key \"field\" MUST NOT be NULL
nor emtpy!");
log.warn(String.format("Constraint:\n
%s",jConstraint.toString(4)));
- } else if(query.isConstraint(field)){
+ } else if(query.isConstrained(field)){
log.warn(String.format("Multiple constraints for field %s
in parsed FieldQuery!",field));
log.warn(String.format(" - all Constraints:\n",
constraints.toString(4)));
log.warn(String.format(" - ignore Constraint:\n
%s",jConstraint.toString(4)));
Modified:
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java?rev=1102806&r1=1102805&r2=1102806&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java
(original)
+++
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java
Fri May 13 16:35:46 2011
@@ -146,7 +146,7 @@ public class SolrQueryFactory {
StringBuilder queryString = new StringBuilder();
for (Entry<String,Constraint> fieldConstraint : fieldQuery) {
IndexConstraint indexConstraint =
createIndexConstraint(fieldConstraint);
- if (indexConstraint.isInvalied()) {
+ if (indexConstraint.isInvalid()) {
log.warn(String
.format(
"Unable to create IndexConstraint for Constraint
%s (type: %s) and Field %s (Reosens: %s)",
@@ -219,7 +219,7 @@ public class SolrQueryFactory {
initIndexConstraint(indexConstraint, (RangeConstraint)
fieldConstraint.getValue());
break;
default:
- indexConstraint.setInvalied(String.format("ConstraintType %s
not supported by!",
+ indexConstraint.setInvalid(String.format("ConstraintType %s
not supported by!",
fieldConstraint.getValue().getType()));
}
@@ -244,7 +244,7 @@ public class SolrQueryFactory {
} else {
if (!dataType.equals(upperDataType)) {
indexConstraint
- .setInvalied(String
+ .setInvalid(String
.format(
"A Range Query MUST use the same data
type for the upper and lover Bound! (lower:[value=%s|datatype=%s] |
upper:[value=%s|datatype=%s])",
rangeConstraint.getLowerBound(),
dataType,
@@ -253,7 +253,7 @@ public class SolrQueryFactory {
}
}
if (dataType == null) {
- indexConstraint.setInvalied("A Range Constraint MUST define at
least a lower or an upper bound!");
+ indexConstraint.setInvalid("A Range Constraint MUST define at
least a lower or an upper bound!");
} else {
indexConstraint.setFieldConstraint(IndexConstraintTypeEnum.DATATYPE, dataType);
}
@@ -286,7 +286,7 @@ public class SolrQueryFactory {
indexConstraint.setFieldConstraint(IndexConstraintTypeEnum.REGEX, textValue);
break;
default:
- indexConstraint.setInvalied(String.format(
+ indexConstraint.setInvalid(String.format(
"PatterType %s not supported for Solr Index Queries!",
textConstraint.getPatternType()));
}
}
@@ -298,7 +298,7 @@ public class SolrQueryFactory {
private void initIndexConstraint(IndexConstraint indexConstraint,
ValueConstraint valueConstraint) {
if (valueConstraint.getValue() == null) {
indexConstraint
- .setInvalied(String
+ .setInvalid(String
.format(
"ValueConstraint without a value - that check
only any value for the parsed datatypes %s is present - can not be supported by
a Solr query!",
valueConstraint.getDataTypes()));
@@ -326,7 +326,7 @@ public class SolrQueryFactory {
indexConstraint.setFieldConstraint(IndexConstraintTypeEnum.EQ, indexValue);
indexConstraint.setFieldConstraint(IndexConstraintTypeEnum.DATATYPE,
indexValue);
} catch (NoConverterException e) {
- indexConstraint.setInvalied(e.getMessage());
+ indexConstraint.setInvalid(e.getMessage());
}
} else { // one or more supported dataTypes are present
for (IndexDataType indexDataType : indexDataTypes) {
@@ -472,7 +472,7 @@ public class SolrQueryFactory {
private class IndexConstraint {
private final Map<IndexConstraintTypeEnum,Object> fieldConstraints =
new EnumMap<IndexConstraintTypeEnum,Object>(
IndexConstraintTypeEnum.class);
- private List<String> invaliedMessages = new ArrayList<String>();
+ private List<String> invalidMessages = new ArrayList<String>();
/**
* Creates a Field Term for the parsed path
@@ -490,15 +490,14 @@ public class SolrQueryFactory {
}
/**
- * Set to <code>true</code> to indicate, that this IndexConstraint can
not be used. e.g. if the
- * conversion of a {@link Constraint } to an {@link IndexConstraint}
was unsuccessful!
+ * Set an explanatory error message to tell that this IndexConstraint
cannot be used. e.g. if the
+ * conversion of a {@link Constraint} to an {@link IndexConstraint}
was unsuccessful.
*
- * @param state
- * the state
+ * @param message
+ * an message to explain why the constraint is not valid
*/
- public void setInvalied(String message) {
- this.invaliedMessages.add(message);
-
+ public void setInvalid(String message) {
+ this.invalidMessages.add(message);
}
/**
@@ -508,17 +507,17 @@ public class SolrQueryFactory {
*
* @return the state
*/
- public boolean isInvalied() {
- return !invaliedMessages.isEmpty();
+ public boolean isInvalid() {
+ return !invalidMessages.isEmpty();
}
/**
* Getter for the Messages why this index constraint is not valid
*
- * @return the messages. An empty List if {@link #isInvalied()}
returns <code>false</code>
+ * @return the messages. An empty List if {@link #isInvalid()} returns
<code>false</code>
*/
public List<String> getInvalidMessages() {
- return invaliedMessages;
+ return invalidMessages;
}
/**
@@ -565,7 +564,7 @@ public class SolrQueryFactory {
@SuppressWarnings("unchecked")
public void encode(StringBuilder queryString) {
- if (isInvalied()) {
+ if (isInvalid()) {
throw new IllegalStateException(String.format(
"Unable to encode an invalid IndexConstraint (invalid
messages: %s)",
getInvalidMessages()));
