Remove nested try-catch blocks

Resolves: https://jira.duraspace.org/browse/FCREPO-1330 http://sonar.fcrepo.org/drilldown/issues/1?&rule=squid%3AS1141&rule_sev=MAJOR&severity=MAJOR#
fcrepo · Feb 19, 2015 · 3fa9652 · 3fa9652
1 parent 561036d
commit 3fa9652
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 58 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraLdp.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraLdp.java
@@ -345,23 +345,20 @@ public Response updateSparql(@ContentLocation final InputStream requestBodyStrea
             LOGGER.info("PATCH for '{}'", externalPath);
             patchResourcewithSparql(resource(), requestBody, resourceTriples);
 
-            try {
-                session.save();
-            } catch (final RepositoryException e) {
-                throw new RepositoryRuntimeException(e);
-            }
+            session.save();
 
             addCacheControlHeaders(servletResponse, resource(), session);
 
             return noContent().build();
-
         } catch ( final RuntimeException ex ) {
             final Throwable cause = ex.getCause();
             if ( cause != null && cause instanceof PathNotFoundException) {
                 // the sparql update referred to a repository resource that doesn't exist
                 throw new BadRequestException(cause.getMessage());
             }
             throw ex;
+        }  catch (final RepositoryException e) {
+            throw new RepositoryRuntimeException(e);
         }
     }
 

diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/http/commons/api/rdf/HttpResourceConverter.java b/fcrepo-http-commons/src/main/java/org/fcrepo/http/commons/api/rdf/HttpResourceConverter.java
@@ -264,33 +264,17 @@ private Node getNode(final String path) throws RepositoryException {
      */
     private Node getFrozenNodeByLabel(final String baseResourcePath, final String label) {
         try {
-            try {
-                final Node frozenNode = session.getNodeByIdentifier(label);
+            final Node n = getNode(baseResourcePath, label);
 
-            /*
-             * We found a node whose identifier is the "label" for the version.  Now
-             * we must do due dilligence to make sure it's a frozen node representing
-             * a version of the subject node.
-             */
-                final Property p = frozenNode.getProperty("jcr:frozenUuid");
-                if (p != null) {
-                    final Node subjectNode = session.getNode(baseResourcePath);
-                    if (p.getString().equals(subjectNode.getIdentifier())) {
-                        return frozenNode;
-                    }
-                }
-            /*
+            if (n != null) {
+                return n;
+            }
+
+             /*
              * Though a node with an id of the label was found, it wasn't the
              * node we were looking for, so fall through and look for a labeled
              * node.
              */
-            } catch (final ItemNotFoundException ex) {
-            /*
-             * the label wasn't a uuid of a frozen node but
-             * instead possibly a version label.
-             */
-            }
-
             final VersionHistory hist =
                     session.getWorkspace().getVersionManager().getVersionHistory(baseResourcePath);
             if (hist.hasVersionLabel(label)) {
@@ -305,6 +289,32 @@ private Node getFrozenNodeByLabel(final String baseResourcePath, final String la
         }
     }
 
+    private Node getNode(final String baseResourcePath, final String label) throws RepositoryException {
+        try {
+            final Node frozenNode = session.getNodeByIdentifier(label);
+
+            /*
+             * We found a node whose identifier is the "label" for the version.  Now
+             * we must do due diligence to make sure it's a frozen node representing
+             * a version of the subject node.
+             */
+            final Property p = frozenNode.getProperty("jcr:frozenUuid");
+            if (p != null) {
+                final Node subjectNode = session.getNode(baseResourcePath);
+                if (p.getString().equals(subjectNode.getIdentifier())) {
+                    return frozenNode;
+                }
+            }
+
+        } catch (final ItemNotFoundException ex) {
+            /*
+             * the label wasn't a uuid of a frozen node but
+             * instead possibly a version label.
+             */
+        }
+        return null;
+    }
+
     private static String getPath(final FedoraResource resource) {
         if (isFrozenNode.apply(resource)) {
             try {

diff --git a/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/FedoraResourceImpl.java b/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/FedoraResourceImpl.java
@@ -567,33 +567,11 @@ public FedoraResource getUnfrozenResource() {
     public Node getNodeVersion(final String label) {
         try {
             final Session session = getSession();
-            try {
-
-                final Node frozenNode = session.getNodeByIdentifier(label);
 
-                final String baseUUID = getNode().getIdentifier();
+            final Node n = getFrozenNode(label);
 
-            /*
-             * We found a node whose identifier is the "label" for the version.  Now
-             * we must do due dilligence to make sure it's a frozen node representing
-             * a version of the subject node.
-             */
-                final Property p = frozenNode.getProperty("jcr:frozenUuid");
-                if (p != null) {
-                    if (p.getString().equals(baseUUID)) {
-                        return frozenNode;
-                    }
-                }
-            /*
-             * Though a node with an id of the label was found, it wasn't the
-             * node we were looking for, so fall through and look for a labeled
-             * node.
-             */
-            } catch (final ItemNotFoundException ex) {
-            /*
-             * the label wasn't a uuid of a frozen node but
-             * instead possibly a version label.
-             */
+            if (n != null) {
+                return n;
             }
 
             if (isVersioned()) {
@@ -614,6 +592,39 @@ public Node getNodeVersion(final String label) {
 
     }
 
+    private Node getFrozenNode(final String label) throws RepositoryException {
+        try {
+            final Session session = getSession();
+
+            final Node frozenNode = session.getNodeByIdentifier(label);
+
+            final String baseUUID = getNode().getIdentifier();
+
+            /*
+             * We found a node whose identifier is the "label" for the version.  Now
+             * we must do due dilligence to make sure it's a frozen node representing
+             * a version of the subject node.
+             */
+            final Property p = frozenNode.getProperty("jcr:frozenUuid");
+            if (p != null) {
+                if (p.getString().equals(baseUUID)) {
+                    return frozenNode;
+                }
+            }
+            /*
+             * Though a node with an id of the label was found, it wasn't the
+             * node we were looking for, so fall through and look for a labeled
+             * node.
+             */
+        } catch (final ItemNotFoundException ex) {
+            /*
+             * the label wasn't a uuid of a frozen node but
+             * instead possibly a version label.
+             */
+        }
+        return null;
+    }
+
     @Override
     public boolean equals(final Object object) {
         if (object instanceof FedoraResourceImpl) {

diff --git a/...-kernel-impl/src/main/java/org/fcrepo/kernel/impl/utils/JcrPropertyStatementListener.java b/...-kernel-impl/src/main/java/org/fcrepo/kernel/impl/utils/JcrPropertyStatementListener.java
@@ -144,11 +144,7 @@ public void removedStatement(final Statement s) {
 
             if (property.equals(RDF.type) && objectNode.isResource()) {
                 final Resource mixinResource = objectNode.asResource();
-                try {
-                    jcrRdfTools.removeMixin(resource, mixinResource, s.getModel().getNsPrefixMap());
-                } catch (final RepositoryException e) {
-                    // TODO
-                }
+                jcrRdfTools.removeMixin(resource, mixinResource, s.getModel().getNsPrefixMap());
                 return;
             }