Merge pull request #43 from EMResearch/refactor-db

refactor handling of DB

Author: arcuri82

jdk_11_gradle/em/embedded/graphql/patio-api/src/main/java/em/embedded/patio/EmbeddedEvoMasterController.java

@@ -94,13 +94,9 @@ public String startSut() {
             throw new RuntimeException(e);
         }
 
-        dbSpecification = Arrays.asList(new DbSpecification(){{
-            dbType = DatabaseType.POSTGRES;
-            schemaNames = Arrays.asList("public");
-//            initSqlOnResourcePath = "/initDb.sql";
-            connection = sqlConnection;
-            employSmartDbClean = false;
-        }});
+        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
+                .withSchemas("public").withDisabledSmartClean());
+        //            initSqlOnResourcePath = "/initDb.sql";
 
         return "http://localhost:" + getSutPort();
     }
@@ -163,14 +159,9 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return List.of(dto);
     }
 
-    public Connection getConnection() {
-        return sqlConnection;
-    }
 
-    @Override
-    public String getDatabaseDriverName() {
-        return "org.postgresql.Driver";
-    }
+
+
 
     public List<DbSpecification> getDbSpecifications() {
         return dbSpecification;

jdk_11_gradle/em/external/graphql/patio-api/src/main/java/em/external/patio/ExternalEvoMasterController.java

@@ -151,15 +151,11 @@ public void postStart() {
         closeDataBaseConnection();
 
         try {
-            Class.forName(getDatabaseDriverName());
             sqlConnection = DriverManager.getConnection(dbUrl(), "patio", "patio");
-            dbSpecification = Arrays.asList(new DbSpecification(){{
-                dbType = DatabaseType.POSTGRES;
-                schemaNames = Arrays.asList("public");
-//                initSqlOnResourcePath = "/initDb.sql";
-                connection = sqlConnection;
-                employSmartDbClean = false;
-            }});
+            dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
+                    .withSchemas("public").withDisabledSmartClean());
+            //                initSqlOnResourcePath = "/initDb.sql";
+
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -207,15 +203,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
         return SutInfoDto.OutputFormat.JAVA_JUNIT_5;
     }
 
-    @Override
-    public Connection getConnection() {
-        return sqlConnection;
-    }
 
-    @Override
-    public String getDatabaseDriverName() {
-        return "org.postgresql.Driver";
-    }
 
     @Override
     public List<AuthenticationDto> getInfoForAuthentication() {

jdk_11_maven/em/embedded/graphql/timbuctoo/src/main/java/em/embedded/nl/knaw/huygens/EmbeddedEvoMasterController.java

@@ -173,9 +173,6 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return List.of(AuthUtils.getForAuthorizationHeader("user", "u33707283d426f900d4d33707283d426f900d4d0d"));
     }
 
-    public Connection getConnection() {
-        return null;
-    }
 
 
     private void deleteDir(File file) {

jdk_11_maven/em/embedded/rest/cwa-verification/src/main/java/em/embedded/app/coronawarn/verification/EmbeddedEvoMasterController.java

@@ -79,10 +79,7 @@ public String startSut() {
         }
 
         // need to check tablesToSkip with DATABASECHANGELOG
-        dbSpecification = Arrays.asList(new DbSpecification(){{
-            dbType = DatabaseType.H2;
-            connection = sqlConnection;
-        }});
+        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection));
 
         return "http://localhost:" + getSutPort();
     }
@@ -136,9 +133,6 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return null;
     }
 
-    public Connection getConnection() {
-        return sqlConnection;
-    }
 
 
     @Override

jdk_11_maven/em/external/graphql/timbuctoo/src/main/java/em/external/nl/knaw/huygens/ExternalEvoMasterController.java

@@ -223,10 +223,7 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return List.of(AuthUtils.getForAuthorizationHeader("user", "u33707283d426f900d4d33707283d426f900d4d0d"));
     }
 
-    @Override
-    public Connection getConnection() {
-        return null;
-    }
+
 
     @Override
     public List<DbSpecification> getDbSpecifications() {

jdk_11_maven/em/external/rest/cwa-verification/src/main/java/em/external/app/coronawarn/verification/ExternalEvoMasterController.java

@@ -147,10 +147,7 @@ public void postStart() {
         try {
             Class.forName("org.h2.Driver");
             sqlConnection = DriverManager.getConnection(dbUrl(), "sa", "");
-            dbSpecification = Arrays.asList(new DbSpecification(){{
-                        dbType = DatabaseType.H2;
-                        connection = sqlConnection;
-                    }});
+            dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -212,10 +209,7 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return null;
     }
 
-    @Override
-    public Connection getConnection() {
-        return sqlConnection;
-    }
+
 
     @Override
     public List<DbSpecification> getDbSpecifications() {

jdk_8_maven/em/embedded/graphql/graphql-ncs/src/main/java/em/embedded/org/graphqlncs/EmbeddedEvoMasterController.java

@@ -96,14 +96,6 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return null;
     }
 
-    public Connection getConnection() {
-        return null;
-    }
-
-    @Override
-    public String getDatabaseDriverName() {
-        return null;
-    }
 
     @Override
     public List<DbSpecification> getDbSpecifications() {

jdk_8_maven/em/embedded/graphql/graphql-scs/src/main/java/em/embedded/org/graphqlscs/EmbeddedEvoMasterController.java

@@ -94,15 +94,6 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return null;
     }
 
-    public Connection getConnection() {
-        return null;
-    }
-
-    @Override
-    public String getDatabaseDriverName() {
-        return null;
-    }
-
     @Override
     public List<DbSpecification> getDbSpecifications() {
         return null;

jdk_8_maven/em/embedded/graphql/spring-petclinic-graphql/src/main/java/em/embedded/org/springframework/samples/petclinic/EmbeddedEvoMasterController.java

@@ -92,13 +92,8 @@ public String startSut() {
 
 
 
-        dbSpecification = Arrays.asList(new DbSpecification(){{
-            dbType = DatabaseType.POSTGRES;
-            connection = sqlConnection;
-            schemaNames = Arrays.asList("public");
-            //initSqlOnResourcePath = "/db/postgresql/populateDB.sql";
-            employSmartDbClean = false;
-        }});
+        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
+                .withSchemas("public").withDisabledSmartClean());
 
         SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/db/postgresql/initDB.sql");
 
@@ -150,14 +145,6 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return null;
     }
 
-    public Connection getConnection() {
-        return sqlConnection;
-    }
-
-    @Override
-    public String getDatabaseDriverName() {
-        return "org.postgresql.Driver";
-    }
 
     @Override
     public List<DbSpecification> getDbSpecifications() {

jdk_8_maven/em/embedded/rest/catwatch/src/main/java/em/embedded/org/zalando/EmbeddedEvoMasterController.java

@@ -78,10 +78,7 @@ public String startSut() {
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
-        dbSpecification = Arrays.asList(new DbSpecification(){{
-            dbType = DatabaseType.H2;
-            connection = sqlConnection;
-        }});
+        dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection));
 
         return "http://localhost:" + getSutPort();
     }
@@ -134,14 +131,6 @@ public List<AuthenticationDto> getInfoForAuthentication() {
         return null;
     }
 
-    public Connection getConnection() {
-        return sqlConnection;
-    }
-
-    @Override
-    public String getDatabaseDriverName() {
-        return "org.h2.Driver";
-    }
 
     @Override
     public List<DbSpecification> getDbSpecifications() {