check for correct interfaces instead of relying on string comparison when deleting indexes on cleanup

sarmbruster · sarmbruster · commit 107eb26c2115 · 2012-09-10T10:28:53.000+02:00
diff --git a/src/test/java/org/neo4j/rest/graphdb/Neo4jDatabaseCleaner.java b/src/test/java/org/neo4j/rest/graphdb/Neo4jDatabaseCleaner.java
@@ -28,7 +28,10 @@
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.Transaction;
+import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.index.IndexManager;
+import org.neo4j.graphdb.index.ReadableIndex;
+import org.neo4j.graphdb.index.RelationshipIndex;
 import org.neo4j.rest.graphdb.index.RestAutoIndexer;
 import org.neo4j.tooling.GlobalGraphOperations;
 
@@ -79,13 +82,15 @@ private void clearIndex(Map<String, Object> result) {
         result.put("node-indexes", Arrays.asList(indexManager.nodeIndexNames()));
         result.put("relationship-indexes", Arrays.asList(indexManager.relationshipIndexNames()));
         for (String ix : indexManager.nodeIndexNames()) {
-            if (!(RestAutoIndexer.NODE_AUTO_INDEX).equals(ix)) { // autoindex is not deletable
-                indexManager.forNodes(ix).delete();
+            Index<Node> nodeIndex = indexManager.forNodes(ix);
+            if (!(nodeIndex instanceof ReadableIndex)) {
+                nodeIndex.delete();
             }
         }
         for (String ix : indexManager.relationshipIndexNames()) {
-            if (!(RestAutoIndexer.RELATIONSHIP_AUTO_INDEX).equals(ix)) { // autoindex is not deletable
-                indexManager.forRelationships(ix).delete();
+            RelationshipIndex relationshipIndex = indexManager.forRelationships(ix);
+            if (!(relationshipIndex instanceof ReadableIndex)) {
+                relationshipIndex.delete();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,10 @@`
`28`	`28`	`import org.neo4j.graphdb.Node;`
`29`	`29`	`import org.neo4j.graphdb.Relationship;`
`30`	`30`	`import org.neo4j.graphdb.Transaction;`
	`31`	`+import org.neo4j.graphdb.index.Index;`
`31`	`32`	`import org.neo4j.graphdb.index.IndexManager;`
	`33`	`+import org.neo4j.graphdb.index.ReadableIndex;`
	`34`	`+import org.neo4j.graphdb.index.RelationshipIndex;`
`32`	`35`	`import org.neo4j.rest.graphdb.index.RestAutoIndexer;`
`33`	`36`	`import org.neo4j.tooling.GlobalGraphOperations;`
`34`	`37`
`@@ -79,13 +82,15 @@ private void clearIndex(Map<String, Object> result) {`
`79`	`82`	`result.put("node-indexes", Arrays.asList(indexManager.nodeIndexNames()));`
`80`	`83`	`result.put("relationship-indexes", Arrays.asList(indexManager.relationshipIndexNames()));`
`81`	`84`	`for (String ix : indexManager.nodeIndexNames()) {`
`82`		`- if (!(RestAutoIndexer.NODE_AUTO_INDEX).equals(ix)) { // autoindex is not deletable`
`83`		`- indexManager.forNodes(ix).delete();`
	`85`	`+ Index<Node> nodeIndex = indexManager.forNodes(ix);`
	`86`	`+ if (!(nodeIndex instanceof ReadableIndex)) {`
	`87`	`+ nodeIndex.delete();`
`84`	`88`	`}`
`85`	`89`	`}`
`86`	`90`	`for (String ix : indexManager.relationshipIndexNames()) {`
`87`		`- if (!(RestAutoIndexer.RELATIONSHIP_AUTO_INDEX).equals(ix)) { // autoindex is not deletable`
`88`		`- indexManager.forRelationships(ix).delete();`
	`91`	`+ RelationshipIndex relationshipIndex = indexManager.forRelationships(ix);`
	`92`	`+ if (!(relationshipIndex instanceof ReadableIndex)) {`
	`93`	`+ relationshipIndex.delete();`
`89`	`94`	`}`
`90`	`95`	`}`
`91`	`96`	`}`