simplify node existence checks in AbstractService and delete commente…

…d-out code
fcrepo · Oct 30, 2014 · 17a767c · 17a767c
1 parent e9126bc
commit 17a767c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/http/commons/AbstractResource.java b/fcrepo-http-commons/src/main/java/org/fcrepo/http/commons/AbstractResource.java
@@ -84,12 +84,6 @@ public abstract class AbstractResource {
     @Autowired
     protected VersionService versionService;
 
-    /**
-     * The fcrepo repository service
-     */
-    //@Autowired
-    //protected RepositoryService repositoryService;
-
     @Inject
     @Optional
     protected EventBus eventBus;

diff --git a/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/services/AbstractService.java b/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/services/AbstractService.java
@@ -57,10 +57,7 @@ protected Node findOrCreateNode(final Session session,
 
     protected Node findNode(final Session session, final String path) {
         try {
-            // Remove leading and trailing slashes ...
-            final String relPath = path.replaceAll("^/+", "").replaceAll("/+$", "");
-            final Node root = session.getRootNode();
-            return root.getNode(relPath);
+            return session.getNode(path);
         } catch (final RepositoryException e) {
             throw new RepositoryRuntimeException(e);
         }
@@ -84,10 +81,7 @@ private void tagHierarchyWithPairtreeMixin(final Node baseNode,
      */
     public boolean exists(final Session session, final String path) {
         try {
-            // Remove leading and trailing slashes ...
-            final String relPath = path.replaceAll("^/+", "").replaceAll("/+$", "");
-            final Node root = session.getRootNode();
-            return root.hasNode(relPath);
+            return session.nodeExists(path);
         } catch (final RepositoryException e) {
             throw new RepositoryRuntimeException(e);
         }