Fixing squid:S1854, squid:S1066

Faisal Hameed · Faisal Hameed · commit 50289b945880 · 2016-05-31T21:56:00.000+05:00
diff --git a/common/src/main/java/net/fortytwo/sesametools/RdfListUtil.java b/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
diff --git a/constrained-sail/src/main/java/net/fortytwo/sesametools/constrained/ConstrainedSailConnection.java b/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);
                 }
             }
 
diff --git a/linked-data-server/src/main/java/net/fortytwo/sesametools/ldserver/WebResource.java b/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 {

Original file line number	Diff line number	Diff line change
`@@ -308,10 +308,8 @@ public void removeStatements(final Resource subj, final IRI pred, final Value ob`
`308`	`308`	`super.removeStatements(subj, pred, obj, ctxArray);`
`309`	`309`	`}`
`310`	`310`	`} else {`
`311`		`- if (null != defaultWriteContext) {`
`312`		`- if (deletePermitted(defaultWriteContext)) {`
`313`		`- super.removeStatements(subj, pred, obj, defaultWriteContext);`
`314`		`- }`
	`311`	`+ if (null != defaultWriteContext && deletePermitted(defaultWriteContext)) {`
	`312`	`+ super.removeStatements(subj, pred, obj, defaultWriteContext);`
`315`	`313`	`}`
`316`	`314`	`}`
`317`	`315`
Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,8 @@ private void addSeeAlsoStatements(final org.openrdf.model.Resource subject,`
`189`	`189`	`Statement st = iter.next();`
`190`	`190`	`org.openrdf.model.Resource context = st.getContext();`
`191`	`191`
`192`		`- if (null != context) {`
`193`		`- if (context instanceof IRI && context.toString().startsWith(hostIdentifier)) {`
`194`		`- contexts.add((IRI) context);`
`195`		`- }`
	`192`	`+ if (null != context && context instanceof IRI && context.toString().startsWith(hostIdentifier)) {`
	`193`	`+ contexts.add((IRI) context);`
`196`	`194`	`}`
`197`	`195`	`}`
`198`	`196`	`} finally {`
`@@ -205,10 +203,8 @@ private void addSeeAlsoStatements(final org.openrdf.model.Resource subject,`
`205`	`203`	`Statement st = iter.next();`
`206`	`204`	`org.openrdf.model.Resource context = st.getContext();`
`207`	`205`
`208`		`- if (null != context) {`
`209`		`- if (context instanceof IRI && context.toString().startsWith(hostIdentifier)) {`
`210`		`- contexts.add((IRI) context);`
`211`		`- }`
	`206`	`+ if (null != context && context instanceof IRI && context.toString().startsWith(hostIdentifier)) {`
	`207`	`+ contexts.add((IRI) context);`
`212`	`208`	`}`
`213`	`209`	`}`
`214`	`210`	`} finally {`