Changeset 34:8427930c5f88 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/neo4j

Timestamp:

Sep 25, 2012, 8:20:17 PM (13 years ago)

Author:

casties

Branch:

default

Parents:

33:86bb29132ba6 (diff), 31:9f653697437e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 8ad8596a570af38aacfaecdb68b7e06145624181

Files:

• src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java (modified) (21 diffs)
• src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java (modified) (2 diffs)

src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

@@ -5 +5 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashSet;
@@ -28 +29 @@
 
 /**
+ * Neo4J based Annotation store.
+ * 
  * @author casties
  * 
@@ -40 +43 @@
         ANNOTATION, PERSON, TARGET, GROUP, TAG
     }
+
+    // types of nodes that should not be automatically deleted.
+    public Set<String> permanentNodeTypes = new HashSet<String>(Arrays.asList("PERSON", "GROUP", "TAG"));
 
     protected List<Index<Node>> nodeIndexes;
@@ -85 +91 @@
     }
 
-    
-    
     public List<Actor> getActors(String key, String query, NodeTypes type) {
         ArrayList<Actor> actors = new ArrayList<Actor>();
@@ -124 +128 @@
         return groups;
     }
-    
-    
+
     /**
      * Returns List of Annotations.
@@ -174 +177 @@
     }
 
- 
-   /**
+    /**
      * Returns List of Groups the person is member of.
      * 
@@ -240 +242 @@
         return members;
     }
-    
+
     /**
      * Add Person newMember to Group group.
@@ -257 +259 @@
         return addedMember;
     }
-    
+
     /**
      * Delete Person oldMember from Group group.
@@ -266 +268 @@
     public void deleteGroupMember(Group group, Person member) {
         Node gn = getActorNode(group);
+        Node pn = getActorNode(member);
         Iterable<Relationship> rels = gn.getRelationships(RelationTypes.MEMBER_OF);
         for (Relationship rel : rels) {
             Node mn = rel.getStartNode();
-            if (mn.equals(member)) {
-                rel.delete();
+            if (mn.equals(pn)) {
+                Transaction tx = graphDb.beginTx();
+                try {
+                    rel.delete();
+                    tx.success();
+                } finally {
+                    tx.finish();
+                }
                 // there should be only one
                 break;
             }
-        }        
-    }
-    
+        }
+    }
+
     /**
      * Returns the stored Actor matching the given one.
@@ -284 +293 @@
      */
     public Actor getActor(Actor actor) {
-        Node actorNode = getActorNode(actor);
-        Actor storedActor = createActorFromNode(actorNode);
-        return storedActor;
-    }
-    
-    /**
-     * Stores an Actor (Person or Group). Creates a new actor Node or returns an existing one.
+        Node actorNode = getActorNode(actor);
+        Actor storedActor = createActorFromNode(actorNode);
+        return storedActor;
+    }
+
+    /**
+     * Stores an Actor (Person or Group). Creates a new actor Node or update an
+     * existing one.
      * 
      * @param actor
@@ -296 +306 @@
      */
     public Actor storeActor(Actor actor) {
-        Node actorNode = getOrCreateActorNode(actor);
-        Actor storedActor = createActorFromNode(actorNode);
-        return storedActor;
-    }
-    
+        Node actorNode = getOrCreateActorNode(actor);
+        Transaction tx = graphDb.beginTx();
+        try {
+            // id
+            String id = actor.getId();
+            if (id != null) {
+                actorNode.setProperty("id", id);
+            }
+            // name
+            String name = actor.getName();
+            if (name != null) {
+                actorNode.setProperty("name", name);
+            }
+            // uri
+            String uri = actor.getUri();
+            if (uri != null) {
+                actorNode.setProperty("uri", uri);
+            }
+            tx.success();
+        } finally {
+            tx.finish();
+        }
+        Actor storedActor = createActorFromNode(actorNode);
+        return storedActor;
+    }
+
+    /**
+     * Deletes the given Actor.
+     * 
+     * @param actor
+     */
+    public void deleteActor(Actor actor) {
+        String uri = actor.getUriString();
+        Index<Node> idx;
+        if (actor.isGroup()) {
+            idx = getNodeIndex(NodeTypes.GROUP);
+        } else {
+            idx = getNodeIndex(NodeTypes.PERSON);
+        }
+        Node actorNode = idx.get("uri", uri).getSingle();
+        if (actorNode != null) {
+            // delete relations
+            Transaction tx = graphDb.beginTx();
+            try {
+                for (Relationship rel : actorNode.getRelationships()) {
+                    rel.delete();
+                }
+                if (!actorNode.hasRelationship()) {
+                    // this shouldn't happen
+                    deleteNode(actorNode);
+                } else {
+                    logger.error("deleteActor: unable to delete: Node still has relations.");
+                }
+                tx.success();
+            } finally {
+                tx.finish();
+            }
+        }
+    }
+
     /**
      * Returns the Annotation with the given id.
@@ -403 +468 @@
      */
     protected Actor createActorFromNode(Node actorNode) {
+        if (actorNode == null) return null;
         String id = (String) actorNode.getProperty("id", null);
         String uri = (String) actorNode.getProperty("uri", null);
@@ -414 +480 @@
         return null;
     }
-    
+
     public Tag createTagFromNode(Node tagNode) {
-        String name = (String) tagNode.getProperty("name", null);
-        String uri = (String) tagNode.getProperty("uri", null);
-        String id = (String) tagNode.getProperty("id", null);
-        
-        return new Tag(id, uri, name);
-                
-        }
-
+        if (tagNode == null) return null;
+        String name = (String) tagNode.getProperty("name", null);
+        String uri = (String) tagNode.getProperty("uri", null);
+        String id = (String) tagNode.getProperty("id", null);
+
+        return new Tag(id, uri, name);
+
+    }
 
     /**
@@ -539 +605 @@
                         for (String tag : newTags) {
                             // create new tag
-                            Node tagNode = getOrCreateTagNode(new Tag(null,null,tag));
+                            Node tagNode = getOrCreateTagNode(new Tag(null, null, tag));
                             getOrCreateRelation(annotNode, RelationTypes.HAS_TAG, tagNode);
                         }
@@ -561 +627 @@
      * @param id
      */
-    public void deleteById(String id) {
+    public void deleteAnnotationById(String id) {
         Node annotNode = getNodeIndex(NodeTypes.ANNOTATION).get("id", id).getSingle();
         if (annotNode != null) {
@@ -569 +635 @@
                 for (Relationship rel : annotNode.getRelationships()) {
                     // delete relation and the related node if it has no other
-                    // relations
+                    // relations and is not permanent
                     Node other = rel.getOtherNode(annotNode);
                     rel.delete();
-                    if (!other.hasRelationship()) {
+                    if (!(other.hasRelationship() || permanentNodeTypes.contains(other.getProperty("TYPE", null)))) {
                         deleteNode(other);
                     }
@@ -597 +663 @@
      * @return
      */
-    public List<Annotation> searchByUriUser(String targetUri, String userUri, String limit, String offset) {
+    public List<Annotation> searchAnnotationByUriUser(String targetUri, String userUri, String limit, String offset) {
         List<Annotation> annotations = new ArrayList<Annotation>();
         if (targetUri != null) {
@@ -720 +786 @@
         return person;
     }
-    
+
     protected Node getOrCreateActorNode(Actor actor) {
         // Person/Group is identified by URI or id
@@ -773 +839 @@
                 tag.setProperty("name", tagname);
                 idx.add(tag, "name", tagname);
-                
+
                 tag.setProperty("id", inTag.getId());
                 tag.setProperty("uri", inTag.getUri());
                 idx.add(tag, "uri", inTag.getUri());
-                
+
                 tx.success();
             } finally {
@@ -804 +870 @@
             if (!oldActorNode.equals(newActorNode)) {
                 // new admin is different
-                rel.delete();
+                Transaction tx = graphDb.beginTx();
+                try {
+                    rel.delete();
+                    tx.success();
+                } finally {
+                    tx.finish();
+                }
                 if (newActorNode != null) {
                     rel = getOrCreateRelation(annotNode, type, newActorNode);
@@ -881 +953 @@
     }
 
-        public List<Annotation> getAnnotationsByTag(String tagUri) {
-                
-                ArrayList<Annotation> ret = new  ArrayList<Annotation>();
-                Node tag = getTagNodeByUri(tagUri);
-                
-                
-                Iterable<Relationship> rels = tag.getRelationships(Direction.INCOMING,RelationTypes.HAS_TAG);
-                
-                for (Relationship rel:rels){
-                        Node node = rel.getStartNode();
-                        ret.add(createAnnotationFromNode(node));
-                        
-                }
-                return ret;
-        }
+    public List<Annotation> getAnnotationsByTag(String tagUri) {
+
+        ArrayList<Annotation> ret = new ArrayList<Annotation>();
+        Node tag = getTagNodeByUri(tagUri);
+
+        Iterable<Relationship> rels = tag.getRelationships(Direction.INCOMING, RelationTypes.HAS_TAG);
+
+        for (Relationship rel : rels) {
+            Node node = rel.getStartNode();
+            ret.add(createAnnotationFromNode(node));
+
+        }
+        return ret;
+    }
 
 }

src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

@@ -107 +107 @@
 
     /**
-     * Returns List of Groups. Key has to be indexed.
+     * Returns List of Groups.
+     * Key has to be indexed.
      * 
      * @param key
@@ -129 +130 @@
 
     /**
-     * Returns List of Tags. Key has to be indexed.
+     * Returns List of Annotations.
+     * Key has to be indexed.
+     * 
+     * @param key
+     * @param query
+     * @return
+     */
+    public List<Annotation> getAnnotations(String key, String query) {
+        ArrayList<Annotation> annotations = new ArrayList<Annotation>();
+        Index<Node> idx = getNodeIndex(NodeTypes.ANNOTATION);
+        if (key == null) {
+            key = "id";
+            query = "*";
+        }
+        IndexHits<Node> annotNodes = idx.query(key, query);
+        for (Node annotNode : annotNodes) {
+            Annotation annotation = createAnnotationFromNode(annotNode);
+            annotations.add(annotation);
+        }
+        return annotations;
+    }
+
+ 
+    
+    /**
+     * Returns List of Tags.
+     * Key has to be indexed.
      * 
      * @param key