update method to extract sql commands

man-zhang · man-zhang · commit 4b872c125d41 · 2023-08-29T22:39:04.000+02:00
diff --git a/jdk_11_gradle/em/embedded/graphql/patio-api/src/main/java/em/embedded/patio/EmbeddedEvoMasterController.java b/jdk_11_gradle/em/embedded/graphql/patio-api/src/main/java/em/embedded/patio/EmbeddedEvoMasterController.java
@@ -71,7 +71,7 @@ public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_11_gradle/em/external/graphql/patio-api/src/main/java/em/external/patio/ExternalEvoMasterController.java b/jdk_11_gradle/em/external/graphql/patio-api/src/main/java/em/external/patio/ExternalEvoMasterController.java
@@ -104,7 +104,7 @@ public ExternalEvoMasterController(
         setJavaCommand(command);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_11_maven/em/embedded/rest/market/src/main/java/em/embedded/market/EmbeddedEvoMasterController.java b/jdk_11_maven/em/embedded/rest/market/src/main/java/em/embedded/market/EmbeddedEvoMasterController.java
@@ -62,7 +62,7 @@ public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_11_maven/em/external/rest/market/src/main/java/em/external/market/ExternalEvoMasterController.java b/jdk_11_maven/em/external/rest/market/src/main/java/em/external/market/ExternalEvoMasterController.java
@@ -90,7 +90,7 @@ public ExternalEvoMasterController(int controllerPort, String jarLocation, int s
         setJavaCommand(command);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_8_maven/em/embedded/graphql/petclinic-graphql/src/main/java/em/embedded/org/springframework/samples/petclinic/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/graphql/petclinic-graphql/src/main/java/em/embedded/org/springframework/samples/petclinic/EmbeddedEvoMasterController.java
@@ -65,7 +65,7 @@ public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_8_maven/em/embedded/rest/features-service/src/main/java/em/embedded/org/javiermf/features/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/features-service/src/main/java/em/embedded/org/javiermf/features/EmbeddedEvoMasterController.java
@@ -60,7 +60,7 @@ public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_8_maven/em/embedded/rest/scout-api/src/main/java/em/embedded/se/devscout/scoutapi/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/scout-api/src/main/java/em/embedded/se/devscout/scoutapi/EmbeddedEvoMasterController.java
@@ -60,7 +60,7 @@ public EmbeddedEvoMasterController(int port) {
         setControllerPort(port);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_8_maven/em/external/graphql/petclinic-graphql/src/main/java/em/external/org/springframework/samples/petclinic/ExternalEvoMasterController.java b/jdk_8_maven/em/external/graphql/petclinic-graphql/src/main/java/em/external/org/springframework/samples/petclinic/ExternalEvoMasterController.java
@@ -102,7 +102,7 @@ public ExternalEvoMasterController(
         setJavaCommand(command);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_8_maven/em/external/rest/features-service/src/main/java/em/external/org/javiermf/features/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/features-service/src/main/java/em/external/org/javiermf/features/ExternalEvoMasterController.java
@@ -87,7 +87,7 @@ public ExternalEvoMasterController(int controllerPort, String jarLocation, int s
         setJavaCommand(command);
 
         try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/jdk_8_maven/em/external/rest/scout-api/src/main/java/em/external/se/devscout/scoutapi/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/scout-api/src/main/java/em/external/se/devscout/scoutapi/ExternalEvoMasterController.java
@@ -109,7 +109,7 @@ public ExternalEvoMasterController(int controllerPort,
         createConfigurationFile();
 
         try(InputStream in = getClass().getResourceAsStream("/init_db.sql")) {
-            initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));
+            initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));
         } catch (Exception e){
             throw new RuntimeException(e);
         }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public EmbeddedEvoMasterController(int port) {`
`71`	`71`	`setControllerPort(port);`
`72`	`72`
`73`	`73`	`try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {`
`74`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`74`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`75`	`75`	`} catch (Exception e) {`
`76`	`76`	`throw new RuntimeException(e);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public ExternalEvoMasterController(`
`104`	`104`	`setJavaCommand(command);`
`105`	`105`
`106`	`106`	`try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {`
`107`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`107`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`108`	`108`	`} catch (Exception e) {`
`109`	`109`	`throw new RuntimeException(e);`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public EmbeddedEvoMasterController(int port) {`
`62`	`62`	`setControllerPort(port);`
`63`	`63`
`64`	`64`	`try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {`
`65`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`65`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`66`	`66`	`} catch (Exception e) {`
`67`	`67`	`throw new RuntimeException(e);`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public ExternalEvoMasterController(int controllerPort, String jarLocation, int s`
`90`	`90`	`setJavaCommand(command);`
`91`	`91`
`92`	`92`	`try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {`
`93`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`93`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`94`	`94`	`} catch (Exception e) {`
`95`	`95`	`throw new RuntimeException(e);`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public EmbeddedEvoMasterController(int port) {`
`65`	`65`	`setControllerPort(port);`
`66`	`66`
`67`	`67`	`try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {`
`68`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`68`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`69`	`69`	`} catch (Exception e) {`
`70`	`70`	`throw new RuntimeException(e);`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public EmbeddedEvoMasterController(int port) {`
`60`	`60`	`setControllerPort(port);`
`61`	`61`
`62`	`62`	`try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {`
`63`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`63`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`64`	`64`	`} catch (Exception e) {`
`65`	`65`	`throw new RuntimeException(e);`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public ExternalEvoMasterController(`
`102`	`102`	`setJavaCommand(command);`
`103`	`103`
`104`	`104`	`try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {`
`105`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`105`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`106`	`106`	`} catch (Exception e) {`
`107`	`107`	`throw new RuntimeException(e);`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public ExternalEvoMasterController(int controllerPort, String jarLocation, int s`
`87`	`87`	`setJavaCommand(command);`
`88`	`88`
`89`	`89`	`try (InputStream in = getClass().getResourceAsStream(INIT_DB_SCRIPT_PATH)) {`
`90`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`90`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`91`	`91`	`} catch (Exception e) {`
`92`	`92`	`throw new RuntimeException(e);`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public ExternalEvoMasterController(int controllerPort,`
`109`	`109`	`createConfigurationFile();`
`110`	`110`
`111`	`111`	`try(InputStream in = getClass().getResourceAsStream("/init_db.sql")) {`
`112`		`- initSQLScript = String.join(System.lineSeparator(), (new SqlScriptRunner()).readCommands(new InputStreamReader(in)));`
	`112`	`+ initSQLScript = (new SqlScriptRunner()).readSQLCommandsAsString(new InputStreamReader(in));`
`113`	`113`	`} catch (Exception e){`
`114`	`114`	`throw new RuntimeException(e);`
`115`	`115`	`}`