working on familie-tilbake

Author: arcuri82

jdk_17_maven/cs/rest/familie-tilbake/pom.xml

@@ -11,7 +11,9 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.4</version>
+<!--        <version>3.1.4</version>-->
+<!--        see https://stackoverflow.com/questions/74946784/java-lang-classnotfoundexception-jakarta-servlet-http-httpsessioncontext-with-s-->
+        <version>3.2.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -465,6 +467,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <mainClass>${main-class}</mainClass>
+                    <finalName>familie-tilbake</finalName>
+                    <classifier>sut</classifier>
                 </configuration>
                 <executions>
                     <execution>

jdk_17_maven/em/embedded/rest/familie-tilbake/pom.xml

@@ -17,7 +17,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.1.4</version>
+                <version>3.2.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

jdk_17_maven/em/embedded/rest/familie-tilbake/src/main/java/em/embedded/familie/tilbake/EmbeddedEvoMasterController.java

@@ -16,8 +16,10 @@
 import org.testcontainers.containers.GenericContainer;
 
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +35,7 @@ public class EmbeddedEvoMasterController extends EmbeddedSutController {
             .withEnv("POSTGRES_PASSWORD", POSTGRES_PASSWORD)
             .withEnv("POSTGRES_HOST_AUTH_METHOD", "trust") //to allow all connections without a password
             .withEnv("POSTGRES_DB", "familietilbake")
+            .withTmpFs(Collections.singletonMap("/var/lib/postgresql/data", "rw"))
             .withExposedPorts(POSTGRES_PORT);
 
     private ConfigurableApplicationContext ctx;
@@ -62,7 +65,7 @@ public static void main(String[] args) {
 
     @Override
     public boolean isSutRunning() {
-        return ctx.isRunning();
+        return ctx!=null && ctx.isRunning();
     }
 
     @Override
@@ -78,7 +81,7 @@ public List<AuthenticationDto> getInfoForAuthentication() {
     @Override
     public ProblemInfo getProblemInfo() {
         return new RestProblem(
-                "http://localhost:" + getSutPort() + "/assets/swagger.json",
+                "http://localhost:" + getSutPort() + "/v3/api-docs",
                 null
         );
     }
@@ -94,8 +97,9 @@ public String startSut() {
 
         String postgresURL = "jdbc:postgresql://" + postgresContainer.getHost() + ":" + postgresContainer.getMappedPort(POSTGRES_PORT) + "/familietilbake";
 
-        System.setProperty("AZURE_OPENID_CONFIG_TOKEN_ENDPOINT", "http://localhost:8080/");
-        System.setProperty("UNLEASH_SERVER_API_URL", "http://localhost:8080/");
+        System.setProperty("AZURE_APP_WELL_KNOWN_URL", "http://azure:8080/");
+        System.setProperty("AZURE_OPENID_CONFIG_TOKEN_ENDPOINT", "http://foo:8080/");
+        System.setProperty("UNLEASH_SERVER_API_URL", "http://bar:8080/");
         System.setProperty("UNLEASH_SERVER_API_TOKEN", "71c722758740d43341c295ffdc237bd3");
         System.setProperty("NAIS_APP_NAME", "familietilbake");
         System.setProperty("NAIS_CLUSTER_NAME", "dev-gcp");
@@ -112,14 +116,10 @@ public String startSut() {
                 "--sentry.logging.enabled=false",
                 "--sentry.environment=local",
                 "--logging.level.root=OFF",
-                "--logback.configurationFile=src/main/resources/logback.xml",
-                "--logging.level.org.springframework=OFF",
-                "--spring.main.web-application-type=none"
+                "--logging.config=classpath:logback-spring.xml",
+                "--logging.level.org.springframework=INFO"
         });
 
-        // https://www.baeldung.com/spring-boot-application-context-exception
-        // spring.main.web-application-type=none
-
         if (sqlConnection != null) {
             try {
                 sqlConnection.close();
@@ -128,8 +128,8 @@ public String startSut() {
             }
         }
 
-        JdbcTemplate jdbc = ctx.getBean(JdbcTemplate.class);try {
-            sqlConnection = jdbc.getDataSource().getConnection();
+        try {
+            sqlConnection = DriverManager.getConnection(postgresURL, "postgres", POSTGRES_PASSWORD);
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
@@ -148,13 +148,11 @@ protected int getSutPort() {
     @Override
     public void stopSut() {
         postgresContainer.stop();
-        ctx.stop();
+        if(ctx!=null) ctx.stop();
     }
 
     @Override
     public void resetStateOfSUT() {
-        // TODO: check and see for any necessary steps required
-        DbCleaner.clearDatabase(sqlConnection, List.of(), DatabaseType.POSTGRES);
     }
 
     @Override