changes after PR review

Author: seran

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

@@ -7,6 +7,7 @@
 import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
+import org.evomaster.client.java.controller.problem.RestProblem;
 import org.evomaster.client.java.sql.DbCleaner;
 import org.evomaster.client.java.sql.DbSpecification;
 import org.springframework.boot.SpringApplication;
@@ -77,7 +78,10 @@ public List<AuthenticationDto> getInfoForAuthentication() {
 
     @Override
     public ProblemInfo getProblemInfo() {
-        return null;
+        return new RestProblem(
+                "http://localhost:" + getSutPort() + "/assets/swagger.json",
+                null
+        );
     }
 
     @Override

jdk_17_maven/em/embedded/rest/familie-ba-sak/target/classes/logback.xml

@@ -7,6 +7,7 @@
 import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
+import org.evomaster.client.java.controller.problem.RestProblem;
 import org.evomaster.client.java.sql.DbCleaner;
 import org.evomaster.client.java.sql.DbSpecification;
 import org.springframework.boot.SpringApplication;
@@ -76,7 +77,10 @@ public List<AuthenticationDto> getInfoForAuthentication() {
 
     @Override
     public ProblemInfo getProblemInfo() {
-        return null;
+        return new RestProblem(
+                "http://localhost:" + getSutPort() + "/assets/swagger.json",
+                null
+        );
     }
 
     @Override

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

@@ -31,6 +31,8 @@ public class EmbeddedEvoMasterController extends EmbeddedSutController {
 
     private static final DockerImageName REDIS_IMAGE = DockerImageName.parse("redis:" + REDIS_VERSION);
 
+    private static JedisPool jedisPool;
+
     private static final GenericContainer redisContainer = new GenericContainer(REDIS_IMAGE)
             .withExposedPorts(REDIS_PORT)
             .withEnv("ALLOW_EMPTY_PASSWORD", "yes")
@@ -83,7 +85,7 @@ public List<AuthenticationDto> getInfoForAuthentication() {
     @Override
     public ProblemInfo getProblemInfo() {
         return new RestProblem(
-                "http://0.0.0.0:" + application.getJettyPort() + "/assets/swagger.json",
+                "http://localhost:" + application.getJettyPort() + "/assets/swagger.json",
                 null
         );
     }
@@ -98,6 +100,7 @@ public String startSut() {
         System.setProperty("aws.region", "us-west-2");
 
         redisContainer.start();
+        jedisPool = new JedisPool(redisContainer.getHost(), redisContainer.getMappedPort(REDIS_PORT));
 
         dynamoDBContainer.start();
 
@@ -107,7 +110,6 @@ public String startSut() {
 
         //Dirty hack for DW...
         System.setProperty("dw.server.applicationConnectors[0].port", "0");
-        System.setProperty("dw.server.adminConnectors[0].port", "0");
 
         System.setProperty("dw.cacheCluster.configurationUri", redisURL);
         System.setProperty("dw.clientPresenceCluster.configurationUri", redisURL);
@@ -157,8 +159,6 @@ public void stopSut() {
 
     @Override
     public void resetStateOfSUT() {
-        JedisPool jedisPool = new JedisPool("0.0.0.0", redisContainer.getFirstMappedPort());
-
         try (Jedis jedis = jedisPool.getResource()) {
             jedis.flushAll();
         }

jdk_17_maven/em/embedded/rest/signal-server/src/main/java/em/embedded/textsecuregcm/EmbeddedEvoMasterController.java

@@ -7,6 +7,7 @@
 import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto;
 import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
+import org.evomaster.client.java.controller.problem.RestProblem;
 import org.evomaster.client.java.sql.DbCleaner;
 import org.evomaster.client.java.sql.DbSpecification;
 import org.springframework.boot.SpringApplication;
@@ -70,10 +71,17 @@ public String getPackagePrefixesToCover() {
     }
 
     @Override
-    public List<AuthenticationDto> getInfoForAuthentication() { return null; }
+    public List<AuthenticationDto> getInfoForAuthentication() {
+        return null;
+    }
 
     @Override
-    public ProblemInfo getProblemInfo() { return null; }
+    public ProblemInfo getProblemInfo() {
+        return new RestProblem(
+                "http://localhost:" + getSutPort() + "/assets/swagger.json",
+                null
+        );
+    }
 
     @Override
     public SutInfoDto.OutputFormat getPreferredOutputFormat() {
@@ -113,7 +121,8 @@ public String startSut() {
             }
         }
 
-        JdbcTemplate jdbc = ctx.getBean(JdbcTemplate.class);try {
+        JdbcTemplate jdbc = ctx.getBean(JdbcTemplate.class);
+        try {
             sqlConnection = jdbc.getDataSource().getConnection();
         } catch (SQLException e) {
             throw new RuntimeException(e);
@@ -138,10 +147,11 @@ public void stopSut() {
 
     @Override
     public void resetStateOfSUT() {
-        // TODO: check and see for any necessary steps required
-        DbCleaner.clearDatabase(sqlConnection, List.of(), DatabaseType.POSTGRES);
+
     }
 
     @Override
-    public List<DbSpecification> getDbSpecifications() { return dbSpecification; }
+    public List<DbSpecification> getDbSpecifications() {
+        return dbSpecification;
+    }
 }