cleanup

h2/src/main/org/h2/util/ColumnNamer.java

@@ -13,7 +13,7 @@ public class ColumnNamer {
 
     private ColumnNamerConfiguration configuration;
     private Session session;
-    private Set<String> existingColumnNames = new HashSet<String>();
+    private final Set<String> existingColumnNames = new HashSet<>();
 
     public ColumnNamer(Session session) {
         this.session = session;
@@ -31,9 +31,8 @@ public class ColumnNamer {
     }
     /**
      * Create a standardized column name that isn't null and doesn't have a CR/LF in it.
-     * @param columnExp the column expression
+     * @param expr the column expression
      * @param indexOfColumn index of column in below array
-     * @return
      */
     public String getColumnName(Expression expr, int indexOfColumn) {
         return getColumnName(expr,indexOfColumn,(String) null);

h2/src/test/org/h2/test/scripts/TestScript.java

@@ -11,8 +11,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.PrintStream;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;