Merge pull request #53 from DevFactory/release/general-code-quality-fix-1

Multiple code quality fix-1

Author: joshsh

common/src/main/java/net/fortytwo/sesametools/RdfListUtil.java

@@ -485,7 +485,7 @@ private void followPointerTrails(Resource nextHead,
 
         Resource nextPointer = nextHead;
 
-        boolean allDone = true;
+        boolean allDone;
 
         do {
             // start off thinking all are done, and then set to false as

constrained-sail/src/main/java/net/fortytwo/sesametools/constrained/ConstrainedSailConnection.java

@@ -308,10 +308,8 @@ public void removeStatements(final Resource subj, final IRI pred, final Value ob
                     super.removeStatements(subj, pred, obj, ctxArray);
                 }
             } else {
-                if (null != defaultWriteContext) {
-                    if (deletePermitted(defaultWriteContext)) {
-                        super.removeStatements(subj, pred, obj, defaultWriteContext);
-                    }
+                if (null != defaultWriteContext && deletePermitted(defaultWriteContext)) {
+                    super.removeStatements(subj, pred, obj, defaultWriteContext);
                 }
             }
 

linked-data-server/src/main/java/net/fortytwo/sesametools/ldserver/WebResource.java

@@ -189,10 +189,8 @@ private void addSeeAlsoStatements(final org.openrdf.model.Resource subject,
                 Statement st = iter.next();
                 org.openrdf.model.Resource context = st.getContext();
 
-                if (null != context) {
-                    if (context instanceof IRI && context.toString().startsWith(hostIdentifier)) {
-                        contexts.add((IRI) context);
-                    }
+                if (null != context && context instanceof IRI && context.toString().startsWith(hostIdentifier)) {
+                    contexts.add((IRI) context);
                 }
             }
         } finally {
@@ -205,10 +203,8 @@ private void addSeeAlsoStatements(final org.openrdf.model.Resource subject,
                 Statement st = iter.next();
                 org.openrdf.model.Resource context = st.getContext();
 
-                if (null != context) {
-                    if (context instanceof IRI && context.toString().startsWith(hostIdentifier)) {
-                        contexts.add((IRI) context);
-                    }
+                if (null != context && context instanceof IRI && context.toString().startsWith(hostIdentifier)) {
+                    contexts.add((IRI) context);
                 }
             }
         } finally {