patio resource path

Author: man-zhang

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

@@ -48,7 +48,6 @@ public static void main(String[] args){
 
     private final String INIT_DB_SCRIPT_PATH = "/initDB.sql";
 
-    private String initSQLScript;
 
     private final int portApp = 8080; //Hardcoded. will need fixing
     // TODO maybe report at https://github.com/micronaut-projects/micronaut-core/issues
@@ -70,11 +69,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);
-        }
     }
 
 
@@ -113,7 +107,7 @@ public String startSut() {
         DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
 
         dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
-                .withSchemas("public").withInitSqlScript(initSQLScript));
+                .withSchemas("public").withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
 
         return "http://localhost:" + getSutPort();
     }

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

@@ -70,8 +70,6 @@ public static void main(String[] args) {
 
     private final String INIT_DB_SCRIPT_PATH = "/initDB.sql";
 
-    private String initSQLScript;
-
     private static final GenericContainer postgres = new GenericContainer("postgres:9")
             .withEnv("POSTGRES_HOST_AUTH_METHOD","trust")
             .withEnv("POSTGRES_DB", "patio")
@@ -103,11 +101,6 @@ public ExternalEvoMasterController(
         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);
-        }
     }
 
 
@@ -172,7 +165,7 @@ public void postStart() {
             DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
 
             dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection)
-                    .withSchemas("public").withInitSqlScript(initSQLScript));
+                    .withSchemas("public").withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
 
         } catch (Exception e) {
             throw new RuntimeException(e);