Slight factoring to use already-present utility methods

fcrepo · Feb 19, 2013 · a734325 · a734325
1 parent 87ccd5a
commit a734325
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/fcrepo-jms/src/main/java/org/fcrepo/messaging/legacy/LegacyMethod.java b/fcrepo-jms/src/main/java/org/fcrepo/messaging/legacy/LegacyMethod.java
@@ -20,7 +20,6 @@
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.NodeType;
 import javax.jcr.observation.Event;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -29,6 +28,7 @@
 import org.apache.abdera.model.Category;
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.parser.Parser;
+import org.fcrepo.utils.FedoraTypesUtils;
 
 public class LegacyMethod {
 
@@ -73,9 +73,9 @@ public class LegacyMethod {
 
 	public LegacyMethod(Event jcrEvent, Node resource) throws RepositoryException {
 		this(newEntry());
-		NodeType [] nodeTypes = resource.getMixinNodeTypes();
-		boolean isDatastreamNode = testNodeTypes(nodeTypes, "fedora:datastream");
-		boolean isObjectNode = testNodeTypes(nodeTypes, "fedora:object") && !isDatastreamNode;
+
+		boolean isDatastreamNode = FedoraTypesUtils.isFedoraDatastream.apply(resource);
+		boolean isObjectNode = FedoraTypesUtils.isFedoraObject.apply(resource) && !isDatastreamNode;
 
 		if (isDatastreamNode || isObjectNode) {
 			setMethodName(mapMethodName(jcrEvent, isObjectNode));
@@ -192,15 +192,6 @@ private static String getEntryContent(String methodName, String returnVal) {
 		return objectToString(returnVal, datatype);
 	}
 
-	private static boolean testNodeTypes(NodeType [] nodeTypes, String type) {
-		boolean result = false;
-		for (NodeType nt: nodeTypes) {
-			result |= type.equals(nt.getName());
-			if (result) break;
-		}
-		return result;
-	}
-
 	private static String objectToString(String obj, String xsdType) {
 		if (obj == null) {
 			return "null";