Minor code cleanup, added more JavaDocs

fcrepo · Apr 20, 2013 · 1cd9c53 · 1cd9c53
1 parent 2973753
commit 1cd9c53
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 26 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/Datastream.java b/fcrepo-kernel/src/main/java/org/fcrepo/Datastream.java
@@ -30,7 +30,6 @@
 import javax.jcr.version.VersionException;
 
 import org.fcrepo.exception.InvalidChecksumException;
-import org.fcrepo.services.LowLevelStorageService;
 import org.fcrepo.utils.ContentDigest;
 import org.fcrepo.utils.FedoraJcrTypes;
 import org.modeshape.jcr.api.Binary;

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/FedoraObject.java b/fcrepo-kernel/src/main/java/org/fcrepo/FedoraObject.java
@@ -62,13 +62,13 @@ public FedoraObject(final Session session, final String path)
 
         try {
             node = findOrCreateNode(session, path, NT_FOLDER);
-            if(node.isNew()) {
+            if (node.isNew()) {
                 node.addMixin(FEDORA_OBJECT);
                 node.addMixin(FEDORA_OWNED);
                 node.setProperty(FEDORA_OWNERID, session.getUserID());
                 node.setProperty(JCR_LASTMODIFIED, Calendar.getInstance());
-                node.setProperty(DC_IDENTIFIER, new String[] {node.getIdentifier(),
-                        node.getName()});
+                node.setProperty(DC_IDENTIFIER, new String[] {
+                        node.getIdentifier(), node.getName()});
             }
         } finally {
             context.stop();

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/identifiers/BasePidMinter.java b/fcrepo-kernel/src/main/java/org/fcrepo/identifiers/BasePidMinter.java
@@ -8,7 +8,6 @@
  */
 public abstract class BasePidMinter implements PidMinter {
 
-
     @Override
     public Function<Object, String> makePid() {
         return new Function<Object, String>() {

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/identifiers/PidMinter.java b/fcrepo-kernel/src/main/java/org/fcrepo/identifiers/PidMinter.java
@@ -5,7 +5,8 @@
 
 /**
  * Defines the behavior of a component that can accept responsibility
- * for the creation of Fedora PIDs.
+ * for the creation of Fedora PIDs. Do not implement this interface directly.
+ * Subclass {@link BasePidMinter} instead.
  * 
  * @author ajs6f
  *

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/observer/SimpleObserver.java b/fcrepo-kernel/src/main/java/org/fcrepo/observer/SimpleObserver.java
@@ -17,10 +17,9 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.observation.Event;
-import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 
-import org.fcrepo.utils.FedoraEventIterator;
+import org.fcrepo.utils.EventIterator;
 import org.modeshape.jcr.api.Repository;
 import org.slf4j.Logger;
 
@@ -72,10 +71,9 @@ public void buildListener() throws RepositoryException {
      * @param events
      */
     @Override
-    public void onEvent(final EventIterator events) {
+    public void onEvent(final javax.jcr.observation.EventIterator events) {
 
-        for (final Event e : filter(new FedoraEventIterator(events),
-                eventFilter)) {
+        for (final Event e : filter(new EventIterator(events), eventFilter)) {
 
             eventCounter.inc();
 

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/RepositoryService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/RepositoryService.java
@@ -11,9 +11,6 @@
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.jcr.NamespaceRegistry;
-import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;

diff --git a/...org/fcrepo/utils/FedoraEventIterator.java → .../java/org/fcrepo/utils/EventIterator.java b/...org/fcrepo/utils/FedoraEventIterator.java → .../java/org/fcrepo/utils/EventIterator.java
@@ -4,13 +4,12 @@
 import java.util.Iterator;
 
 import javax.jcr.observation.Event;
-import javax.jcr.observation.EventIterator;
 
-public class FedoraEventIterator implements Iterator<Event>, Iterable<Event> {
+public class EventIterator implements Iterator<Event>, Iterable<Event> {
 
-    EventIterator i;
+    javax.jcr.observation.EventIterator i;
 
-    public FedoraEventIterator(final EventIterator i) {
+    public EventIterator(final javax.jcr.observation.EventIterator i) {
         this.i = i;
     }
 

diff --git a/.../org/fcrepo/utils/FedoraNodeIterator.java → ...n/java/org/fcrepo/utils/NodeIterator.java b/.../org/fcrepo/utils/FedoraNodeIterator.java → ...n/java/org/fcrepo/utils/NodeIterator.java
@@ -4,13 +4,12 @@
 import java.util.Iterator;
 
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
 
-public class FedoraNodeIterator implements Iterator<Node> {
+public class NodeIterator implements Iterator<Node> {
 
-    NodeIterator i;
+    javax.jcr.NodeIterator i;
 
-    public FedoraNodeIterator(final NodeIterator i) {
+    public NodeIterator(final javax.jcr.NodeIterator i) {
         this.i = i;
     }
 

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/ObjectServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/ObjectServiceTest.java
@@ -10,7 +10,6 @@
 import static org.powermock.api.mockito.PowerMockito.verifyNew;
 import static org.powermock.api.mockito.PowerMockito.whenNew;
 
-import java.security.SecureRandom;
 import java.util.Set;
 
 import javax.jcr.Node;
@@ -123,7 +122,7 @@ public void testDeleteOBject() throws RepositoryException {
         final Session mockSession = mock(Session.class);
         final Node mockRootNode = mock(Node.class);
         final Node mockObjectsNode = mock(Node.class);
-        final Property mockProp = mock(Property.class);
+        mock(Property.class);
         final Node mockObjNode = mock(Node.class);
         when(mockSession.getRootNode()).thenReturn(mockRootNode);
         when(mockRootNode.getNode("objects")).thenReturn(mockObjectsNode);

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/RepositoryServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/RepositoryServiceTest.java
@@ -16,7 +16,6 @@
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
-import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -30,7 +29,6 @@
 import javax.jcr.query.Row;
 import javax.jcr.query.RowIterator;
 
-import org.fcrepo.TestHelpers;
 import org.fcrepo.utils.FedoraJcrTypes;
 import org.junit.After;
 import org.junit.Before;