Code cleanup

* bump 1.4.0

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.formulasearchengine</groupId>
     <artifactId>dbs-sql-check</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.0</version>
     <dependencies>
         <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
                 <dependency>
@@ -48,6 +48,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <!--suppress MavenPackageUpdate -->
             <version>2.11.0</version>
         </dependency>
         <dependency>
@@ -58,11 +59,11 @@
     </dependencies>
     <name>DBS SQL check</name>
     <description>Checking of student solutions for SQL queries</description>
-    <url>http://www.formulasearchengine.com</url>
+    <url>https://www.formulasearchengine.com</url>
     <licenses>
         <license>
             <name>The Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
     <developers>

src/main/java/com/formulasearchengine/sql/check/dbs/BaseChecker.java

@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -21,7 +20,6 @@
 public abstract class BaseChecker {
     static final boolean SHOW_DEBUG = true;
     private PrintStream orgStream;
-    private PrintStream myPrintStream;
     protected Solution solution;
     protected Path testFolder;
     protected int points = 0;
@@ -144,14 +142,15 @@ public void go(String[] args) {
     }
 
     private void flushLog() {
-        System.out.println(output.toString());
+        System.out.println(output);
     }
 
     abstract public void run();
 
     private void redirectStdOut() {
         orgStream = System.out;
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PrintStream myPrintStream;
         try {
             myPrintStream = new PrintStream(baos, true, "UTF-8");
         } catch (UnsupportedEncodingException e) {

src/main/java/com/formulasearchengine/sql/check/dbs/QueryComp.java

@@ -61,8 +61,6 @@ private static int getHash(Boolean sorted, Statement statement, String solutionQ
         if (sorted) {
             actualHash = computeOrderAwareResultSetHash(actual);
         } else {
-            // its not entirely clear to me hwo good the has code ist. At least in the current list of test cases
-            // there are no hash collisions.
             actualHash = computeOrderTolerantResultHashes(actual).hashCode();
         }
         actual.close();
@@ -78,6 +76,7 @@ private static int computeOrderAwareResultSetHash(ResultSet result) throws SQLEx
         hash = computeRowHash(result) | rowCnt++;
 
         while (result.next()) {
+            //noinspection NumericOverflow
             hash ^= (1315423911 ^ ((1315423911 << 5) + (computeRowHash(result) | rowCnt++) + (1315423911 >> 2)));
         }
 
@@ -102,10 +101,12 @@ private static int computeRowHash(ResultSet result) throws SQLException {
         for (int i = 1; i <= result.getMetaData().getColumnCount(); i++) {
             if ("java.sql.Array".equals(result.getMetaData().getColumnClassName(i))) {
                 final ResultSet resultSet = result.getArray(i).getResultSet();
+                //noinspection NumericOverflow
                 hash ^= (1315423911 ^ ((1315423911 << 5) + computeOrderAwareResultSetHash(resultSet)+ (1315423911 >> 2)));
             } else {
                 final Object o = result.getObject(i);
                 if (o != null) { // ignore null values
+                    //noinspection NumericOverflow
                     hash ^= (1315423911 ^ ((1315423911 << 5) + o.hashCode() + (1315423911 >> 2)));
                 }
             }

src/main/java/com/formulasearchengine/sql/check/dbs/ReferenceQuery.java

@@ -78,7 +78,7 @@ public void generateJsonFiles(String folder) throws IOException, URISyntaxExcept
                     e.printStackTrace();
                 }
             } else {
-                System.out.println("Ignoring " + f.getFileName().toString());
+                System.out.println("Ignoring " + f.getFileName());
             }
         });
     }

src/main/java/com/formulasearchengine/sql/check/dbs/SemiManualChecker.java

@@ -47,7 +47,7 @@ public void writeOutput() {
 
     }
 
-    public void compareWithResource(InputStream refStream, Double maxPoints, Class clazz) {
+    public void compareWithResource(InputStream refStream, Double maxPoints, @SuppressWarnings("rawtypes") Class clazz) {
         compareWithResource(refStream, maxPoints, clazz, false);
     }
 

src/main/java/com/formulasearchengine/sql/check/dbs/csv/FunctionalDependency.java

@@ -4,6 +4,7 @@
 
 import java.util.SortedSet;
 
+@SuppressWarnings({"unused", "MismatchedQueryAndUpdateOfCollection"})
 public class FunctionalDependency{
     @CsvBindAndSplitByName(required = true, elementType = Integer.class)
     private SortedSet<Integer> determinant;

src/main/java/com/formulasearchengine/sql/check/dbs/pojos/Solution.java

@@ -21,7 +21,6 @@ public class Solution {
      * // 4: str(env.user().last_name),
      * // 5: str(env.solution().id)]
      *
-     * @param args
      */
     public Solution(String[] args) {
 

src/test/java/com/facebook/presto/sql/SqlFormatterTest.java

@@ -71,7 +71,6 @@ public void basicSqlII() throws Exception {
         final Node root = query.getChildren().get(0);
         final Query noLimitQuery;
         if (query.getLocation().isPresent()) {
-            //noinspection OptionalGetWithoutIsPresent
             noLimitQuery = new Query(query.getLocation().get(), query.getWith(), query.getQueryBody(), query.getOrderBy(),query.getOffset(), Optional.empty());
         } else {
             noLimitQuery = new Query(query.getWith(), query.getQueryBody(), query.getOrderBy(), query.getOffset(), Optional.empty());

src/test/java/com/formulasearchengine/sql/check/pcstore/Seq1Test.java

@@ -3,7 +3,6 @@
 import com.formulasearchengine.sql.check.dbs.ReferenceQuery;
 import com.formulasearchengine.sql.check.dbs.pcstore.Seq1;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.fail;