Revize c20f287b

re #8113 re #7885 all functions implemented, contingency table generation improved; re #8154 value filtering added; no comments

src/main/java/vldc/aswi/database/DatabaseInterface.java

@@ -97 +97 @@
     public Map<String, TableColumn> executeQueryAndReturnTableColumns(String sqlQuery) {
         return jdbcTemplate.query(
                 sqlQuery,
-                new ResultSetExtractor<Map<String, TableColumn>>() {
-                    @Override
-                    public Map<String, TableColumn> extractData(ResultSet resultSet) throws SQLException, DataAccessException {
-                        List<TableColumn> tableColumnsList = new ArrayList<>();
+                resultSet -> {
+                    List<TableColumn> tableColumnsList = new ArrayList<>();
 
-                        ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
-                        int columnCount = resultSetMetaData.getColumnCount();
+                    ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+                    int columnCount = resultSetMetaData.getColumnCount();
 
-                        // The column count starts from 1.
-                        for (int i = 1; i <= columnCount; i++ ) {
-                            String columnName = resultSetMetaData.getColumnName(i);
-                            tableColumnsList.add(new TableColumn(columnName));
-                        }
+                    // The column count starts from 1.
+                    for (int i = 1; i <= columnCount; i++ ) {
+                        String columnName = resultSetMetaData.getColumnName(i);
+                        tableColumnsList.add(new TableColumn(columnName));
+                    }
 
-                        // Add values from row to every column.
-                        while(resultSet.next()) {
-                            for (int i = 1; i <= columnCount; i++) {
-                                tableColumnsList.get(i - 1).addValue(resultSet.getString(i));
-                            }
+                    // Add values from row to every column.
+                    while(resultSet.next()) {
+                        for (int i = 1; i <= columnCount; i++) {
+                            tableColumnsList.get(i - 1).addValue(resultSet.getString(i));
                         }
+                    }
 
-                        Map<String, TableColumn> tableColumnMap = new HashMap<>();
-
-                        // Create map, where key is tablecolumn name.
-                        for (TableColumn column : tableColumnsList) {
-                            tableColumnMap.put(column.getName(), column);
-                        }
+                    Map<String, TableColumn> tableColumnMap = new HashMap<>();
 
-                        return tableColumnMap;
+                    // Create map, where key is tablecolumn name.
+                    for (TableColumn column : tableColumnsList) {
+                        tableColumnMap.put(column.getName(), column);
                     }
+
+                    return tableColumnMap;
                 }
         );
     }