sql init with resource path

Author: man-zhang

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

@@ -63,12 +63,6 @@ public EmbeddedEvoMasterController() {
 
     public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
-
-        try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
     }
 
 
@@ -112,7 +106,7 @@ public String startSut() {
         DbCleaner.clearDatabase_Postgres(sqlConnection,"public", null);
 
         dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
-                .withSchemas("public").withInitSqlScript(initSQLScript));
+                .withSchemas("public").withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
 
 
 

jdk_8_maven/em/embedded/rest/features-service/src/main/java/em/embedded/org/javiermf/features/EmbeddedEvoMasterController.java

@@ -49,8 +49,6 @@ public static void main(String[] args) {
 
     private List<DbSpecification> dbSpecification;
 
-    private String initSQLScript;
-
 
     public EmbeddedEvoMasterController() {
         this(40100);
@@ -59,11 +57,6 @@ public EmbeddedEvoMasterController() {
     public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
 
-        try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
     }
 
     @Override
@@ -99,7 +92,7 @@ public String startSut() {
         DbCleaner.clearDatabase_H2(sqlConnection);
 
         dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection)
-                .withInitSqlScript(initSQLScript));
+                .withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
 
         return "http://localhost:" + getSutPort();
     }

jdk_8_maven/em/embedded/rest/scout-api/src/main/java/em/embedded/se/devscout/scoutapi/EmbeddedEvoMasterController.java

@@ -49,21 +49,13 @@ public static void main(String[] args) {
 
     private List<DbSpecification> dbSpecification;
 
-    private String initSQLScript;
-
 
     public EmbeddedEvoMasterController() {
         this(40100);
     }
 
     public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
-
-        try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
     }
 
     @Override
@@ -100,7 +92,7 @@ public String startSut() {
         DbCleaner.clearDatabase_H2(sqlConnection);
 
         dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection)
-                .withInitSqlScript(initSQLScript));
+                .withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
 
         resetStateOfSUT();
 

jdk_8_maven/em/external/graphql/petclinic-graphql/src/main/java/em/external/org/springframework/samples/petclinic/ExternalEvoMasterController.java

@@ -100,12 +100,6 @@ public ExternalEvoMasterController(
         this.timeoutSeconds = timeoutSeconds;
         setControllerPort(controllerPort);
         setJavaCommand(command);
-
-        try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
     }
 
 
@@ -176,7 +170,7 @@ public void postStart() {
             DbCleaner.clearDatabase_Postgres(sqlConnection,"public", null);
 
             dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
-                    .withSchemas("public").withInitSqlScript(initSQLScript));
+                    .withSchemas("public").withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
 
 
         } catch (Exception e) {

jdk_8_maven/em/external/rest/features-service/src/main/java/em/external/org/javiermf/features/ExternalEvoMasterController.java

@@ -85,12 +85,6 @@ public ExternalEvoMasterController(int controllerPort, String jarLocation, int s
         this.timeoutSeconds = timeoutSeconds;
         setControllerPort(controllerPort);
         setJavaCommand(command);
-
-        try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
     }
 
     private String dbUrl( ) {
@@ -162,7 +156,7 @@ public void postStart() {
                 to consistently manage data by evomaster
              */
             DbCleaner.clearDatabase_H2(sqlConnection);
-            dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection).withInitSqlScript(initSQLScript));
+            dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection).withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

jdk_8_maven/em/external/rest/scout-api/src/main/java/em/external/se/devscout/scoutapi/ExternalEvoMasterController.java

@@ -79,7 +79,6 @@ public static void main(String[] args) {
 
     private String INIT_DB_SCRIPT_PATH = "/init_db.sql";
 
-    private String initSQLScript;
     private Server h2;
 
 
@@ -107,12 +106,6 @@ public ExternalEvoMasterController(int controllerPort,
         String base = Paths.get(jarLocation).toAbsolutePath().getParent().normalize().toString();
         tmpDir = base + "/temp/tmp_scout_api/temp_"+dbPort;
         createConfigurationFile();
-
-        try(InputStream in = getClass().getResourceAsStream("/init_db.sql")) {
-            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
-        } catch (Exception e){
-            throw new RuntimeException(e);
-        }
     }
 
     private String dbUrl( ) {
@@ -206,7 +199,7 @@ public void postStart() {
              */
             DbCleaner.clearDatabase_H2(sqlConnection);
 
-            dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection).withInitSqlScript(initSQLScript));
+            dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.H2,sqlConnection).withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
 
         } catch (Exception e) {
             throw new RuntimeException(e);