Fix sonar warnings related to null array return, null variable derefe…

…rencing, indirectly invoked but otherwise unused variable, etc. Resolves: https://jira.duraspace.org/browse/FCREPO-1335 Addressed in this PR: - Unused private method 1 file: http://sonar.fcrepo.org/drilldown/issues/1?&rule=squid%3AUnusedPrivateMethod&rule_sev=MAJOR&severity=MAJOR - Singular Field 1 file: http://sonar.fcrepo.org/drilldown/issues/1?&rule=pmd%3ASingularField&rule_sev=MAJOR&severity=MAJOR - Correctness - Nullcheck of value previously dereferenced 1 file: http://sonar.fcrepo.org/drilldown/issues/1?&rule=findbugs%3ARCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE&rule_sev=MAJOR&severity=MAJOR - Empty arrays and collections should be returned instead of null 1 file: http://sonar.fcrepo.org/drilldown/issues/1?&rule=squid%3AS1168&rule_sev=MAJOR&severity=MAJOR Update PR
fcrepo · Feb 19, 2015 · 7cd7cc4 · 7cd7cc4
1 parent 9ab07de
commit 7cd7cc4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/fcrepo-http-commons/src/main/java/org/fcrepo/http/commons/domain/ldp/LdpPreferTag.java b/fcrepo-http-commons/src/main/java/org/fcrepo/http/commons/domain/ldp/LdpPreferTag.java
@@ -41,8 +41,6 @@ public class LdpPreferTag extends PreferTag {
 
     private final boolean references;
 
-    private final boolean preferMinimalContainer;
-
     private final boolean embed;
 
     private final boolean managedProperties;
@@ -64,7 +62,7 @@ public LdpPreferTag(final PreferTag preferTag) {
 
         final boolean minimal = preferTag.getValue().equals("minimal") || received.or("").equals("minimal");
 
-        preferMinimalContainer = includes.contains(LDP_NAMESPACE + "PreferMinimalContainer") || minimal;
+        final boolean preferMinimalContainer = includes.contains(LDP_NAMESPACE + "PreferMinimalContainer") || minimal;
 
         membership = (!preferMinimalContainer && !omits.contains(LDP_NAMESPACE + "PreferMembership")) ||
                 includes.contains(LDP_NAMESPACE + "PreferMembership");

diff --git a/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/rdf/impl/TypeRdfContext.java b/fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/rdf/impl/TypeRdfContext.java
@@ -64,12 +64,17 @@ private void concatRdfTypes() throws RepositoryException {
         final ImmutableList.Builder<NodeType> nodeTypesB = ImmutableList.<NodeType>builder();
 
         final NodeType primaryNodeType = resource().getNode().getPrimaryNodeType();
-        nodeTypesB.add(primaryNodeType);
 
-        if (primaryNodeType != null && primaryNodeType.getSupertypes() != null) {
+        if (primaryNodeType != null) {
+            nodeTypesB.add(primaryNodeType);
+        }
+
+        try {
             final Set<NodeType> primarySupertypes = ImmutableSet.<NodeType>builder()
                     .add(primaryNodeType.getSupertypes()).build();
             nodeTypesB.addAll(primarySupertypes);
+        } catch (NullPointerException e) {
+            // ignore
         }
 
         final NodeType[] mixinNodeTypesArr = resource().getNode().getMixinNodeTypes();

diff --git a/...pl/src/main/java/org/fcrepo/kernel/impl/utils/infinispan/CacheLoaderChunkInputStream.java b/...pl/src/main/java/org/fcrepo/kernel/impl/utils/infinispan/CacheLoaderChunkInputStream.java
@@ -39,7 +39,7 @@ public class CacheLoaderChunkInputStream extends InputStream {
     private int chunkNumber;
 
     /**
-     * Appease checkstyles..
+     * Constructor
      * @param blobCache
      * @param key
      * @param chunkSize