Skip to content

Commit ad15035

Browse files
jgaleottijgaleotti
committed
Merge remote-tracking branch 'origin/develop' into gestaohospital
2 parents dfac508 + 64ae77d commit ad15035

870 files changed

Lines changed: 37657 additions & 21 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,7 @@ dotnet_3/em/embedded/rest/SampleProjectDriver/logs/
200200

201201

202202

203+
/js_npm/graphql/react-finland/build/
204+
/js_npm/graphql/react-finland/.idea/
205+
/js_npm/graphql/react-finland/node_modules/
206+
/js_npm/graphql/react-finland/instrumented/

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ public String startSut() {
9797
dbSpecification = Arrays.asList(new DbSpecification(){{
9898
dbType = DatabaseType.POSTGRES;
9999
schemaNames = Arrays.asList("public");
100-
initSqlOnResourcePath = "/initDb.sql";
100+
// initSqlOnResourcePath = "/initDb.sql";
101+
connection = sqlConnection;
102+
employSmartDbClean = false;
101103
}});
102104

103105
return "http://localhost:" + getSutPort();
@@ -130,8 +132,8 @@ public String getPackagePrefixesToCover() {
130132

131133
@Override
132134
public void resetStateOfSUT() {
133-
// DbCleaner.clearDatabase_Postgres(connection, "public", List.of("flyway_schema_history"));
134-
// SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/initDB.sql");
135+
DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
136+
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/initDB.sql");
135137
}
136138

137139
@Override

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ public void postStart() {
156156
dbSpecification = Arrays.asList(new DbSpecification(){{
157157
dbType = DatabaseType.POSTGRES;
158158
schemaNames = Arrays.asList("public");
159-
initSqlOnResourcePath = "/initDb.sql";
159+
// initSqlOnResourcePath = "/initDb.sql";
160+
connection = sqlConnection;
161+
employSmartDbClean = false;
160162
}});
161163
} catch (Exception e) {
162164
throw new RuntimeException(e);
@@ -165,8 +167,8 @@ public void postStart() {
165167

166168
@Override
167169
public void resetStateOfSUT() {
168-
// DbCleaner.clearDatabase_Postgres(connection, "public", List.of("flyway_schema_history"));
169-
// SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/initDB.sql");
170+
DbCleaner.clearDatabase_Postgres(sqlConnection, "public", List.of("flyway_schema_history"));
171+
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/initDB.sql");
170172
}
171173

172174
@Override

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,17 @@ public String startSut() {
9090
throw new RuntimeException(e);
9191
}
9292

93-
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/db/postgresql/initDB.sql");
93+
9494

9595
dbSpecification = Arrays.asList(new DbSpecification(){{
9696
dbType = DatabaseType.POSTGRES;
9797
connection = sqlConnection;
9898
schemaNames = Arrays.asList("public");
99-
initSqlOnResourcePath = "/db/postgresql/populateDB.sql";
99+
//initSqlOnResourcePath = "/db/postgresql/populateDB.sql";
100+
employSmartDbClean = false;
100101
}});
101102

102-
103+
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/db/postgresql/initDB.sql");
103104

104105
return "http://localhost:" + getSutPort();
105106
}
@@ -129,8 +130,8 @@ public String getPackagePrefixesToCover() {
129130

130131
@Override
131132
public void resetStateOfSUT() {
132-
// DbCleaner.clearDatabase_Postgres(connection,"public", null);
133-
// SqlScriptRunnerCached.runScriptFromResourceFile(connection,"/db/postgresql/populateDB.sql");
133+
DbCleaner.clearDatabase_Postgres(sqlConnection,"public", null);
134+
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/db/postgresql/populateDB.sql");
134135
}
135136

136137
@Override

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public String startSut() {
8282
dbSpecification = Arrays.asList(new DbSpecification(){{
8383
dbType = DatabaseType.H2;
8484
connection = sqlConnection;
85+
employSmartDbClean = false;
8586
}});
8687

8788
return "http://localhost:" + getSutPort();
@@ -111,7 +112,7 @@ public String getPackagePrefixesToCover() {
111112

112113
@Override
113114
public void resetStateOfSUT() {
114-
// DbCleaner.clearDatabase_H2(connection);
115+
DbCleaner.clearDatabase_H2(sqlConnection);
115116
}
116117

117118
@Override

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,27 +151,28 @@ public void preStart() {
151151
public void postStart() {
152152
closeDataBaseConnection();
153153

154-
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/initDB.sql");
155-
156-
157154
try {
158155
Class.forName(getDatabaseDriverName());
159156
sqlConnection = DriverManager.getConnection(dbUrl(), "postgres", "");
157+
160158
dbSpecification = Arrays.asList(new DbSpecification(){{
161159
dbType = DatabaseType.POSTGRES;
162160
connection = sqlConnection;
163161
schemaNames = Arrays.asList("public");
164-
initSqlOnResourcePath = "/db/postgresql/populateDB.sql";
162+
// initSqlOnResourcePath = "/db/postgresql/populateDB.sql";
163+
employSmartDbClean = false;
165164
}});
165+
166+
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/initDB.sql");
166167
} catch (Exception e) {
167168
throw new RuntimeException(e);
168169
}
169170
}
170171

171172
@Override
172173
public void resetStateOfSUT() {
173-
// DbCleaner.clearDatabase_Postgres(sqlConnection,"public", null);
174-
// SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/populateDB.sql");
174+
DbCleaner.clearDatabase_Postgres(sqlConnection,"public", null);
175+
SqlScriptRunnerCached.runScriptFromResourceFile(sqlConnection,"/populateDB.sql");
175176
}
176177

177178
@Override

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ public void postStart() {
147147
dbSpecification = Arrays.asList(new DbSpecification(){{
148148
dbType = DatabaseType.H2;
149149
connection = sqlConnection;
150+
employSmartDbClean = false;
150151
}});
151152
} catch (Exception e) {
152153
throw new RuntimeException(e);
@@ -155,7 +156,7 @@ public void postStart() {
155156

156157
@Override
157158
public void resetStateOfSUT() {
158-
// DbCleaner.clearDatabase_H2(connection);
159+
DbCleaner.clearDatabase_H2(sqlConnection);
159160
}
160161

161162
@Override

‎jdk_8_maven/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<source>1.8</source>
6060
<target>1.8</target>
6161
<!-- it is required in order to get parameter name for reflection -->
62-
<compilerArgument>-parameters</compilerArgument>
62+
<!-- <compilerArgument>-parameters</compilerArgument>-->
6363
</configuration>
6464
</plugin>
6565
</plugins>

‎js_npm/graphql/react-finland/.env.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TITO_TOKEN=<get from https://api.tito.io/>

‎js_npm/graphql/react-finland/.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v10.15.1

0 commit comments

Comments
 (0)