-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #340 from jsobanski/integration
JavaNeo4JAdaptor - bug fix and refactoring
- Loading branch information
Showing
20 changed files
with
378 additions
and
197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 2 additions & 17 deletions
19
...ors/JavaNeo4JAdaptor/Sources/er/neo4jadaptor/query/all_of_type/results/ObjectsOfType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,19 @@ | ||
package er.neo4jadaptor.query.all_of_type.results; | ||
|
||
import java.util.Iterator; | ||
|
||
import org.apache.lucene.search.Query; | ||
import org.neo4j.graphdb.PropertyContainer; | ||
import org.neo4j.graphdb.index.Index; | ||
|
||
import com.webobjects.eoaccess.EOEntity; | ||
|
||
import er.neo4jadaptor.query.Results; | ||
import er.neo4jadaptor.query.lucene.LuceneQueryConverter; | ||
import er.neo4jadaptor.utils.cursor.Cursor; | ||
import er.neo4jadaptor.utils.cursor.IteratorCursor; | ||
|
||
public class ObjectsOfType <Type extends PropertyContainer> implements Results<Type> { | ||
public class ObjectsOfType <Type extends PropertyContainer> extends IteratorCursor<Type> implements Results<Type> { | ||
@SuppressWarnings("unused") | ||
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(ObjectsOfType.class); | ||
|
||
private final Index<Type> typeIndex; | ||
private final EOEntity entity; | ||
|
||
public ObjectsOfType(Index<Type> nodeIndex, EOEntity entity) { | ||
this.typeIndex = nodeIndex; | ||
this.entity = entity; | ||
} | ||
|
||
public Cursor<Type> iterator() { | ||
Query q = LuceneQueryConverter.matchAllOfEntity(entity); | ||
Iterator<Type> it = typeIndex.query(q).iterator(); | ||
|
||
return new IteratorCursor<Type>(it); | ||
super(nodeIndex.query(LuceneQueryConverter.matchAllOfEntity(entity)).iterator()); | ||
} | ||
} |
138 changes: 138 additions & 0 deletions
138
...works/EOAdaptors/JavaNeo4JAdaptor/Sources/er/neo4jadaptor/query/expression/Converter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,138 @@ | ||
package er.neo4jadaptor.query.expression; | ||
|
||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.EQUAL; | ||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.GREATER_OR_EQUAL; | ||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.GREATER_THAN; | ||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.ILIKE; | ||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.LESS_OR_EQUAL; | ||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.LESS_THAN; | ||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.LIKE; | ||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.MATCHES; | ||
import static er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator.NOT_EQUAL; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Collection; | ||
|
||
import com.webobjects.eoaccess.EOAttribute; | ||
import com.webobjects.eoaccess.EOEntity; | ||
import com.webobjects.eoaccess.EORelationship; | ||
import com.webobjects.eocontrol.EOAndQualifier; | ||
import com.webobjects.eocontrol.EOKeyValueQualifier; | ||
import com.webobjects.eocontrol.EONotQualifier; | ||
import com.webobjects.eocontrol.EOOrQualifier; | ||
import com.webobjects.eocontrol.EOQualifier; | ||
import com.webobjects.foundation.NSKeyValueCoding; | ||
import com.webobjects.foundation.NSSelector; | ||
|
||
import er.neo4jadaptor.ersatz.webobjects.NSTranslator; | ||
import er.neo4jadaptor.query.expression.sentence.BinaryJoined; | ||
import er.neo4jadaptor.query.expression.sentence.Comparison; | ||
import er.neo4jadaptor.query.expression.sentence.Negation; | ||
import er.neo4jadaptor.query.expression.sentence.Sentence; | ||
import er.neo4jadaptor.query.expression.sentence.operators.BinaryOperator; | ||
import er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator; | ||
|
||
public class Converter { | ||
private final EOEntity entity; | ||
|
||
public Converter(EOEntity entity) { | ||
this.entity = entity; | ||
} | ||
|
||
public Sentence convert(EOQualifier q) { | ||
if (q instanceof EOAndQualifier) { | ||
Collection<Sentence> components = convertCollection(((EOAndQualifier) q).qualifiers()); | ||
|
||
return new BinaryJoined(BinaryOperator.AND, components); | ||
} else if (q instanceof EOOrQualifier) { | ||
Collection<Sentence> components = convertCollection(((EOOrQualifier) q).qualifiers()); | ||
|
||
return new BinaryJoined(BinaryOperator.OR, components); | ||
} else if (q instanceof EONotQualifier) { | ||
Sentence component = convert(((EONotQualifier) q).qualifier()); | ||
|
||
return new Negation(component); | ||
} else if (q instanceof EOKeyValueQualifier) { | ||
return convertComparison((EOKeyValueQualifier) q); | ||
} else { | ||
throw new IllegalArgumentException(); | ||
} | ||
} | ||
|
||
private Collection<Sentence> convertCollection(Collection<EOQualifier> qualifiers) { | ||
Collection<Sentence> components = new ArrayList<Sentence>(); | ||
|
||
for (EOQualifier q : qualifiers) { | ||
components.add(convert(q)); | ||
} | ||
return components; | ||
} | ||
|
||
private ComparisonOperator operator(NSSelector<?> operator) { | ||
if (operator.equals(EOKeyValueQualifier.QualifierOperatorEqual)) { | ||
return EQUAL; | ||
} else if (operator.equals(EOKeyValueQualifier.QualifierOperatorNotEqual)) { | ||
return NOT_EQUAL; | ||
} else if (operator.equals(EOKeyValueQualifier.QualifierOperatorLessThanOrEqualTo)) { | ||
return LESS_OR_EQUAL; | ||
} else if (operator.equals(EOKeyValueQualifier.QualifierOperatorLessThan)) { | ||
return LESS_THAN; | ||
} else if (operator.equals(EOKeyValueQualifier.QualifierOperatorGreaterThanOrEqualTo)) { | ||
return GREATER_OR_EQUAL; | ||
} else if (operator.equals(EOKeyValueQualifier.QualifierOperatorGreaterThan)) { | ||
return GREATER_THAN; | ||
} else if (operator.equals(EOKeyValueQualifier.QualifierOperatorLike)) { | ||
return LIKE; | ||
} else if (operator.equals(EOKeyValueQualifier.QualifierOperatorCaseInsensitiveLike)) { | ||
return ILIKE; | ||
} else if (ComparisonOperator.MATCHES.asString.equals(operator.name())) { | ||
return MATCHES; | ||
} else { | ||
// case not covered | ||
throw new UnsupportedOperationException(operator.toString()); | ||
} | ||
} | ||
|
||
private Comparison convertComparison(EOKeyValueQualifier qual) { | ||
ComparisonOperator operator = operator(qual.selector()); | ||
String key = qual.key(); | ||
Object value = NSTranslator.instance.toNeutralValue(qual.value(), entity.attributeNamed(key)); | ||
EOEntity currentEntity = entity; | ||
String [] splits = key.split("\\."); | ||
Collection<EORelationship> rels = new ArrayList<EORelationship>(); | ||
|
||
for (int i=0; i<splits.length - 1; i++) { | ||
EORelationship rel = currentEntity.relationshipNamed(splits[i]); | ||
|
||
rels.add(rel); | ||
currentEntity = rel.destinationEntity(); | ||
} | ||
|
||
// now process the last bit | ||
String last = splits[splits.length-1]; | ||
|
||
if (entity.attributeNamed(last) != null) { | ||
// it's a plain attribute value comparison | ||
return new Comparison(rels, entity.attributeNamed(last), operator, value); | ||
} else { | ||
// it's a relationship value comparison, let's represent it as attribute comparison | ||
EORelationship lastRel = entity.relationshipNamed(last); | ||
EOAttribute srcAtt = asOne(lastRel.sourceAttributes()); | ||
EOAttribute dstAtt = asOne(lastRel.destinationAttributes()); | ||
|
||
rels.add(lastRel); | ||
if (value != null) { | ||
value = ((NSKeyValueCoding) value).valueForKey(dstAtt.name()); | ||
} | ||
return new Comparison(rels, srcAtt, operator, value); | ||
} | ||
} | ||
|
||
private <T> T asOne(Collection<T> col) { | ||
if (col.size() != 1) { | ||
throw new IllegalArgumentException(); | ||
} else { | ||
return col.iterator().next(); | ||
} | ||
} | ||
} |
15 changes: 15 additions & 0 deletions
15
...tors/JavaNeo4JAdaptor/Sources/er/neo4jadaptor/query/expression/sentence/BinaryJoined.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package er.neo4jadaptor.query.expression.sentence; | ||
|
||
import java.util.Collection; | ||
|
||
import er.neo4jadaptor.query.expression.sentence.operators.BinaryOperator; | ||
|
||
public class BinaryJoined extends Sentence { | ||
private final Collection<Sentence> components; | ||
private final BinaryOperator operator; | ||
|
||
public BinaryJoined(BinaryOperator op, Collection<Sentence> components) { | ||
this.operator = op; | ||
this.components = components; | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
...aptors/JavaNeo4JAdaptor/Sources/er/neo4jadaptor/query/expression/sentence/Comparison.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package er.neo4jadaptor.query.expression.sentence; | ||
|
||
import java.util.Collection; | ||
|
||
import com.webobjects.eoaccess.EOAttribute; | ||
import com.webobjects.eoaccess.EORelationship; | ||
|
||
import er.neo4jadaptor.query.expression.sentence.operators.ComparisonOperator; | ||
|
||
|
||
|
||
public class Comparison extends Sentence { | ||
private final Collection<EORelationship> relationships; | ||
private final EOAttribute attribute; | ||
private final ComparisonOperator operator; | ||
private final Object value; | ||
|
||
public Comparison(Collection<EORelationship> rels, EOAttribute att, ComparisonOperator op, Object val) { | ||
this.relationships = rels; | ||
this.attribute = att; | ||
this.operator = op; | ||
this.value = val; | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
...Adaptors/JavaNeo4JAdaptor/Sources/er/neo4jadaptor/query/expression/sentence/Negation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package er.neo4jadaptor.query.expression.sentence; | ||
|
||
public class Negation extends Sentence { | ||
private final Sentence wrapped; | ||
|
||
public Negation(Sentence toNegate) { | ||
this.wrapped = toNegate; | ||
} | ||
} |
5 changes: 5 additions & 0 deletions
5
...Adaptors/JavaNeo4JAdaptor/Sources/er/neo4jadaptor/query/expression/sentence/Sentence.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package er.neo4jadaptor.query.expression.sentence; | ||
|
||
public abstract class Sentence { | ||
|
||
} |
5 changes: 5 additions & 0 deletions
5
...4JAdaptor/Sources/er/neo4jadaptor/query/expression/sentence/operators/BinaryOperator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package er.neo4jadaptor.query.expression.sentence.operators; | ||
|
||
public enum BinaryOperator { | ||
AND, OR; | ||
} |
36 changes: 36 additions & 0 deletions
36
...aptor/Sources/er/neo4jadaptor/query/expression/sentence/operators/ComparisonOperator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package er.neo4jadaptor.query.expression.sentence.operators; | ||
|
||
|
||
public enum ComparisonOperator { | ||
LESS_THAN("<"), | ||
LESS_OR_EQUAL("<="), | ||
GREATER_THAN(">"), | ||
GREATER_OR_EQUAL(">="), | ||
EQUAL("="), | ||
NOT_EQUAL("!="), | ||
|
||
/** | ||
* Case sensitive match using wildcards | ||
*/ | ||
LIKE("like"), | ||
/** | ||
* Case insensitive match using wildcards | ||
*/ | ||
ILIKE("ilike"), | ||
/** | ||
* Regular expression match | ||
*/ | ||
MATCHES("matches"); | ||
|
||
public final String asString; | ||
|
||
private ComparisonOperator(String asString) { | ||
this.asString = asString; | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return asString; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.