Fixing squid:LowerCaseLongSuffixCheck, squid:S2131, squid:UselessParenthesesCheck

Author: Faisal Hameed

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

@@ -198,7 +198,7 @@ public void close() throws SailException {
         }
 
         public boolean hasNext() throws SailException {
-            return (null != nextContext);
+            return null != nextContext;
         }
 
         public Resource next() throws SailException {

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

@@ -228,15 +228,15 @@ public CloseableIteration<? extends Resource, SailException> getContextIDs()
 
     @Override
     public String getNamespace(String prefix) throws SailException {
-        return (namespacesAreReadable)
+        return namespacesAreReadable
                 ? super.getNamespace(prefix)
                 : null;
     }
 
     @Override
     public CloseableIteration<? extends Namespace, SailException> getNamespaces()
             throws SailException {
-        return (namespacesAreReadable)
+        return namespacesAreReadable
                 ? super.getNamespaces()
                 : new EmptyCloseableIteration<Namespace, SailException>();
     }
@@ -338,7 +338,7 @@ public void setNamespace(final String prefix, final String name) throws SailExce
     @Override
     public long size(final Resource... contexts) throws SailException {
         if (0 == contexts.length) {
-            return (ALLOW_WILDCARD_SIZE)
+            return ALLOW_WILDCARD_SIZE
                     ? super.size()
                     : 0;
         } else {

replay-sail/src/main/java/net/fortytwo/sesametools/replay/RecorderSailConnection.java

@@ -39,7 +39,7 @@
  * @author Joshua Shinavier (http://fortytwo.net).
  */
 public class RecorderSailConnection extends AbstractSailConnection {
-    private final String id = "" + new Random().nextInt(0xFFFF);
+    private final String id = Integer.toString(new Random().nextInt(0xFFFF));
     private final Handler<SailConnectionCall, SailException> queryHandler;
     private final SailConnection baseSailConnection;
     private final ReplayConfiguration config;

sesamize/src/main/java/net/fortytwo/sesametools/sesamize/Sesamize.java

@@ -205,7 +205,7 @@ private static void doRandom(final SesamizeArgs args) throws Exception {
 
         RDFWriter writer = Rio.createWriter(outputFormat, os);
         writer.startRDF();
-        for (long l = 0l; l < totalTriples; l++) {
+        for (long l = 0L; l < totalTriples; l++) {
             Statement st = rvf.randomStatement();
             writer.handleStatement(st);
         }

uri-translator/src/main/java/net/fortytwo/sesametools/URITranslator.java

@@ -182,7 +182,7 @@ public static void doTranslation(Repository repository, final String inputUriPre
                         objectTemplateWhereBuilder.append("bind(iri(concat(\"");
                         objectTemplateWhereBuilder.append(outputUriPrefix);
                         objectTemplateWhereBuilder.append("\", encode_for_uri(substr(str(?objectUri), ");
-                        objectTemplateWhereBuilder.append((inputUriPrefix.length() + 1));
+                        objectTemplateWhereBuilder.append(inputUriPrefix.length() + 1);
                         objectTemplateWhereBuilder.append(")))) AS ?normalisedObjectUri) ");
                     } else {
                         // the following should be more efficient on large queries for exact matching,
@@ -242,7 +242,7 @@ public static void doTranslation(Repository repository, final String inputUriPre
                         subjectTemplateWhereBuilder.append("bind(iri(concat(\"");
                         subjectTemplateWhereBuilder.append(outputUriPrefix);
                         subjectTemplateWhereBuilder.append("\", encode_for_uri(substr(str(?subjectUri), ");
-                        subjectTemplateWhereBuilder.append((inputUriPrefix.length() + 1));
+                        subjectTemplateWhereBuilder.append(inputUriPrefix.length() + 1);
                         subjectTemplateWhereBuilder.append(")))) AS ?normalisedSubjectUri) ");
                     } else {
                         // the following should be more efficient on large queries for exact matching,
@@ -300,7 +300,7 @@ public static void doTranslation(Repository repository, final String inputUriPre
                         predicateTemplateWhereBuilder.append("bind(iri(concat(\"");
                         predicateTemplateWhereBuilder.append(outputUriPrefix);
                         predicateTemplateWhereBuilder.append("\", encode_for_uri(substr(str(?predicateUri), ");
-                        predicateTemplateWhereBuilder.append((inputUriPrefix.length() + 1));
+                        predicateTemplateWhereBuilder.append(inputUriPrefix.length() + 1);
                         predicateTemplateWhereBuilder.append(")))) AS ?normalisedPredicateUri) ");
                     } else {
                         // the following should be more efficient on large queries for exact matching,