Fix sonar warnings

Resolves: https://jira.duraspace.org/browse/FCREPO-1336
fcrepo · Feb 19, 2015 · 58874be · 58874be
1 parent 7cd7cc4
commit 58874be
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 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
@@ -352,7 +352,7 @@ public Response updateSparql(@ContentLocation final InputStream requestBodyStrea
             return noContent().build();
         } catch ( final RuntimeException ex ) {
             final Throwable cause = ex.getCause();
-            if ( cause != null && cause instanceof PathNotFoundException) {
+            if (cause instanceof PathNotFoundException) {
                 // the sparql update referred to a repository resource that doesn't exist
                 throw new BadRequestException(cause.getMessage());
             }

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
@@ -129,17 +129,17 @@ protected FedoraResource doForward(final Resource resource) {
                     + " that doesn't match the URI template");
         } catch (final RepositoryException e) {
             validatePath(session, path);
-            try {
-                if ( e instanceof PathNotFoundException ) {
+
+            if ( e instanceof PathNotFoundException ) {
+                try {
                     final Node preexistingNode = getClosestExistingAncestor(session, path);
                     if (TombstoneImpl.hasMixin(preexistingNode)) {
                         throw new TombstoneException(new TombstoneImpl(preexistingNode));
                     }
+                } catch (RepositoryException inner) {
+                    LOGGER.debug("Error checking for parent tombstones", inner);
                 }
-            } catch (final RepositoryException inner) {
-                LOGGER.debug("Error checking for parent tombstones", inner);
             }
-
             throw new RepositoryRuntimeException(e);
         }
     }

diff --git a/...l/src/main/java/org/fcrepo/kernel/impl/rdf/impl/mappings/PropertyDefinitionToTriples.java b/...l/src/main/java/org/fcrepo/kernel/impl/rdf/impl/mappings/PropertyDefinitionToTriples.java
@@ -113,7 +113,7 @@ public Iterator<Triple> apply(final PropertyDefinition input) {
 
             final Node rangeForJcrType = getRangeForJcrType(requiredType);
 
-            if (rangeForJcrType != UNMAPPED_TYPE) {
+            if (!rangeForJcrType.equals(UNMAPPED_TYPE)) {
                 LOGGER.trace("Adding RDFS:range for property: {} with required type: {} as: {}",
                     input.getName(), nameFromValue(requiredType), rangeForJcrType.getURI());
                 final Triple propertyTriple =

diff --git a/fcrepo-serialization/src/main/java/org/fcrepo/serialization/JcrXmlSerializer.java b/fcrepo-serialization/src/main/java/org/fcrepo/serialization/JcrXmlSerializer.java
@@ -170,6 +170,7 @@ private static final class TempFileInputStream extends FileInputStream {
          */
         public TempFileInputStream(final File f) throws FileNotFoundException {
             super(f);
+            this.f = f;
         }
 
         @Override