Merge pull request #72 from EMResearch/mongo-support

arcuri82 · web-flow · commit cf1dfab017d0 · 2023-11-18T20:49:18.000+01:00
Mongo support
diff --git a/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java b/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java
@@ -139,5 +139,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
         return SutInfoDto.OutputFormat.JAVA_JUNIT_4;
     }
 
+    @Override
+    public Object getMongoConnection() {return mongoClient;}
 
 }
diff --git a/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java b/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java
@@ -185,4 +185,9 @@ public List<AuthenticationDto> getInfoForAuthentication() {
     public List<DbSpecification> getDbSpecifications() {
         return null;
     }
+
+    @Override
+    public Object getMongoConnection() {
+        return mongoClient;
+    }
 }
diff --git a/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java b/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java
@@ -142,5 +142,6 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
         return SutInfoDto.OutputFormat.JAVA_JUNIT_4;
     }
 
-
+    @Override
+    public Object getMongoConnection() {return mongoClient;}
 }
diff --git a/jdk_17_gradle/em/external/rest/bibliothek/src/main/java/em/external/bibliothek/ExternalEvoMasterController.java b/jdk_17_gradle/em/external/rest/bibliothek/src/main/java/em/external/bibliothek/ExternalEvoMasterController.java
@@ -186,4 +186,7 @@ public List<AuthenticationDto> getInfoForAuthentication() {
     public List<DbSpecification> getDbSpecifications() {
         return null;
     }
+
+    @Override
+    public Object getMongoConnection() {return mongoClient;}
 }
diff --git a/jdk_8_maven/em/embedded/rest/genome-nexus/src/main/java/em/embedded/org/cbioportal/genome_nexus/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/genome-nexus/src/main/java/em/embedded/org/cbioportal/genome_nexus/EmbeddedEvoMasterController.java
@@ -140,5 +140,6 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
         return SutInfoDto.OutputFormat.JAVA_JUNIT_4;
     }
 
-
+    @Override
+    public Object getMongoConnection() {return mongoClient;}
 }
diff --git a/jdk_8_maven/em/embedded/rest/gestaohospital/pom.xml b/jdk_8_maven/em/embedded/rest/gestaohospital/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <mongo.version>3.12.10</mongo.version>
+        <mongo.version>3.8.2</mongo.version>
     </properties>
 
     <artifactId>evomaster-benchmark-em-embedded-rest-gestaohospital</artifactId>
diff --git a/jdk_8_maven/em/embedded/rest/gestaohospital/src/main/java/em/embedded/br/com/codenation/hospital/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/gestaohospital/src/main/java/em/embedded/br/com/codenation/hospital/EmbeddedEvoMasterController.java
@@ -1,7 +1,8 @@
 package em.embedded.br.com.codenation.hospital;
 
 import br.com.codenation.hospital.GestaohospitalarApplication;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import org.evomaster.client.java.controller.EmbeddedSutController;
 import org.evomaster.client.java.controller.InstrumentedSutStarter;
 import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
@@ -40,13 +41,14 @@ public static void main(String[] args) {
 
     private static final int MONGODB_PORT = 27017;
 
-    private static final String MONGODB_VERSION = "3.2";
+    private static final String MONGODB_VERSION = "6.0";
 
     private static final String MONGODB_DATABASE_NAME = "HospitalDB";
 
     private static final GenericContainer mongodbContainer = new GenericContainer("mongo:" + MONGODB_VERSION)
             .withExposedPorts(MONGODB_PORT);
 
+    private MongoClient mongoClient;
 
     public EmbeddedEvoMasterController() {
         this(0);
@@ -61,6 +63,7 @@ public EmbeddedEvoMasterController(int port) {
     public String startSut() {
 
         mongodbContainer.start();
+        mongoClient = MongoClients.create("mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT));
 
         ctx = SpringApplication.run(GestaohospitalarApplication.class,
                 new String[]{"--server.port=0",
@@ -102,9 +105,6 @@ public String getPackagePrefixesToCover() {
 
     @Override
     public void resetStateOfSUT() {
-        MongoClient mongoClient = new MongoClient(mongodbContainer.getContainerIpAddress(),
-                mongodbContainer.getMappedPort(MONGODB_PORT));
-
         mongoClient.getDatabase(MONGODB_DATABASE_NAME).drop();
     }
 
@@ -130,8 +130,6 @@ public List<AuthenticationDto> getInfoForAuthentication() {
     }
 
 
-
-
     @Override
     public ProblemInfo getProblemInfo() {
         return new RestProblem(
@@ -145,5 +143,8 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
         return SutInfoDto.OutputFormat.JAVA_JUNIT_4;
     }
 
-
+    @Override
+    public Object getMongoConnection() {
+        return mongoClient;
+    }
 }
diff --git a/jdk_8_maven/em/embedded/rest/ocvn/src/main/java/em/embedded/org/devgateway/ocvn/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/ocvn/src/main/java/em/embedded/org/devgateway/ocvn/EmbeddedEvoMasterController.java
@@ -166,4 +166,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
     public List<DbSpecification> getDbSpecifications() {
         return dbSpecification;
     }
+
+    @Override
+    public Object getMongoConnection() {return mongoClient;}
 }
diff --git a/jdk_8_maven/em/external/rest/genome-nexus/src/main/java/em/external/org/cbioportal/genome_nexus/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/genome-nexus/src/main/java/em/external/org/cbioportal/genome_nexus/ExternalEvoMasterController.java
@@ -202,5 +202,6 @@ public List<DbSpecification> getDbSpecifications() {
         return dbSpecification;
     }
 
-
+    @Override
+    public Object getMongoConnection() {return mongoClient;}
 }
diff --git a/jdk_8_maven/em/external/rest/gestaohospital/pom.xml b/jdk_8_maven/em/external/rest/gestaohospital/pom.xml
@@ -33,8 +33,8 @@
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver</artifactId>
-            <version>3.2.2</version>
+            <artifactId>mongodb-driver-sync</artifactId>
+            <version>3.8.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/jdk_8_maven/em/external/rest/gestaohospital/src/main/java/em/external/br/com/codenation/hospital/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/gestaohospital/src/main/java/em/external/br/com/codenation/hospital/ExternalEvoMasterController.java
@@ -1,7 +1,8 @@
 package em.external.br.com.codenation.hospital;
 
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import org.evomaster.client.java.controller.ExternalSutController;
 import org.evomaster.client.java.controller.InstrumentedSutStarter;
 import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
@@ -23,7 +24,7 @@ public class ExternalEvoMasterController extends ExternalSutController {
     private static final int DEFAULT_DB_PORT = 27017;
     private static final int MONGODB_PORT = 27017;
 
-    private static final String MONGODB_VERSION = "3.2";
+    private static final String MONGODB_VERSION = "6.0";
 
     private static final String MONGODB_DATABASE_NAME = "HospitalDB";
 
@@ -42,7 +43,7 @@ public static void main(String[] args) {
             jarLocation = args[2];
         }
         if (!jarLocation.endsWith(".jar")) {
-            jarLocation += "/gestaohospital-sut.jar";
+            jarLocation += "/gestaohospital-rest-sut.jar";
         }
 
         int timeoutSeconds = 120;
@@ -146,9 +147,7 @@ public void preStart() {
         mongodb.start();
 
         try {
-            mongoClient = new MongoClient(mongodb.getContainerIpAddress(),
-                    mongodb.getMappedPort(DEFAULT_DB_PORT));
-
+            mongoClient = MongoClients.create("mongodb://" + mongodb.getContainerIpAddress() + ":" + mongodb.getMappedPort(DEFAULT_DB_PORT));
         } catch (Exception e) {
             System.out.println("ERROR: " + e.getMessage());
             throw new RuntimeException(e);
@@ -206,5 +205,10 @@ public List<DbSpecification> getDbSpecifications() {
         return dbSpecification;
     }
 
+    @Override
+    public Object getMongoConnection() {
+        return mongoClient;
+    }
+
 
 }
diff --git a/jdk_8_maven/em/external/rest/ocvn/src/main/java/em/external/org/devgateway/ocvn/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/ocvn/src/main/java/em/external/org/devgateway/ocvn/ExternalEvoMasterController.java
@@ -247,5 +247,6 @@ public List<DbSpecification> getDbSpecifications() {
         return dbSpecification;
     }
 
-
+    @Override
+    public Object getMongoConnection() {return mongoClient;}
 }
diff --git a/jdk_8_maven/em/pom.xml b/jdk_8_maven/em/pom.xml
@@ -76,7 +76,7 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>testcontainers</artifactId>
-                <version>1.15.2</version>
+                <version>1.16.3</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

Original file line number	Diff line number	Diff line change
`@@ -139,5 +139,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {`
`139`	`139`	`return SutInfoDto.OutputFormat.JAVA_JUNIT_4;`
`140`	`140`	`}`
`141`	`141`
	`142`	`+ @Override`
	`143`	`+ public Object getMongoConnection() {return mongoClient;}`
`142`	`144`
`143`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,4 +185,9 @@ public List<AuthenticationDto> getInfoForAuthentication() {`
`185`	`185`	`public List<DbSpecification> getDbSpecifications() {`
`186`	`186`	`return null;`
`187`	`187`	`}`
	`188`	`+`
	`189`	`+ @Override`
	`190`	`+ public Object getMongoConnection() {`
	`191`	`+ return mongoClient;`
	`192`	`+ }`
`188`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,5 +142,6 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {`
`142`	`142`	`return SutInfoDto.OutputFormat.JAVA_JUNIT_4;`
`143`	`143`	`}`
`144`	`144`
`145`		`-`
	`145`	`+ @Override`
	`146`	`+ public Object getMongoConnection() {return mongoClient;}`
`146`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,4 +186,7 @@ public List<AuthenticationDto> getInfoForAuthentication() {`
`186`	`186`	`public List<DbSpecification> getDbSpecifications() {`
`187`	`187`	`return null;`
`188`	`188`	`}`
	`189`	`+`
	`190`	`+ @Override`
	`191`	`+ public Object getMongoConnection() {return mongoClient;}`
`189`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,5 +140,6 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {`
`140`	`140`	`return SutInfoDto.OutputFormat.JAVA_JUNIT_4;`
`141`	`141`	`}`
`142`	`142`
`143`		`-`
	`143`	`+ @Override`
	`144`	`+ public Object getMongoConnection() {return mongoClient;}`
`144`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,4 +166,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {`
`166`	`166`	`public List<DbSpecification> getDbSpecifications() {`
`167`	`167`	`return dbSpecification;`
`168`	`168`	`}`
	`169`	`+`
	`170`	`+ @Override`
	`171`	`+ public Object getMongoConnection() {return mongoClient;}`
`169`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,5 +202,6 @@ public List<DbSpecification> getDbSpecifications() {`
`202`	`202`	`return dbSpecification;`
`203`	`203`	`}`
`204`	`204`
`205`		`-`
	`205`	`+ @Override`
	`206`	`+ public Object getMongoConnection() {return mongoClient;}`
`206`	`207`	`}`