finishing up some replacement of type-name literals with constants

fcrepo · May 17, 2013 · 499ba18 · 499ba18
1 parent 11f5cc6
commit 499ba18
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/ServiceHelpers.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/ServiceHelpers.java
@@ -3,6 +3,7 @@
 
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
 import static org.modeshape.jcr.api.JcrConstants.JCR_DATA;
+import static org.modeshape.jcr.api.JcrConstants.NT_FILE;
 
 import java.net.URI;
 import java.security.MessageDigest;
@@ -58,7 +59,7 @@ private static Long getObjectDSSize(final Node obj)
         for (final NodeIterator i = obj.getNodes(); i.hasNext();) {
             final Node node = i.nextNode();
 
-            if (node.isNodeType("nt:file")) {
+            if (node.isNodeType(NT_FILE)) {
                 size += getDatastreamSize(node);
 		    }
         }

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/observer/SimpleObserverIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/observer/SimpleObserverIT.java
@@ -10,6 +10,7 @@
 
 import org.fcrepo.integration.AbstractIT;
 import org.fcrepo.observer.FedoraEvent;
+import org.fcrepo.utils.FedoraJcrTypes;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -33,8 +34,8 @@ public class SimpleObserverIT extends AbstractIT {
     public void TestEventBusPublishing() throws RepositoryException {
 
         final Session se = repository.login();
-        se.getRootNode().addNode("/object1").addMixin("fedora:object");
-        se.getRootNode().addNode("/object2").addMixin("fedora:object");
+        se.getRootNode().addNode("/object1").addMixin(FedoraJcrTypes.FEDORA_OBJECT);
+        se.getRootNode().addNode("/object2").addMixin(FedoraJcrTypes.FEDORA_OBJECT);
         se.save();
         se.logout();