From 305407a3bbdafe434d1d7449307b725bedabed52 Mon Sep 17 00:00:00 2001 From: Omur Date: Sat, 12 Jul 2025 22:50:09 +0200 Subject: [PATCH 01/13] modifications and embedded driver --- .gitignore | 6 +- .../rest/original/angular-ecommerce/pom.xml | 18 ++ .../config/AppSecurityConfig.java | 4 +- .../shoppingstore/config/SwaggerConfig.java | 17 ++ jdk_8_maven/cs/rest/original/pom.xml | 1 + .../embedded/rest/angular-ecommerce/pom.xml | 61 +++++ .../EmbeddedEvoMasterController.java | 228 ++++++++++++++++++ jdk_8_maven/em/embedded/rest/pom.xml | 1 + 8 files changed, 334 insertions(+), 2 deletions(-) create mode 100644 jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java create mode 100644 jdk_8_maven/em/embedded/rest/angular-ecommerce/pom.xml create mode 100644 jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java diff --git a/.gitignore b/.gitignore index 177b7288a..6ae810620 100644 --- a/.gitignore +++ b/.gitignore @@ -367,4 +367,8 @@ jdk_8_maven/em/external/rest/spring-batch-rest/target /jdk_11_maven/cs/rest/http-patch-spring/target /jdk_11_maven/em/embedded/rest/http-patch-spring/target -/jdk_11_maven/em/external/rest/http-patch-spring/target \ No newline at end of file +/jdk_11_maven/em/external/rest/http-patch-spring/target + +/jdk_8_maven/cs/rest/original/angular-ecommerce/target +/jdk_8_maven/em/embedded/rest/angular-ecommerce/target +/jdk_8_maven/em/external/rest/angular-ecommerce/target \ No newline at end of file diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/pom.xml b/jdk_8_maven/cs/rest/original/angular-ecommerce/pom.xml index 57d4a512b..f06c2bcd8 100644 --- a/jdk_8_maven/cs/rest/original/angular-ecommerce/pom.xml +++ b/jdk_8_maven/cs/rest/original/angular-ecommerce/pom.xml @@ -112,6 +112,18 @@ mapstruct 1.3.0.Final + + + io.springfox + springfox-swagger2 + 2.9.2 + + + io.springfox + springfox-swagger-ui + 2.9.2 + + @@ -119,6 +131,12 @@ org.springframework.boot spring-boot-maven-plugin + + + angular-ecommerce + sut + + org.apache.maven.plugins diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java index 71932945f..810faefd2 100644 --- a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java +++ b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java @@ -63,7 +63,9 @@ public void configure(HttpSecurity httpSecurity) throws Exception { .authorizeRequests() .antMatchers("/api/auth/**") .permitAll() - .antMatchers("/api/store/catalog/**") + .antMatchers("/api/store/catalog/**", +// MODIFIED + "/v2/api-docs/**") .permitAll() .anyRequest().authenticated(); diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java new file mode 100644 index 000000000..6a0f8fca7 --- /dev/null +++ b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java @@ -0,0 +1,17 @@ +package com.techie.shoppingstore.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class SwaggerConfig { + + @Bean + public Docket api() { + return new Docket(DocumentationType.SWAGGER_2); + } +} \ No newline at end of file diff --git a/jdk_8_maven/cs/rest/original/pom.xml b/jdk_8_maven/cs/rest/original/pom.xml index 152879577..d3b062d8a 100644 --- a/jdk_8_maven/cs/rest/original/pom.xml +++ b/jdk_8_maven/cs/rest/original/pom.xml @@ -26,6 +26,7 @@ spring-batch-rest spring-actuator-demo swagger-petstore + angular-ecommerce diff --git a/jdk_8_maven/em/embedded/rest/angular-ecommerce/pom.xml b/jdk_8_maven/em/embedded/rest/angular-ecommerce/pom.xml new file mode 100644 index 000000000..e16edadc9 --- /dev/null +++ b/jdk_8_maven/em/embedded/rest/angular-ecommerce/pom.xml @@ -0,0 +1,61 @@ + + + + 4.0.0 + + + evomaster-benchmark-em-embedded-rest-angular-ecommerce + jar + + + org.evomaster + evomaster-benchmark-em-embedded-rest + 3.4.1-SNAPSHOT + + + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.1.RELEASE + pom + import + + + + + + + org.mongodb + mongodb-driver-sync + 3.8.2 + + + org.mongodb + mongodb-driver-core + 3.8.2 + + + com.techie.shoppingstore + NGSpringShoppingStore + 0.0.1-SNAPSHOT + + + + org.testcontainers + testcontainers + compile + + + junit + junit + compile + 4.11 + + + + + + \ No newline at end of file diff --git a/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java new file mode 100644 index 000000000..6a2f98300 --- /dev/null +++ b/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java @@ -0,0 +1,228 @@ +package em.embedded.angular.ecommerce; + +import com.mongodb.BasicDBObject; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; +import com.mongodb.client.MongoCollection; +import com.mongodb.client.MongoDatabase; +import org.evomaster.client.java.controller.AuthUtils; +import org.evomaster.client.java.controller.EmbeddedSutController; +import org.evomaster.client.java.controller.InstrumentedSutStarter; +import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto; +import org.evomaster.client.java.controller.api.dto.SutInfoDto; +import org.evomaster.client.java.sql.DbSpecification; +import org.evomaster.client.java.controller.problem.ProblemInfo; +import org.evomaster.client.java.controller.problem.RestProblem; +import org.springframework.boot.SpringApplication; +import org.springframework.context.ConfigurableApplicationContext; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; +import com.techie.shoppingstore.NgSpringShoppingStoreApplication; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import org.bson.Document; +import org.bson.types.ObjectId; + +/** + * Class used to start/stop the SUT. This will be controller by the EvoMaster process + */ +public class EmbeddedEvoMasterController extends EmbeddedSutController { + + public static void main(String[] args) { + + int port = 40100; + if (args.length > 0) { + port = Integer.parseInt(args[0]); + } + + EmbeddedEvoMasterController controller = new EmbeddedEvoMasterController(port); + InstrumentedSutStarter starter = new InstrumentedSutStarter(controller); + + starter.start(); + } + + + private ConfigurableApplicationContext ctx; + + private static final int MONGODB_PORT = 27017; + + private static final String MONGODB_VERSION = "7.0"; + + private static final String MONGODB_DATABASE_NAME = "test"; + + private static final GenericContainer mongodbContainer = new GenericContainer("mongo:" + MONGODB_VERSION) + .withTmpFs(Collections.singletonMap("/data/db", "rw")) + .withExposedPorts(MONGODB_PORT); + + private static final String REDIS_VERSION = "7.0.11"; + private static final int REDIS_PORT = 6379; + + private static final GenericContainer redisContainer = new GenericContainer("redis:" + REDIS_VERSION) + .withExposedPorts(REDIS_PORT) + .withCommand("redis-server", "--appendonly", "yes"); + + private static final String ELASTICSEARCH_VERSION = "6.8.23"; + private static final int HTTP_PORT = 9200; + private static final int TRANSPORT_PORT = 9300; + + private static final GenericContainer elasticsearchContainer = + new GenericContainer<>(DockerImageName.parse( + "docker.elastic.co/elasticsearch/elasticsearch:" + ELASTICSEARCH_VERSION)) + .withEnv("discovery.type", "single-node") + .withEnv("cluster.name", "elasticsearch") + .withEnv("ES_JAVA_OPTS", "-Xms512m -Xmx512m") + .withEnv("xpack.security.enabled", "false") + .withTmpFs(Collections.singletonMap("/usr/share/elasticsearch/data", "rw")) + .withExposedPorts(HTTP_PORT, TRANSPORT_PORT); + + + private MongoClient mongoClient; + + public EmbeddedEvoMasterController() { + this(0); + } + + public EmbeddedEvoMasterController(int port) { + setControllerPort(port); + } + + + @Override + public String startSut() { + + mongodbContainer.start(); + redisContainer.start(); + elasticsearchContainer.start(); + + mongoClient = MongoClients.create("mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT)); + + try { + Thread.sleep(3_000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + + ctx = SpringApplication.run(NgSpringShoppingStoreApplication.class, + new String[]{"--server.port=0", + "--spring.datasource.host=" + mongodbContainer.getContainerIpAddress(), + "--spring.datasource.port=" + mongodbContainer.getMappedPort(MONGODB_PORT), + "--spring.datasource.database=" + MONGODB_DATABASE_NAME, + "--spring.data.mongodb.uri=mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT) + "/" + MONGODB_DATABASE_NAME, + "--spring.redis.host=" + redisContainer.getContainerIpAddress(), + "--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT), + "--spring.data.elasticsearch.cluster-name=elasticsearch", + "--spring.data.elsticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT), + "--spring.cache.type=NONE" + }); + + return "http://localhost:" + getSutPort(); + } + + protected int getSutPort() { + return (Integer) ((Map) ctx.getEnvironment() + .getPropertySources().get("server.ports").getSource()) + .get("local.server.port"); + } + + + @Override + public boolean isSutRunning() { + return ctx != null && ctx.isRunning(); + } + + @Override + public void stopSut() { + ctx.stop(); + ctx.close(); + + mongodbContainer.stop(); + mongoClient.close(); + redisContainer.stop(); + elasticsearchContainer.stop(); + } + + @Override + public String getPackagePrefixesToCover() { + return "com.techie.shoppingstore."; + } + + @Override + public void resetStateOfSUT() { + MongoDatabase db = mongoClient.getDatabase(MONGODB_DATABASE_NAME); + + + for(String name: db.listCollectionNames()){ + db.getCollection(name).deleteMany(new BasicDBObject()); + } + + MongoCollection users = db.getCollection("User"); + users.insertMany(Arrays.asList( + new Document() + .append("_id", new ObjectId()) + .append("_class", "com.techie.shoppingstore.model.User") + .append("username", "user1") + .append("email", "user1@email.com") + .append("enabled", true) + //12345678 + .append("password", "$2a$12$p9eP3beaPuSMbS1enDn1Z.zFuv6npjm6xjyQnnEqvVG.CD03d1aoi"), + new Document() + .append("_id", new ObjectId()) + .append("_class", "com.techie.shoppingstore.model.User") + .append("username", "user2") + .append("email", "user2@email.com") + .append("enabled", true) + //12345678 + .append("password", "$2a$12$p9eP3beaPuSMbS1enDn1Z.zFuv6npjm6xjyQnnEqvVG.CD03d1aoi") + )); + } + + + @Override + public List getDbSpecifications() { + return null; + } + + String rawPassword = "12345678"; + + @Override + public List getInfoForAuthentication() { + return Arrays.asList( + AuthUtils.getForJsonTokenBearer( + "user1", + "/api/auth/login", + "{\"username\":\"user1\", \"password\":\""+rawPassword+"\"}", + "/accessToken" + ), + AuthUtils.getForJsonTokenBearer( + "user2", + "/api/auth/login", + "{\"username\":\"user2\", \"password\":\""+rawPassword+"\"}", + "/accessToken" + ) + ); + } + + + + + @Override + public ProblemInfo getProblemInfo() { + return new RestProblem( + "http://localhost:" + getSutPort() + "/v2/api-docs", + null + ); + } + + @Override + public SutInfoDto.OutputFormat getPreferredOutputFormat() { + return SutInfoDto.OutputFormat.JAVA_JUNIT_5; + } + + @Override + public Object getMongoConnection() { + return mongoClient; + } +} diff --git a/jdk_8_maven/em/embedded/rest/pom.xml b/jdk_8_maven/em/embedded/rest/pom.xml index 100de21e4..3816bbe5e 100644 --- a/jdk_8_maven/em/embedded/rest/pom.xml +++ b/jdk_8_maven/em/embedded/rest/pom.xml @@ -32,6 +32,7 @@ spring-batch-rest spring-actuator-demo swagger-petstore + angular-ecommerce \ No newline at end of file From 67d5bba95d64cf7360dfd685711dbb6a79c93720 Mon Sep 17 00:00:00 2001 From: Omur Date: Wed, 16 Jul 2025 15:14:00 +0200 Subject: [PATCH 02/13] external driver --- .../external/rest/angular-ecommerce/pom.xml | 75 +++++ .../ExternalEvoMasterController.java | 308 ++++++++++++++++++ jdk_8_maven/em/external/rest/pom.xml | 1 + 3 files changed, 384 insertions(+) create mode 100644 jdk_8_maven/em/external/rest/angular-ecommerce/pom.xml create mode 100644 jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java diff --git a/jdk_8_maven/em/external/rest/angular-ecommerce/pom.xml b/jdk_8_maven/em/external/rest/angular-ecommerce/pom.xml new file mode 100644 index 000000000..66cae6ddf --- /dev/null +++ b/jdk_8_maven/em/external/rest/angular-ecommerce/pom.xml @@ -0,0 +1,75 @@ + + + + 4.0.0 + + evomaster-benchmark-em-external-rest-angular-ecommerce + jar + + + org.evomaster + evomaster-benchmark-em-external-rest + 3.4.1-SNAPSHOT + + + + + + org.testcontainers + testcontainers + compile + + + junit + junit + 4.12 + compile + + + org.mongodb + mongodb-driver-sync + 3.8.2 + + + org.mongodb + mongodb-driver-core + 3.8.2 + + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + angular-ecommerce-evomaster-runner + + + + em.external.angular.ecommerce.ExternalEvoMasterController + + org.evomaster.client.java.instrumentation.InstrumentingAgent + + org.evomaster.client.java.instrumentation.InstrumentingAgent + + true + true + + + + + + + + + + \ No newline at end of file diff --git a/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java new file mode 100644 index 000000000..8ccf181ad --- /dev/null +++ b/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java @@ -0,0 +1,308 @@ +package em.external.angular.ecommerce; + +import com.mongodb.BasicDBObject; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; +import com.mongodb.client.MongoCollection; +import com.mongodb.client.MongoDatabase; +import org.bson.Document; +import org.bson.types.ObjectId; +import org.evomaster.client.java.controller.AuthUtils; +import org.evomaster.client.java.controller.ExternalSutController; +import org.evomaster.client.java.controller.InstrumentedSutStarter; +import org.evomaster.client.java.controller.api.dto.auth.AuthenticationDto; +import org.evomaster.client.java.controller.api.dto.SutInfoDto; +import org.evomaster.client.java.sql.DbSpecification; +import org.evomaster.client.java.controller.problem.ProblemInfo; +import org.evomaster.client.java.controller.problem.RestProblem; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.utility.DockerImageName; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +public class ExternalEvoMasterController extends ExternalSutController { + + + public static void main(String[] args) { + + int controllerPort = 40100; + if (args.length > 0) { + controllerPort = Integer.parseInt(args[0]); + } + int sutPort = 12345; + if (args.length > 1) { + sutPort = Integer.parseInt(args[1]); + } + String jarLocation = "cs/rest/original/angular-ecommerce/target"; + if (args.length > 2) { + jarLocation = args[2]; + } + if(! jarLocation.endsWith(".jar")) { + jarLocation += "/angular-ecommerce-sut.jar"; + } + + int timeoutSeconds = 120; + if(args.length > 3){ + timeoutSeconds = Integer.parseInt(args[3]); + } + String command = "java"; + if(args.length > 4){ + command = args[4]; + } + + + ExternalEvoMasterController controller = + new ExternalEvoMasterController(controllerPort, jarLocation, + sutPort, timeoutSeconds, command); + InstrumentedSutStarter starter = new InstrumentedSutStarter(controller); + + starter.start(); + } + + private final int timeoutSeconds; + private final int sutPort; + private String jarLocation; + + private static final int MONGODB_PORT = 27017; + + private static final String MONGODB_VERSION = "7.0"; + + private static final String MONGODB_DATABASE_NAME = "test"; + + private static final GenericContainer mongodbContainer = new GenericContainer("mongo:" + MONGODB_VERSION) + .withTmpFs(Collections.singletonMap("/data/db", "rw")) + .withExposedPorts(MONGODB_PORT); + + private static final String REDIS_VERSION = "7.0.11"; + private static final int REDIS_PORT = 6379; + + private static final GenericContainer redisContainer = new GenericContainer("redis:" + REDIS_VERSION) + .withExposedPorts(REDIS_PORT) + .withCommand("redis-server", "--appendonly", "yes"); + + private static final String ELASTICSEARCH_VERSION = "6.8.23"; + private static final int HTTP_PORT = 9200; + private static final int TRANSPORT_PORT = 9300; + + private static final GenericContainer elasticsearchContainer = + new GenericContainer<>(DockerImageName.parse( + "docker.elastic.co/elasticsearch/elasticsearch:" + ELASTICSEARCH_VERSION)) + .withEnv("discovery.type", "single-node") + .withEnv("cluster.name", "elasticsearch") + .withEnv("ES_JAVA_OPTS", "-Xms512m -Xmx512m") + .withEnv("xpack.security.enabled", "false") + .withTmpFs(Collections.singletonMap("/usr/share/elasticsearch/data", "rw")) + .withExposedPorts(HTTP_PORT, TRANSPORT_PORT); + + + private MongoClient mongoClient; + + + public ExternalEvoMasterController(){ + this(40100, "../core/target", 12345, 120, "java"); + } + + public ExternalEvoMasterController(String jarLocation) { + this(); + this.jarLocation = jarLocation; + } + + public ExternalEvoMasterController( + int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command + ) { + + if(jarLocation==null || jarLocation.isEmpty()){ + throw new IllegalArgumentException("Missing jar location"); + } + + + this.sutPort = sutPort; + this.jarLocation = jarLocation; + this.timeoutSeconds = timeoutSeconds; + setControllerPort(controllerPort); + setJavaCommand(command); + } + + + @Override + public String[] getInputParameters() { + return new String[]{ + "--server.port=" + sutPort, + "--spring.datasource.host=" + mongodbContainer.getContainerIpAddress(), + "--spring.datasource.port=" + mongodbContainer.getMappedPort(MONGODB_PORT), + "--spring.datasource.database=" + MONGODB_DATABASE_NAME, + "--spring.data.mongodb.uri=mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT) + "/" + MONGODB_DATABASE_NAME, + "--spring.redis.host=" + redisContainer.getContainerIpAddress(), + "--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT), + "--spring.data.elasticsearch.cluster-name=elasticsearch", + "--spring.data.elsticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT), + "--spring.cache.type=NONE" + }; + } + + public String[] getJVMParameters() { + + return new String[]{ + "-Dfile.encoding=ISO-8859-1" + }; + } + + @Override + public String getBaseURL() { + return "http://localhost:" + sutPort; + } + + @Override + public String getPathToExecutableJar() { + return jarLocation; + } + + @Override + public String getLogMessageOfInitializedServer() { + return "Started NgSpringShoppingStoreApplication in "; + } + + @Override + public long getMaxAwaitForInitializationInSeconds() { + return timeoutSeconds; + } + + @Override + public void preStart() { + + mongodbContainer.start(); + redisContainer.start(); + elasticsearchContainer.start(); + + mongoClient = MongoClients.create("mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT)); + + } + + @Override + public void postStart() { + try { + Thread.sleep(3_000); + } catch (InterruptedException e) { + // do nothing + } + + while (!isMongoClientReady()) { + try { + Thread.sleep(1_000); + } catch (InterruptedException e) { + // do nothing + } + } + } + + /** + * Checks if the mongo database is ready to receive commands using a ping command + * @return + */ + private boolean isMongoClientReady() { + try { + MongoDatabase db = mongoClient.getDatabase(MONGODB_DATABASE_NAME); + Document pingResult = db.runCommand(new Document("ping", 1)); + return pingResult.getDouble("ok") == 1.0; + } catch (Exception ex) { + // Connection error + return false; + } + } + + @Override + public void resetStateOfSUT() { + MongoDatabase db = mongoClient.getDatabase(MONGODB_DATABASE_NAME); + + + for(String name: db.listCollectionNames()){ + db.getCollection(name).deleteMany(new BasicDBObject()); + } + + MongoCollection users = db.getCollection("User"); + users.insertMany(Arrays.asList( + new Document() + .append("_id", new ObjectId()) + .append("_class", "com.techie.shoppingstore.model.User") + .append("username", "user1") + .append("email", "user1@email.com") + .append("enabled", true) + //12345678 + .append("password", "$2a$12$p9eP3beaPuSMbS1enDn1Z.zFuv6npjm6xjyQnnEqvVG.CD03d1aoi"), + new Document() + .append("_id", new ObjectId()) + .append("_class", "com.techie.shoppingstore.model.User") + .append("username", "user2") + .append("email", "user2@email.com") + .append("enabled", true) + //12345678 + .append("password", "$2a$12$p9eP3beaPuSMbS1enDn1Z.zFuv6npjm6xjyQnnEqvVG.CD03d1aoi") + )); + } + + @Override + public void preStop() { + } + + @Override + public void postStop() { + mongodbContainer.stop(); + mongoClient.close(); + redisContainer.stop(); + elasticsearchContainer.stop(); + } + + + + @Override + public String getPackagePrefixesToCover() { + return "com.techie.shoppingstore."; + } + + @Override + public ProblemInfo getProblemInfo() { + return new RestProblem( + "http://localhost:" + sutPort + "/v2/api-docs", + null + ); + } + + @Override + public SutInfoDto.OutputFormat getPreferredOutputFormat() { + return SutInfoDto.OutputFormat.JAVA_JUNIT_5; + } + + String rawPassword = "12345678"; + + @Override + public List getInfoForAuthentication() { + return Arrays.asList( + AuthUtils.getForJsonTokenBearer( + "user1", + "/api/auth/login", + "{\"username\":\"user1\", \"password\":\""+rawPassword+"\"}", + "/accessToken" + ), + AuthUtils.getForJsonTokenBearer( + "user2", + "/api/auth/login", + "{\"username\":\"user2\", \"password\":\""+rawPassword+"\"}", + "/accessToken" + ) + ); + } + + @Override + public List getDbSpecifications() { + return null; + } + + @Override + public Object getMongoConnection() { + return mongoClient; + } + + +} diff --git a/jdk_8_maven/em/external/rest/pom.xml b/jdk_8_maven/em/external/rest/pom.xml index dbac41af3..7dcd14085 100644 --- a/jdk_8_maven/em/external/rest/pom.xml +++ b/jdk_8_maven/em/external/rest/pom.xml @@ -33,6 +33,7 @@ spring-batch-rest spring-actuator-demo swagger-petstore + angular-ecommerce \ No newline at end of file From f60afe3f1bc31129e820d77e2ffba636325eac22 Mon Sep 17 00:00:00 2001 From: Omur Date: Wed, 16 Jul 2025 21:23:18 +0200 Subject: [PATCH 03/13] additional info --- README.md | 4 +++- scripts/dist.py | 3 +++ statistics/data.csv | 1 + statistics/table_emb.md | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 285ae9102..841357a4e 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,9 @@ For simplicity, all schemas are also available as JSON/YML files under the folde > **IMPORTANT**: More details (e.g., #LOCs and used databases) on these APIs can be found [in this table](statistics/table_emb.md). -### REST: Java/Kotlin (33) +### REST: Java/Kotlin (34) + +* **Angular ECommerce** (not-known license), [jdk_8_maven/cs/rest/original/angular-ecommerce](jdk_8_maven/cs/rest/original/angular-ecommerce), from [https://github.com/SaiUpadhyayula/SpringAngularEcommerce](https://github.com/SaiUpadhyayula/SpringAngularEcommerce) * **Bibliothek** (MIT), [jdk_17_gradle/cs/rest/bibliothek](jdk_17_gradle/cs/rest/bibliothek), from [https://github.com/PaperMC/bibliothek](https://github.com/PaperMC/bibliothek) diff --git a/scripts/dist.py b/scripts/dist.py index 9cebdddbd..96fb885d4 100755 --- a/scripts/dist.py +++ b/scripts/dist.py @@ -187,6 +187,9 @@ def build_jdk_8_maven(): copy(folder + "/cs/rest/original/swagger-petstore/target/swagger-petstore-sut.jar", DIST) copy(folder + "/em/external/rest/swagger-petstore/target/swagger-petstore-evomaster-runner.jar", DIST) + copy(folder + "/cs/rest/original/angular-ecommerce/target/angular-ecommerce-sut.jar", DIST) + copy(folder + "/em/external/rest/angular-ecommerce/target/angular-ecommerce-evomaster-runner.jar", DIST) + # graphql copy(folder + "/cs/graphql/petclinic-graphql/target/petclinic-graphql-sut.jar", DIST) diff --git a/statistics/data.csv b/statistics/data.csv index 8342ba74a..8bb0cbb2c 100644 --- a/statistics/data.csv +++ b/statistics/data.csv @@ -1,4 +1,5 @@ EMB,NAME,TYPE,LANGUAGE,RUNTIME,BUILD,FILES,LOCS,DATABASE,LICENSE,ENDPOINTS,AUTHENTICATION,URL +TRUE,angular-ecommerce,REST,Java,JDK 8,Maven,58,2223,MongoOB;Redis;Elasticsearch,UNDEFINED,26,TRUE,https://github.com/SaiUpadhyayula/SpringAngularEcommerce TRUE,tiltaksgjennomforing,REST,Java,JDK 17,Maven,472,27316,PostgreSQL,MIT,79,TRUE,https://github.com/navikt/tiltaksgjennomforing-api TRUE,person-controller,REST,Java,JDK 21,Maven,16,1112,MongoDB,Apache,12,FALSE,https://github.com/mongodb-developer/java-spring-boot-mongodb-starter TRUE,tracking-system,REST,Java,JDK 11,Maven,87,5947,H2,UNDEFINED,67,TRUE,https://github.com/SelimHorri/project-tracking-system-backend-app diff --git a/statistics/table_emb.md b/statistics/table_emb.md index 1070a57a0..9a7ba9b02 100644 --- a/statistics/table_emb.md +++ b/statistics/table_emb.md @@ -24,6 +24,7 @@ |__gestaohospital__|REST|3506|33|20|Java|JDK 8|Maven|MongoDB|| |__youtube-mock__|REST|3229|29|1|Java|JDK 8|Maven||| |__features-service__|REST|2275|39|18|Java|JDK 8|Maven|H2|| +|__angular-ecommerce__|REST|2223|58|26|Java|JDK 8|Maven|MongoOB, Redis, Elasticsearch|✓| |__bibliothek__|REST|2176|33|8|Java|JDK 17|Gradle|MongoDB|| |__restcountries__|REST|1977|24|22|Java|JDK 8|Maven||| |__reservations-api__|REST|1853|39|7|Java|JDK 11|Gradle|MongoDB|✓| From 9f83bb5862301ccd879c92315482b035a6eb0b2d Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 17 Jul 2025 10:28:15 +0200 Subject: [PATCH 04/13] docker --- dockerfiles/angular-ecommerce.dockerfile | 17 ++++++ dockerfiles/angular-ecommerce.yaml | 60 +++++++++++++++++++ .../src/main/resources/application.properties | 2 +- .../EmbeddedEvoMasterController.java | 2 +- .../ExternalEvoMasterController.java | 2 +- .../angular-ecommerce/init.json | 16 +++++ .../angular-ecommerce/mongo_import.sh | 4 ++ 7 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 dockerfiles/angular-ecommerce.dockerfile create mode 100644 dockerfiles/angular-ecommerce.yaml create mode 100644 scripts/dockerize/data/additional_files/angular-ecommerce/init.json create mode 100644 scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh diff --git a/dockerfiles/angular-ecommerce.dockerfile b/dockerfiles/angular-ecommerce.dockerfile new file mode 100644 index 000000000..66f4da708 --- /dev/null +++ b/dockerfiles/angular-ecommerce.dockerfile @@ -0,0 +1,17 @@ +FROM amazoncorretto:8-alpine-jdk + +COPY ./dist/angular-ecommerce-sut.jar . +COPY ./dist/jacocoagent.jar . + + + +#ENV TOOL="undefined" +#ENV RUN="0" + +ENTRYPOINT \ + java \ +# unfortunately dumponexit is completely unreliable in Docker :( +# -javaagent:jacocoagent.jar=destfile=./jacoco/angular-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \ + -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \ + -Dfile.encoding=ISO-8859-1 -jar angular-ecommerce-sut.jar \ + --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elsticsearch.cluster-nodes=elastic:9300 --spring.cache.type=NONE \ No newline at end of file diff --git a/dockerfiles/angular-ecommerce.yaml b/dockerfiles/angular-ecommerce.yaml new file mode 100644 index 000000000..0a32a587e --- /dev/null +++ b/dockerfiles/angular-ecommerce.yaml @@ -0,0 +1,60 @@ +services: + sut-angular-ecommerce: + build: + dockerfile: ./dockerfiles/angular-ecommerce.dockerfile + context: .. +# environment: +# TOOL: ${TOOL:-undefined} +# RUN: ${RUN:-0} + ports: + - "${HOST_PORT:-8080}:8080" + - "${JACOCO_PORT:-6300}:6300" +# volumes: + # default env does not work on volumes +# - ${JACOCODIR}:/jacoco + + mongodb: + image: mongo:7.0 + tmpfs: + - '/data/db' + + + environment: + MONGODB_REPLICA_SET_MODE: primary + ALLOW_EMPTY_PASSWORD: yes + + + + volumes: + - ../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh + - ../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json + + + + + + redis: + image: redis:7.0.11 + + + + + + + elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:6.8.23 + tmpfs: + - '/usr/share/elasticsearch/data' + + + environment: + - discovery.type=single-node + - cluster.name=elasticsearch + - ES_JAVA_OPTS=-Xms512m -Xmx512m + - xpack.security.enabled=false + + + + + + diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties index 3f8b8f93a..cbc44bd30 100644 --- a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties +++ b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties @@ -19,6 +19,6 @@ spring.redis.port=6379 ################# Elasticsearch Config ################################## spring.data.elasticsearch.repositories.enabled=true spring.data.elasticsearch.cluster-name=elasticsearch -spring.data.elsticsearch.cluster-nodes=localhost:9300 +spring.data.elasticsearch.cluster-nodes=localhost:9300 ########################################################################## account.verification.url=http://localhost:8080/api/auth/accountVerification \ No newline at end of file diff --git a/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java index 6a2f98300..5cf41c771 100644 --- a/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java +++ b/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java @@ -114,7 +114,7 @@ public String startSut() { "--spring.redis.host=" + redisContainer.getContainerIpAddress(), "--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT), "--spring.data.elasticsearch.cluster-name=elasticsearch", - "--spring.data.elsticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT), + "--spring.data.elasticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT), "--spring.cache.type=NONE" }); diff --git a/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java index 8ccf181ad..f729f2149 100644 --- a/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java +++ b/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java @@ -137,7 +137,7 @@ public String[] getInputParameters() { "--spring.redis.host=" + redisContainer.getContainerIpAddress(), "--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT), "--spring.data.elasticsearch.cluster-name=elasticsearch", - "--spring.data.elsticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT), + "--spring.data.elasticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT), "--spring.cache.type=NONE" }; } diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/init.json b/scripts/dockerize/data/additional_files/angular-ecommerce/init.json new file mode 100644 index 000000000..8fcddc6df --- /dev/null +++ b/scripts/dockerize/data/additional_files/angular-ecommerce/init.json @@ -0,0 +1,16 @@ +[ + { + "_class": "com.techie.shoppingstore.model.User", + "username": "user1", + "email": "user1@email.com", + "password": "$2a$12$p9eP3beaPuSMbS1enDn1Z.zFuv6npjm6xjyQnnEqvVG.CD03d1aoi", + "enabled": true + }, + { + "_class": "com.techie.shoppingstore.model.User", + "username": "user2", + "email": "user2@email.com", + "password": "$2a$12$p9eP3beaPuSMbS1enDn1Z.zFuv6npjm6xjyQnnEqvVG.CD03d1aoi", + "enabled": true + } +] \ No newline at end of file diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh b/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh new file mode 100644 index 000000000..4dae7dbfb --- /dev/null +++ b/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh @@ -0,0 +1,4 @@ +#!/bin/bash +# Import from fixtures + +mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray \ No newline at end of file From 306b6780161f5c1f11e1995f0cb6b5c666e972d6 Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 17 Jul 2025 12:59:12 +0200 Subject: [PATCH 05/13] supporting multiple service definitions --- dockerfiles/bibliothek.yaml | 2 + dockerfiles/blogapi.yaml | 8 ++- dockerfiles/familie-ba-sak.yaml | 2 + dockerfiles/genome-nexus.yaml | 2 + dockerfiles/gestaohospital.yaml | 2 + dockerfiles/ocvn.yaml | 2 + dockerfiles/pay-publicapi.yaml | 2 + dockerfiles/person-controller.yaml | 2 + dockerfiles/reservations-api.yaml | 2 + dockerfiles/session-service.yaml | 2 + dockerfiles/spring-rest-example.yaml | 8 ++- dockerfiles/tiltaksgjennomforing.yaml | 2 + dockerfiles/user-management.yaml | 8 ++- .../angular-ecommerce/mongo_import.sh | 1 - .../mockoauth2.json | 0 scripts/dockerize/data/sut.csv | 69 ++++++++++--------- scripts/dockerize/docker_generator.py | 44 +++++------- scripts/dockerize/templates/db.template | 4 +- .../templates/template.docker-compose.yml | 12 ++-- 19 files changed, 102 insertions(+), 72 deletions(-) rename scripts/dockerize/data/additional_files/{tiltaksgjennomforing-api => tiltaksgjennomforing}/mockoauth2.json (100%) diff --git a/dockerfiles/bibliothek.yaml b/dockerfiles/bibliothek.yaml index 4de67e403..c0763df87 100644 --- a/dockerfiles/bibliothek.yaml +++ b/dockerfiles/bibliothek.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: mongo:6 tmpfs: @@ -21,3 +22,4 @@ services: + diff --git a/dockerfiles/blogapi.yaml b/dockerfiles/blogapi.yaml index dfd082011..95e5412c3 100644 --- a/dockerfiles/blogapi.yaml +++ b/dockerfiles/blogapi.yaml @@ -13,9 +13,12 @@ services: # default env does not work on volumes # - ${JACOCODIR}:/jacoco depends_on: + db: - condition: service_healthy + condition: service_healthy + + db: image: mysql:8.0 tmpfs: @@ -35,9 +38,10 @@ services: healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost'] interval: 30s timeout: 30s retries: 3 + diff --git a/dockerfiles/familie-ba-sak.yaml b/dockerfiles/familie-ba-sak.yaml index 68d970165..c1d6548d6 100644 --- a/dockerfiles/familie-ba-sak.yaml +++ b/dockerfiles/familie-ba-sak.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: postgres:13.13 tmpfs: @@ -27,6 +28,7 @@ services: + mock-oauth2-server: image: ghcr.io/navikt/mock-oauth2-server:2.0.1 environment: diff --git a/dockerfiles/genome-nexus.yaml b/dockerfiles/genome-nexus.yaml index 074439b65..b25a64d11 100644 --- a/dockerfiles/genome-nexus.yaml +++ b/dockerfiles/genome-nexus.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: mongo:3.6.2 tmpfs: @@ -21,3 +22,4 @@ services: + diff --git a/dockerfiles/gestaohospital.yaml b/dockerfiles/gestaohospital.yaml index f78e1df2a..255a3e7a8 100644 --- a/dockerfiles/gestaohospital.yaml +++ b/dockerfiles/gestaohospital.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: mongo:6 tmpfs: @@ -21,3 +22,4 @@ services: + diff --git a/dockerfiles/ocvn.yaml b/dockerfiles/ocvn.yaml index b42120d28..37d88643e 100644 --- a/dockerfiles/ocvn.yaml +++ b/dockerfiles/ocvn.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: mongo:3.2 tmpfs: @@ -21,3 +22,4 @@ services: + diff --git a/dockerfiles/pay-publicapi.yaml b/dockerfiles/pay-publicapi.yaml index 53867944d..644bfe355 100644 --- a/dockerfiles/pay-publicapi.yaml +++ b/dockerfiles/pay-publicapi.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: redis:7.2.3 @@ -19,3 +20,4 @@ services: + diff --git a/dockerfiles/person-controller.yaml b/dockerfiles/person-controller.yaml index d3c9b0173..70d336a91 100644 --- a/dockerfiles/person-controller.yaml +++ b/dockerfiles/person-controller.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: mongo:7.0 tmpfs: @@ -21,3 +22,4 @@ services: + diff --git a/dockerfiles/reservations-api.yaml b/dockerfiles/reservations-api.yaml index 1c29e2b76..0eb6404be 100644 --- a/dockerfiles/reservations-api.yaml +++ b/dockerfiles/reservations-api.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: bitnami/mongodb:4.4 tmpfs: @@ -31,3 +32,4 @@ services: + diff --git a/dockerfiles/session-service.yaml b/dockerfiles/session-service.yaml index 41e49a03b..8842758fd 100644 --- a/dockerfiles/session-service.yaml +++ b/dockerfiles/session-service.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: mongo:6.0 tmpfs: @@ -21,3 +22,4 @@ services: + diff --git a/dockerfiles/spring-rest-example.yaml b/dockerfiles/spring-rest-example.yaml index 03f068903..35c6a8bc7 100644 --- a/dockerfiles/spring-rest-example.yaml +++ b/dockerfiles/spring-rest-example.yaml @@ -13,9 +13,12 @@ services: # default env does not work on volumes # - ${JACOCODIR}:/jacoco depends_on: + db: - condition: service_healthy + condition: service_healthy + + db: image: mysql:8.0 tmpfs: @@ -30,9 +33,10 @@ services: healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost'] interval: 30s timeout: 30s retries: 3 + diff --git a/dockerfiles/tiltaksgjennomforing.yaml b/dockerfiles/tiltaksgjennomforing.yaml index f965cad18..5e763bad6 100644 --- a/dockerfiles/tiltaksgjennomforing.yaml +++ b/dockerfiles/tiltaksgjennomforing.yaml @@ -12,6 +12,7 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco + db: image: postgres:13.13 tmpfs: @@ -27,6 +28,7 @@ services: + mock-oauth2-server: image: ghcr.io/navikt/mock-oauth2-server:2.0.1 environment: diff --git a/dockerfiles/user-management.yaml b/dockerfiles/user-management.yaml index 4c8b430a6..24fc5e938 100644 --- a/dockerfiles/user-management.yaml +++ b/dockerfiles/user-management.yaml @@ -13,9 +13,12 @@ services: # default env does not work on volumes # - ${JACOCODIR}:/jacoco depends_on: + db: - condition: service_healthy + condition: service_healthy + + db: image: mysql:8.0 tmpfs: @@ -30,9 +33,10 @@ services: healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost'] interval: 30s timeout: 30s retries: 3 + diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh b/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh index 4dae7dbfb..f869ce484 100644 --- a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh +++ b/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh @@ -1,4 +1,3 @@ #!/bin/bash -# Import from fixtures mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray \ No newline at end of file diff --git a/scripts/dockerize/data/additional_files/tiltaksgjennomforing-api/mockoauth2.json b/scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json similarity index 100% rename from scripts/dockerize/data/additional_files/tiltaksgjennomforing-api/mockoauth2.json rename to scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json diff --git a/scripts/dockerize/data/sut.csv b/scripts/dockerize/data/sut.csv index 609354576..2b1dda76a 100644 --- a/scripts/dockerize/data/sut.csv +++ b/scripts/dockerize/data/sut.csv @@ -1,34 +1,35 @@ -NAME,Dockerized,JVM_PARAMETERS,INPUT_PARAMETERS,SWAGGER_URL,TARGET_URL,COPY_ADDITIONAL_FILES,DATABASE_IMAGE_NAME,DATABASE_PORT,TMP_FS,DATABASE_ENVIRONMENT,DATABASE_VOLUME,MOCK_OAUTH,HEALTH_CHECK,HEALTH_CHECK_COMMAND -familie-ba-sak,TRUE,-DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoint.no:8080 -DAZURE_OPENID_CONFIG_TOKEN_ENDPOINT=bar -DAZURE_APP_CLIENT_ID=bar -DNAIS_APP_NAME=bar -DUNLEASH_SERVER_API_URL=http://fake-unleash-server-api.no:8080 -DUNLEASH_SERVER_API_TOKEN=bar -DBA_SAK_CLIENT_ID=some-audience,"--server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:8083/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a",http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,postgres:13.13,5432,/var/lib/postgresql/data,POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: familiebasak,,TRUE,FALSE, -pay-publicapi,TRUE,-Ddw.server.applicationConnectors[0].port=8080 -Ddw.server.adminConnectors[0].port=0 -Ddw.redis.endpoint=db:6379,server em_config.yaml,http://localhost:8080/assets/swagger.json,http://localhost:8080,TRUE,redis:7.2.3,6379,,,,FALSE,FALSE, -session-service,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,mongo:6.0,27017,/data/db,,,FALSE,FALSE, -bibliothek,TRUE,"",--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.storagePath=./tmp/bibliothek/,http://localhost:8080/openapi,http://localhost:8080,FALSE,mongo:6,27017,/data/db,,,FALSE,FALSE, -reservations-api,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.jwt.secret=abcdef012345678901234567890123456789abcdef012345678901234567890123456789,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,bitnami/mongodb:4.4,27017,/bitnami/mongodb,MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes,../scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json,FALSE,FALSE, -catwatch,TRUE,-Dserver.port=8080 -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password,"",http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -cwa-verification,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.datasource.username=sa -Dspring.datasource.password,"--server.port=8080 --spring.profiles.active=local,external,internal --management.server.port=-1 --server.ssl.enabled=false --cwa-testresult-server.url=http://cwa-testresult-server:8088",http://localhost:8080/api-docs.json,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -features-service,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password,--server.port=8080,http://localhost:8080/swagger.json,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -gestaohospital,TRUE,"",--server.port=8080 --liquibase.enabled=false --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.datasource.username=sa --spring.datasource.password --dg-toolkit.derby.port=0 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,mongo:6,27017,/data/db,,,FALSE,FALSE, -languagetool,TRUE,"",--port 8080 --public,http://localhost:8080/v2/swagger,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -ocvn,TRUE,-Dliquibase.enabled=false -Dspring.data.mongodb.uri=mongodb://db:27017/mongo_db -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.jpa.properties.hibernate.enable_lazy_load_no_trans=true -Dspring.datasource.username=sa -Dspring.datasource.password -Ddg-toolkit.derby.port=0 -Dspring.cache.type=NONE -Dspring.datasource.data=file:./init_db.sql,--server.port=8080,http://localhost:8080/v2/api-docs?group=1ocDashboardsApi,http://localhost:8080,TRUE,mongo:3.2,27017,/data/db,,,FALSE,FALSE, -proxyprint,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password -Dspring.jpa.show-sql=false -Dspring.jpa.hibernate.ddl-auto=create-drop -Xmx4G,--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,,,"",,,FALSE,FALSE, -rest-ncs,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -rest-news,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -rest-scs,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -restcountries,TRUE,"",--server.port=8080,http://localhost:8080/openapi.yaml,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -scout-api,TRUE,"",server scout_api_evomaster.yml,http://localhost:8080/api/swagger.json,http://localhost:8080,TRUE,,,,,,FALSE,FALSE, -genome-nexus,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,mongo:3.6.2,27017,/data/db,,,FALSE,FALSE, -market,TRUE,"-Dspring.datasource.url=""jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1"" -Dspring.datasource.username=sa -Dspring.datasource.password",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -blogapi,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql://db:3306/blogapi?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true""",http://localhost:8080/blogapi.json,http://localhost:8080,FALSE,mysql:8.0,3306,/var/lib/mysql,MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: blogapi,../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/docker-entrypoint-initdb.d/blogapi.sql;../scripts/dockerize/data/additional_files/blogapi/data.sql:/docker-entrypoint-initdb.d/data.sql,FALSE,TRUE,"""CMD""; ""mysqladmin""; ""ping""; ""-h""; ""localhost""" -user-management,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql://db:3306/users?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,mysql:8.0,3306,/var/lib/mysql,MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: users,,FALSE,TRUE,"""CMD""; ""mysqladmin""; ""ping""; ""-h""; ""localhost""" -youtube-mock,TRUE,"",--server.port=8080,http://localhost:8080/swagger.yaml,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -person-controller,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017 --spring.cache.type=None,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,mongo:7.0,27017,/data/db,,,FALSE,FALSE, -tracking-system,TRUE,"","--server.port=8080 --spring.profiles.active=dev --spring.datasource.url=""jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/app/v2/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -tiltaksgjennomforing,TRUE,"",--server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:8083/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:8083/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:8083/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO,http://localhost:8080/tiltaksgjennomforing-api/v3/api-docs,http://localhost:8080,FALSE,postgres:13.13,5432,/var/lib/postgresql/data,POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: tiltaksgjennomforing,,TRUE,FALSE, -ohsome-api,TRUE,"",--server.port=8080 --database.db=heidelberg,http:///localhost:8080/docs?group=Data%20Aggregation,http://localhost:8080,TRUE,,,,,,FALSE,FALSE, -spring-batch-rest,TRUE,"",--server.port=8080 --spring.batch.job.enabled=false --lastNamePrefix= --upperCase=false,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -spring-rest-example,TRUE,"","--server.port=8080 --spring.datasource.username=root --spring.datasource.password=root --spring.datasource.url=""jdbc:mysql://db:3306/example?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,mysql:8.0,3306,/var/lib/mysql,MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: example,,FALSE,TRUE,"""CMD""; ""mysqladmin""; ""ping""; ""-h""; ""localhost""" -erc20-rest-service,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -spring-actuator-demo,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, -webgoat,TRUE,"-Drunning.in.docker=true","--webgoat.port=8080 --webwolf.port=8081 --server.address=""0.0.0.0"" --spring.profiles.active=dev --spring.datasource.driver-class-name=org.h2.Driver --spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect --spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=none --spring.sql.init.mode=never --spring.datasource.url=""jdbc:h2:file:./test"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/WebGoat/v3/api-docs,http://localhost:8080,TRUE,,,,,,FALSE,FALSE, -swagger-petstore,TRUE,"","8080",http://localhost:8080/api/v3/openapi.json,http://localhost:8080,TRUE,,,,,,FALSE,FALSE, -http-patch-spring,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,,,,,,FALSE,FALSE, +NAME,Dockerized,JVM_PARAMETERS,INPUT_PARAMETERS,SWAGGER_URL,TARGET_URL,COPY_ADDITIONAL_FILES,MOCK_OAUTH,DEPENDS_ON,SERVICES +familie-ba-sak,TRUE,-DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoint.no:8080 -DAZURE_OPENID_CONFIG_TOKEN_ENDPOINT=bar -DAZURE_APP_CLIENT_ID=bar -DNAIS_APP_NAME=bar -DUNLEASH_SERVER_API_URL=http://fake-unleash-server-api.no:8080 -DUNLEASH_SERVER_API_TOKEN=bar -DBA_SAK_CLIENT_ID=some-audience,--server.port=8080 --spring.profiles.active=dev --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/familiebasak --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --funksjonsbrytere.kafka.producer.enabled=false --funksjonsbrytere.enabled=false --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO --no.nav.security.jwt.issuer.azuread.discoveryurl=http://mock-oauth2-server:8083/azuread/.well-known/openid-configuration --prosessering.rolle=928636f4-fd0d-4149-978e-a6fb68bb19de --FAMILIE_EF_SAK_API_URL=http://fake-familie-ef-sak/api --FAMILIE_KLAGE_URL=http://fake-familie-klage --FAMILIE_BREV_API_URL=http://fake-familie-brev --FAMILIE_BA_INFOTRYGD_FEED_API_URL=http://fake-familie-ba-infotrygd-feed/api --FAMILIE_BA_INFOTRYGD_API_URL=http://fake-familie-ba-infotrygd --FAMILIE_TILBAKE_API_URL=http://fake-familie-tilbake/api --PDL_URL=http://fake-pdl-api.default --FAMILIE_INTEGRASJONER_API_URL=http://fake-familie-integrasjoner/api --FAMILIE_OPPDRAG_API_URL=http://fake-familie-oppdrag/api --SANITY_FAMILIE_API_URL=http://fake-xsrv1mh6.apicdn.sanity.io/v2021-06-07/data/query/ba-brev --ECB_API_URL=http://fake-data-api.ecb.europa.eu/service/data/EXR/ --rolle.veileder=93a26831-9866-4410-927b-74ff51a9107c --rolle.saksbehandler=d21e00a4-969d-4b28-8782-dc818abfae65 --rolle.beslutter=9449c153-5a1e-44a7-84c6-7cc7a8867233 --rolle.forvalter=c62e908a-cf20-4ad0-b7b3-3ff6ca4bf38b --rolle.kode6=5ef775f2-61f8-4283-bf3d-8d03f428aa14 --rolle.kode7=ea930b6b-9397-44d9-b9e6-f4cf527a632a,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""port"": 5432.0, ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: familiebasak"", ""volume"": """", ""health_check_command"": """"}]" +pay-publicapi,TRUE,-Ddw.server.applicationConnectors[0].port=8080 -Ddw.server.adminConnectors[0].port=0 -Ddw.redis.endpoint=db:6379,server em_config.yaml,http://localhost:8080/assets/swagger.json,http://localhost:8080,TRUE,FALSE,"","[{""image_name"": ""redis:7.2.3"", ""port"": 6379.0, ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]" +session-service,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]" +bibliothek,TRUE,"",--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.storagePath=./tmp/bibliothek/,http://localhost:8080/openapi,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]" +reservations-api,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.jwt.secret=abcdef012345678901234567890123456789abcdef012345678901234567890123456789,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""bitnami/mongodb:4.4"", ""port"": 27017.0, ""tmp_fs"": ""/bitnami/mongodb"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/reservations-api/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/reservations-api/init.json:/fixtures/init.json"", ""health_check_command"": """"}]" +catwatch,TRUE,-Dserver.port=8080 -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password,"",http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"", +cwa-verification,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.datasource.username=sa -Dspring.datasource.password,"--server.port=8080 --spring.profiles.active=local,external,internal --management.server.port=-1 --server.ssl.enabled=false --cwa-testresult-server.url=http://cwa-testresult-server:8088",http://localhost:8080/api-docs.json,http://localhost:8080,FALSE,FALSE,"", +features-service,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password,--server.port=8080,http://localhost:8080/swagger.json,http://localhost:8080,FALSE,FALSE,"", +gestaohospital,TRUE,"",--server.port=8080 --liquibase.enabled=false --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.datasource.username=sa --spring.datasource.password --dg-toolkit.derby.port=0 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:6"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]" +languagetool,TRUE,"",--port 8080 --public,http://localhost:8080/v2/swagger,http://localhost:8080,FALSE,FALSE,"", +ocvn,TRUE,-Dliquibase.enabled=false -Dspring.data.mongodb.uri=mongodb://db:27017/mongo_db -Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.datasource.driver-class-name=org.h2.Driver -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.jpa.properties.hibernate.enable_lazy_load_no_trans=true -Dspring.datasource.username=sa -Dspring.datasource.password -Ddg-toolkit.derby.port=0 -Dspring.cache.type=NONE -Dspring.datasource.data=file:./init_db.sql,--server.port=8080,http://localhost:8080/v2/api-docs?group=1ocDashboardsApi,http://localhost:8080,TRUE,FALSE,"","[{""image_name"": ""mongo:3.2"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]" +proxyprint,TRUE,-Dspring.datasource.url=jdbc:h2:mem:testdb -Dspring.jpa.database-platform=org.hibernate.dialect.H2Dialect -Dspring.datasource.username=sa -Dspring.datasource.password -Dspring.jpa.show-sql=false -Dspring.jpa.hibernate.ddl-auto=create-drop -Xmx4G,--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"", +rest-ncs,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"", +rest-news,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"", +rest-scs,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"", +restcountries,TRUE,"",--server.port=8080,http://localhost:8080/openapi.yaml,http://localhost:8080,FALSE,FALSE,"", +scout-api,TRUE,"",server scout_api_evomaster.yml,http://localhost:8080/api/swagger.json,http://localhost:8080,TRUE,FALSE,"", +genome-nexus,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:3.6.2"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]" +market,TRUE,"-Dspring.datasource.url=""jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1"" -Dspring.datasource.username=sa -Dspring.datasource.password",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"", +blogapi,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql://db:3306/blogapi?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true""",http://localhost:8080/blogapi.json,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""port"": 3306.0, ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: blogapi"", ""volume"": ""../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/docker-entrypoint-initdb.d/blogapi.sql;../scripts/dockerize/data/additional_files/blogapi/data.sql:/docker-entrypoint-initdb.d/data.sql"", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]" +user-management,TRUE,"","--server.port=8080 --spring.datasource.url=""jdbc:mysql://db:3306/users?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""port"": 3306.0, ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: users"", ""volume"": """", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]" +youtube-mock,TRUE,"",--server.port=8080,http://localhost:8080/swagger.yaml,http://localhost:8080,FALSE,FALSE,"", +person-controller,TRUE,"",--server.port=8080 --spring.data.mongodb.uri=mongodb://db:27017 --spring.cache.type=None,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""image_name"": ""mongo:7.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": """", ""volume"": """", ""health_check_command"": """"}]" +tracking-system,TRUE,"","--server.port=8080 --spring.profiles.active=dev --spring.datasource.url=""jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/app/v2/api-docs,http://localhost:8080,FALSE,FALSE,"", +tiltaksgjennomforing,TRUE,"",--server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:8083/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:8083/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:8083/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO,http://localhost:8080/tiltaksgjennomforing-api/v3/api-docs,http://localhost:8080,FALSE,TRUE,"","[{""image_name"": ""postgres:13.13"", ""port"": 5432, ""tmp_fs"": ""/var/lib/postgresql/data"", ""environment"": ""POSTGRES_PASSWORD: password;POSTGRES_HOST_AUTH_METHOD: trust;POSTGRES_DB: tiltaksgjennomforing"", ""volume"": """", ""health_check_command"": """"}]" +ohsome-api,TRUE,"",--server.port=8080 --database.db=heidelberg,http:///localhost:8080/docs?group=Data%20Aggregation,http://localhost:8080,TRUE,FALSE,"", +spring-batch-rest,TRUE,"",--server.port=8080 --spring.batch.job.enabled=false --lastNamePrefix= --upperCase=false,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"", +spring-rest-example,TRUE,"","--server.port=8080 --spring.datasource.username=root --spring.datasource.password=root --spring.datasource.url=""jdbc:mysql://db:3306/example?useSSL=false&allowPublicKeyRetrieval=true""",http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"db","[{""image_name"": ""mysql:8.0"", ""port"": 3306.0, ""tmp_fs"": ""/var/lib/mysql"", ""environment"": ""MYSQL_ROOT_PASSWORD: root;MYSQL_DATABASE: example"", ""volume"": """", ""health_check_command"": [""CMD"", ""mysqladmin"", ""ping"", ""-h"", ""localhost""]}]" +erc20-rest-service,TRUE,"",--server.port=8080,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"", +spring-actuator-demo,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"", +webgoat,TRUE,-Drunning.in.docker=true,"--webgoat.port=8080 --webwolf.port=8081 --server.address=""0.0.0.0"" --spring.profiles.active=dev --spring.datasource.driver-class-name=org.h2.Driver --spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect --spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=none --spring.sql.init.mode=never --spring.datasource.url=""jdbc:h2:file:./test"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/WebGoat/v3/api-docs,http://localhost:8080,TRUE,FALSE,"", +swagger-petstore,TRUE,"",8080,http://localhost:8080/api/v3/openapi.json,http://localhost:8080,TRUE,FALSE,"", +http-patch-spring,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"", +angular-ecommerce,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elsticsearch.cluster-nodes=elastic:9300 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json"", ""health_check_command"": """"}, {""name"": ""redis"", ""image_name"": ""redis:7.0.11"", ""port"": 6379, ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}, {""name"": ""elasticsearch"",""image_name"": ""docker.elastic.co/elasticsearch/elasticsearch:6.8.23"", ""port"": 9300, ""tmp_fs"": ""/usr/share/elasticsearch/data"", ""environment"": ""- discovery.type=single-node;- cluster.name=elasticsearch;- ES_JAVA_OPTS=-Xms512m -Xmx512m;- xpack.security.enabled=false"", ""volume"": """", ""health_check_command"": """"}]" diff --git a/scripts/dockerize/docker_generator.py b/scripts/dockerize/docker_generator.py index 2e41bfe16..072975609 100644 --- a/scripts/dockerize/docker_generator.py +++ b/scripts/dockerize/docker_generator.py @@ -1,3 +1,4 @@ +import json import os import sys @@ -54,16 +55,9 @@ def __init__(self, sut_name, expose_port): self.swagger_url = str(sut[1]['SWAGGER_URL']) if str(sut[1]['SWAGGER_URL']) != 'nan' else '' self.target_url = str(sut[1]['TARGET_URL']) if str(sut[1]['TARGET_URL']) != 'nan' else '' self.copy_additional_files = bool(sut[1]['COPY_ADDITIONAL_FILES']) - self.database_types = str(sut_info[1]['DATABASE']).split(';') if str(sut_info[1]['DATABASE']) != 'nan' else None - self.database_image = str(sut[1]['DATABASE_IMAGE_NAME']) if str(sut[1]['DATABASE_IMAGE_NAME']) != 'nan' else '' - self.database_port = int(sut[1]['DATABASE_PORT']) if str(sut[1]['DATABASE_PORT']) != 'nan' else '' - self.tmp_fs = str(sut[1]['TMP_FS']) if str(sut[1]['TMP_FS']) != 'nan' else '' - self.database_environments = str(sut[1]['DATABASE_ENVIRONMENT']).split(';') if str(sut[1]['DATABASE_ENVIRONMENT']) != 'nan' else None - self.database_volumes = str(sut[1]['DATABASE_VOLUME']).split(';') if str(sut[1]['DATABASE_VOLUME']) != 'nan' else None self.is_mock_oauth = bool(sut[1]['MOCK_OAUTH']) - self.health_check = bool(sut[1]['HEALTH_CHECK']) - self.health_check_commands = str(sut[1]['HEALTH_CHECK_COMMAND']).split(';') if str(sut[1]['HEALTH_CHECK_COMMAND']) != 'nan' else '' - + self.database_config = json.loads(sut[1]['SERVICES']) if str(sut[1]['SERVICES']) != 'nan' else [] + self.depends_on = str(sut[1]['DEPENDS_ON']).split(';') if str(sut[1]['DEPENDS_ON']) != 'nan' else [] # def prepare_run_docker(self): # # prepare the required files # shutil.copy(self.jacoco_env_file_path, self.DOCKER_FILE_FOLDER) @@ -131,27 +125,27 @@ def generate_docker_compose(self): 'SUT_NAME': self.sut_name, 'EXPOSE_PORT': self.expose_port, 'MOCK_OAUTH': self.is_mock_oauth, - 'HEALTH_CHECK': self.health_check, + 'DEPENDS_ON': self.depends_on } - if self.database_types and any(db in ['PostgreSQL', 'MySQL', 'Redis', 'MongoDB'] for db in self.database_types): - database_template = self.template_env.get_template("db.template") - if self.health_check: - health_chec_command = ",".join(self.health_check_commands) - else: - health_chec_command = "" + database_template = self.template_env.get_template("db.template") + db_images = [] + for db in self.database_config: + health_check_command = db['health_check_command'] + database_params = { - 'DATABASE_IMAGE_NAME': self.database_image, - 'DATABASE_PORT': self.database_port, - 'TMP_FS': self.tmp_fs, - 'DATABASE_ENVIRONMENT': self.database_environments, - 'DATABASE_VOLUME': self.database_volumes, - 'HEALTH_CHECK': self.health_check, - 'HEALTH_CHECK_COMMAND': health_chec_command + 'name': db['name'] if 'name' in db else 'db', + 'DATABASE_IMAGE_NAME': db['image_name'], + 'DATABASE_PORT': db['port'], + 'TMP_FS': db['tmp_fs'], + 'DATABASE_ENVIRONMENT': str(db['environment']).split(';') if str(db['environment']) != '' else None, + 'DATABASE_VOLUME': str(db['volume']).split(';') if str(db['volume']) != '' else None, + 'HEALTH_CHECK': health_check_command != "", + 'HEALTH_CHECK_COMMAND': health_check_command } database_image = database_template.render(database_params) - params['MONGODB_DATABASE'] = database_image - + db_images.append(database_image) + params['DATABASES'] = db_images template = self.template_env.get_template("template.docker-compose.yml") result = template.render(params) diff --git a/scripts/dockerize/templates/db.template b/scripts/dockerize/templates/db.template index 1d2fbadb8..cb03dadb0 100644 --- a/scripts/dockerize/templates/db.template +++ b/scripts/dockerize/templates/db.template @@ -1,4 +1,4 @@ - db: + {{name}}: image: {{DATABASE_IMAGE_NAME}} {% if TMP_FS -%} tmpfs: @@ -18,7 +18,7 @@ {% endif %} {% if HEALTH_CHECK %} healthcheck: - test: [{{HEALTH_CHECK_COMMAND}}] + test: {{HEALTH_CHECK_COMMAND}} interval: 30s timeout: 30s retries: 3 diff --git a/scripts/dockerize/templates/template.docker-compose.yml b/scripts/dockerize/templates/template.docker-compose.yml index b75c5c4d3..e651317a6 100644 --- a/scripts/dockerize/templates/template.docker-compose.yml +++ b/scripts/dockerize/templates/template.docker-compose.yml @@ -12,12 +12,16 @@ services: # volumes: # default env does not work on volumes # - ${JACOCODIR}:/jacoco - {%- if HEALTH_CHECK %} + {%- if DEPENDS_ON | length > 0 %} depends_on: - db: - condition: service_healthy + {% for depends in DEPENDS_ON %} + {{depends}}: + condition: service_healthy + {% endfor %} {% endif %} -{{ MONGODB_DATABASE if MONGODB_DATABASE }} +{% for db_block in DATABASES %} +{{ db_block }} +{% endfor %} {%- if MOCK_OAUTH %} mock-oauth2-server: image: ghcr.io/navikt/mock-oauth2-server:2.0.1 From 581318513c45c239c5ed3a0593de578629732e89 Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 17 Jul 2025 14:59:28 +0200 Subject: [PATCH 06/13] elasticsearch service --- auth/angular-ecommerce-auth.yaml | 17 +++++++++++++++++ .../config/ElasticSearchConfig.java | 12 ++++++++++-- .../src/main/resources/application.properties | 8 ++++++++ .../ecommerce/EmbeddedEvoMasterController.java | 5 ++++- .../ecommerce/ExternalEvoMasterController.java | 7 +++++-- .../angular-ecommerce/mongo_import.sh | 1 - 6 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 auth/angular-ecommerce-auth.yaml diff --git a/auth/angular-ecommerce-auth.yaml b/auth/angular-ecommerce-auth.yaml new file mode 100644 index 000000000..8badeb093 --- /dev/null +++ b/auth/angular-ecommerce-auth.yaml @@ -0,0 +1,17 @@ +auth: + - name: user1 + loginEndpointAuth: + payloadRaw: "{\"username\": \"user1\", \"password\": \"12345678\"}" + - name: user2 + loginEndpointAuth: + payloadRaw: "{\"username\": \"user2\", \"password\": \"12345678\"}" + +authTemplate: + loginEndpointAuth: + endpoint: /api/auth/login + verb: POST + contentType: application/json + token: + extractFromField: /accessToken + httpHeaderName: Authorization + headerPrefix: "Bearer " diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java index d7583d884..ca8a7c630 100644 --- a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java +++ b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java @@ -11,18 +11,26 @@ import java.net.InetAddress; import java.net.UnknownHostException; +import org.springframework.beans.factory.annotation.Value; @Configuration @EnableElasticsearchRepositories public class ElasticSearchConfig { +// MODIFIED + @Value("${spring.data.elasticsearch.host}") + private String host; + + // MODIFIED + @Value("${spring.data.elasticsearch.port}") + private int port; @Bean public Client client() { System.setProperty("es.set.netty.runtime.available.processors", "false"); try { return new PreBuiltTransportClient(Settings.EMPTY) - .addTransportAddress(new TransportAddress(InetAddress.getByName("localhost"), 9300)); - + // MODIFIED + .addTransportAddress(new TransportAddress(InetAddress.getByName(host), port)); } catch (UnknownHostException e) { throw new SpringStoreException("An error occured when configuring Elastic Search"); } diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties index cbc44bd30..709ce0eca 100644 --- a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties +++ b/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties @@ -20,5 +20,13 @@ spring.redis.port=6379 spring.data.elasticsearch.repositories.enabled=true spring.data.elasticsearch.cluster-name=elasticsearch spring.data.elasticsearch.cluster-nodes=localhost:9300 +# MODIFIED +spring.data.elasticsearch.host=localhost +spring.data.elasticsearch.port=9300 +spring.elasticsearch.rest.uris=http://localhost:9200 +management.endpoint.health.show-details=always +management.endpoints.web.exposure.include=health,info +# MODIFIED + ########################################################################## account.verification.url=http://localhost:8080/api/auth/accountVerification \ No newline at end of file diff --git a/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java index 5cf41c771..b090eeb8f 100644 --- a/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java +++ b/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java @@ -115,7 +115,10 @@ public String startSut() { "--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT), "--spring.data.elasticsearch.cluster-name=elasticsearch", "--spring.data.elasticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT), - "--spring.cache.type=NONE" + "--spring.elasticsearch.rest.uris=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(HTTP_PORT), + "--spring.cache.type=NONE", + "--spring.data.elasticsearch.host=" + elasticsearchContainer.getContainerIpAddress(), + "--spring.data.elasticsearch.port=" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT) }); return "http://localhost:" + getSutPort(); diff --git a/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java index f729f2149..61acd3527 100644 --- a/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java +++ b/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java @@ -138,8 +138,11 @@ public String[] getInputParameters() { "--spring.redis.port=" + redisContainer.getMappedPort(REDIS_PORT), "--spring.data.elasticsearch.cluster-name=elasticsearch", "--spring.data.elasticsearch.cluster-nodes=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT), - "--spring.cache.type=NONE" - }; + "--spring.elasticsearch.rest.uris=" + elasticsearchContainer.getContainerIpAddress() + ":" + elasticsearchContainer.getMappedPort(HTTP_PORT), + "--spring.cache.type=NONE", + "--spring.data.elasticsearch.host=" + elasticsearchContainer.getContainerIpAddress(), + "--spring.data.elasticsearch.port=" + elasticsearchContainer.getMappedPort(TRANSPORT_PORT) + }; } public String[] getJVMParameters() { diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh b/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh index 4dae7dbfb..f869ce484 100644 --- a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh +++ b/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh @@ -1,4 +1,3 @@ #!/bin/bash -# Import from fixtures mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray \ No newline at end of file From e646bb2e35915dea68e3f8d0e6ac6746164d4c9a Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 17 Jul 2025 15:08:57 +0200 Subject: [PATCH 07/13] angular-ecommerce service fixes --- dockerfiles/angular-ecommerce.dockerfile | 2 +- scripts/dockerize/data/sut.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/angular-ecommerce.dockerfile b/dockerfiles/angular-ecommerce.dockerfile index 66f4da708..857308566 100644 --- a/dockerfiles/angular-ecommerce.dockerfile +++ b/dockerfiles/angular-ecommerce.dockerfile @@ -14,4 +14,4 @@ ENTRYPOINT \ # -javaagent:jacocoagent.jar=destfile=./jacoco/angular-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \ -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \ -Dfile.encoding=ISO-8859-1 -jar angular-ecommerce-sut.jar \ - --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elsticsearch.cluster-nodes=elastic:9300 --spring.cache.type=NONE \ No newline at end of file + --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE \ No newline at end of file diff --git a/scripts/dockerize/data/sut.csv b/scripts/dockerize/data/sut.csv index 2b1dda76a..e4588aa99 100644 --- a/scripts/dockerize/data/sut.csv +++ b/scripts/dockerize/data/sut.csv @@ -32,4 +32,4 @@ spring-actuator-demo,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-doc webgoat,TRUE,-Drunning.in.docker=true,"--webgoat.port=8080 --webwolf.port=8081 --server.address=""0.0.0.0"" --spring.profiles.active=dev --spring.datasource.driver-class-name=org.h2.Driver --spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect --spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=none --spring.sql.init.mode=never --spring.datasource.url=""jdbc:h2:file:./test"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/WebGoat/v3/api-docs,http://localhost:8080,TRUE,FALSE,"", swagger-petstore,TRUE,"",8080,http://localhost:8080/api/v3/openapi.json,http://localhost:8080,TRUE,FALSE,"", http-patch-spring,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"", -angular-ecommerce,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elsticsearch.cluster-nodes=elastic:9300 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json"", ""health_check_command"": """"}, {""name"": ""redis"", ""image_name"": ""redis:7.0.11"", ""port"": 6379, ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}, {""name"": ""elasticsearch"",""image_name"": ""docker.elastic.co/elasticsearch/elasticsearch:6.8.23"", ""port"": 9300, ""tmp_fs"": ""/usr/share/elasticsearch/data"", ""environment"": ""- discovery.type=single-node;- cluster.name=elasticsearch;- ES_JAVA_OPTS=-Xms512m -Xmx512m;- xpack.security.enabled=false"", ""volume"": """", ""health_check_command"": """"}]" +angular-ecommerce,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json"", ""health_check_command"": """"}, {""name"": ""redis"", ""image_name"": ""redis:7.0.11"", ""port"": 6379, ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}, {""name"": ""elasticsearch"",""image_name"": ""docker.elastic.co/elasticsearch/elasticsearch:6.8.23"", ""port"": 9300, ""tmp_fs"": ""/usr/share/elasticsearch/data"", ""environment"": ""- discovery.type=single-node;- cluster.name=elasticsearch;- ES_JAVA_OPTS=-Xms512m -Xmx512m;- xpack.security.enabled=false"", ""volume"": """", ""health_check_command"": """"}]" From b922e49153854506fe75281041103f79cb5285cf Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 24 Jul 2025 00:16:29 +0200 Subject: [PATCH 08/13] drivers fix --- README.md | 4 ++-- ...ommerce-auth.yaml => spring-ecommerce-auth.yaml} | 0 dockerfiles/angular-ecommerce.dockerfile | 2 +- dockerfiles/angular-ecommerce.yaml | 8 ++++---- jdk_8_maven/cs/rest/original/pom.xml | 2 +- .../README.md | 0 .../{angular-ecommerce => spring-ecommerce}/pom.xml | 2 +- .../NgSpringShoppingStoreApplication.java | 0 .../shoppingstore/config/AppSecurityConfig.java | 0 .../config/CustomAccessDeniedHandler.java | 0 .../shoppingstore/config/ElasticSearchConfig.java | 0 .../com/techie/shoppingstore/config/MailConfig.java | 0 .../techie/shoppingstore/config/SwaggerConfig.java | 0 .../config/UnauthorizedEntryPoint.java | 0 .../com/techie/shoppingstore/config/WebConfig.java | 0 .../shoppingstore/controller/AdminController.java | 0 .../shoppingstore/controller/AuthController.java | 0 .../shoppingstore/controller/CartController.java | 0 .../shoppingstore/controller/CatalogController.java | 0 .../controller/ProductRatingController.java | 0 .../shoppingstore/dto/AuthenticationResponse.java | 0 .../com/techie/shoppingstore/dto/CategoryDto.java | 0 .../java/com/techie/shoppingstore/dto/FacetDto.java | 0 .../com/techie/shoppingstore/dto/FacetValueDto.java | 0 .../techie/shoppingstore/dto/LoginRequestDto.java | 0 .../shoppingstore/dto/ProductAvailability.java | 0 .../com/techie/shoppingstore/dto/ProductDto.java | 0 .../techie/shoppingstore/dto/ProductRatingDto.java | 0 .../shoppingstore/dto/ProductSearchResponseDto.java | 0 .../shoppingstore/dto/RegisterRequestDto.java | 0 .../techie/shoppingstore/dto/SearchQueryDto.java | 0 .../shoppingstore/exceptions/ApiResponse.java | 0 .../SpringShoppingStoreExceptionHandler.java | 0 .../exceptions/SpringStoreException.java | 0 .../com/techie/shoppingstore/model/Category.java | 0 .../shoppingstore/model/ElasticSearchProduct.java | 0 .../java/com/techie/shoppingstore/model/Mail.java | 0 .../com/techie/shoppingstore/model/Product.java | 0 .../shoppingstore/model/ProductAttribute.java | 0 .../techie/shoppingstore/model/ProductRating.java | 0 .../techie/shoppingstore/model/ShoppingCart.java | 0 .../shoppingstore/model/ShoppingCartItem.java | 0 .../java/com/techie/shoppingstore/model/User.java | 0 .../shoppingstore/model/VerificationToken.java | 0 .../shoppingstore/repository/CartRepository.java | 0 .../repository/CategoryRepository.java | 0 .../shoppingstore/repository/ProductRepository.java | 0 .../repository/ProductSearchRepository.java | 0 .../shoppingstore/repository/UserRepository.java | 0 .../repository/VerificationTokenRepository.java | 0 .../techie/shoppingstore/service/AuthService.java | 0 .../techie/shoppingstore/service/CartService.java | 0 .../shoppingstore/service/CategoryService.java | 0 .../service/JWTAuthenticationFilter.java | 0 .../shoppingstore/service/JwtTokenProvider.java | 0 .../shoppingstore/service/MailContentBuilder.java | 0 .../techie/shoppingstore/service/MailService.java | 0 .../techie/shoppingstore/service/ProductMapper.java | 0 .../shoppingstore/service/ProductService.java | 0 .../shoppingstore/service/ResponseSerializer.java | 0 .../techie/shoppingstore/service/SearchService.java | 0 .../service/UserDetailServiceImpl.java | 0 .../techie/shoppingstore/service/UserPrincipal.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/auth.jks | Bin .../src/main/resources/export/Category.json | 0 .../src/main/resources/export/Copy_of_Product.json | 0 .../src/main/resources/export/Product.json | 0 .../src/main/resources/export/User.json | 0 .../main/resources/export/VerificationToken.json | 0 .../src/main/resources/export/query.json | 0 .../resources/images/category-page-with-filters.PNG | Bin .../src/main/resources/images/category-page.PNG | Bin .../src/main/resources/images/homepage.PNG | Bin .../images/product-page-description-section.PNG | Bin .../images/product-page-review-section.PNG | Bin .../src/main/resources/images/product-page.PNG | Bin .../src/main/resources/images/search-page.PNG | Bin .../src/main/resources/templates/mailTemplate.html | 0 .../NgSpringShoppingStoreApplicationTests.java | 0 jdk_8_maven/em/embedded/rest/pom.xml | 2 +- .../{angular-ecommerce => spring-ecommerce}/pom.xml | 2 +- .../ecommerce/EmbeddedEvoMasterController.java | 2 +- jdk_8_maven/em/external/rest/pom.xml | 2 +- .../{angular-ecommerce => spring-ecommerce}/pom.xml | 6 +++--- .../ecommerce/ExternalEvoMasterController.java | 6 +++--- scripts/dist.py | 4 ++-- .../init.json | 0 .../mongo_import.sh | 0 statistics/data.csv | 2 +- statistics/table_emb.md | 2 +- 91 files changed, 23 insertions(+), 23 deletions(-) rename auth/{angular-ecommerce-auth.yaml => spring-ecommerce-auth.yaml} (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/README.md (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/pom.xml (99%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/NgSpringShoppingStoreApplication.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/config/CustomAccessDeniedHandler.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/config/MailConfig.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/config/UnauthorizedEntryPoint.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/config/WebConfig.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/controller/AdminController.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/controller/AuthController.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/controller/CartController.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/controller/CatalogController.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/controller/ProductRatingController.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/AuthenticationResponse.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/CategoryDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/FacetDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/FacetValueDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/LoginRequestDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/ProductAvailability.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/ProductDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/ProductRatingDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/ProductSearchResponseDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/RegisterRequestDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/dto/SearchQueryDto.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/exceptions/ApiResponse.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/exceptions/SpringShoppingStoreExceptionHandler.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/exceptions/SpringStoreException.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/Category.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/ElasticSearchProduct.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/Mail.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/Product.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/ProductAttribute.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/ProductRating.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/ShoppingCart.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/ShoppingCartItem.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/User.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/model/VerificationToken.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/repository/CartRepository.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/repository/CategoryRepository.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/repository/ProductRepository.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/repository/ProductSearchRepository.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/repository/UserRepository.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/repository/VerificationTokenRepository.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/AuthService.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/CartService.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/CategoryService.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/JWTAuthenticationFilter.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/JwtTokenProvider.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/MailContentBuilder.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/MailService.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/ProductMapper.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/ProductService.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/ResponseSerializer.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/SearchService.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/UserDetailServiceImpl.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/java/com/techie/shoppingstore/service/UserPrincipal.java (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/application.properties (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/auth.jks (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/export/Category.json (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/export/Copy_of_Product.json (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/export/Product.json (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/export/User.json (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/export/VerificationToken.json (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/export/query.json (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/images/category-page-with-filters.PNG (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/images/category-page.PNG (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/images/homepage.PNG (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/images/product-page-description-section.PNG (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/images/product-page-review-section.PNG (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/images/product-page.PNG (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/images/search-page.PNG (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/main/resources/templates/mailTemplate.html (100%) rename jdk_8_maven/cs/rest/original/{angular-ecommerce => spring-ecommerce}/src/test/java/com/techie/shoppingstore/NgSpringShoppingStoreApplicationTests.java (100%) rename jdk_8_maven/em/embedded/rest/{angular-ecommerce => spring-ecommerce}/pom.xml (95%) rename jdk_8_maven/em/embedded/rest/{angular-ecommerce/src/main/java/em/embedded/angular => spring-ecommerce/src/main/java/em/embedded/spring}/ecommerce/EmbeddedEvoMasterController.java (99%) rename jdk_8_maven/em/external/rest/{angular-ecommerce => spring-ecommerce}/pom.xml (92%) rename jdk_8_maven/em/external/rest/{angular-ecommerce/src/main/java/em/external/angular => spring-ecommerce/src/main/java/em/external/spring}/ecommerce/ExternalEvoMasterController.java (98%) rename scripts/dockerize/data/additional_files/{angular-ecommerce => spring-ecommerce}/init.json (100%) rename scripts/dockerize/data/additional_files/{angular-ecommerce => spring-ecommerce}/mongo_import.sh (100%) diff --git a/README.md b/README.md index 841357a4e..bcf9fa659 100644 --- a/README.md +++ b/README.md @@ -72,8 +72,6 @@ For simplicity, all schemas are also available as JSON/YML files under the folde ### REST: Java/Kotlin (34) -* **Angular ECommerce** (not-known license), [jdk_8_maven/cs/rest/original/angular-ecommerce](jdk_8_maven/cs/rest/original/angular-ecommerce), from [https://github.com/SaiUpadhyayula/SpringAngularEcommerce](https://github.com/SaiUpadhyayula/SpringAngularEcommerce) - * **Bibliothek** (MIT), [jdk_17_gradle/cs/rest/bibliothek](jdk_17_gradle/cs/rest/bibliothek), from [https://github.com/PaperMC/bibliothek](https://github.com/PaperMC/bibliothek) * **Blog** (AGPL), [jdk_8_maven/cs/rest/original/blogapi](jdk_8_maven/cs/rest/original/blogapi), from [https://github.com/osopromadze/Spring-Boot-Blog-REST-API](https://github.com/osopromadze/Spring-Boot-Blog-REST-API) @@ -130,6 +128,8 @@ For simplicity, all schemas are also available as JSON/YML files under the folde * **Spring Boot Restful API Example** (MIT), [jdk_17_maven/cs/rest/spring-rest-example](jdk_17_maven/cs/rest/spring-rest-example), from [https://github.com/phantasmicmeans/spring-boot-restful-api-example](https://github.com/phantasmicmeans/spring-boot-restful-api-example) +* **Spring ECommerce** (not-known license), [jdk_8_maven/cs/rest/original/spring-ecommerce](jdk_8_maven/cs/rest/original/spring-ecommerce), from [https://github.com/SaiUpadhyayula/SpringAngularEcommerce](https://github.com/SaiUpadhyayula/SpringAngularEcommerce) + * **Swagger Petstore** (Apache), [jdk_8_maven/cs/rest/original/swagger-petstore](jdk_8_maven/cs/rest/original/swagger-petstore), from [https://github.com/swagger-api/swagger-petstore](https://github.com/swagger-api/swagger-petstore) * **Tiltaksgjennomføring** (MIT), [jdk_17_maven/cs/rest/tiltaksgjennomforing](jdk_17_maven/cs/rest/tiltaksgjennomforing), from [https://github.com/navikt/tiltaksgjennomforing-api](https://github.com/navikt/tiltaksgjennomforing-api) diff --git a/auth/angular-ecommerce-auth.yaml b/auth/spring-ecommerce-auth.yaml similarity index 100% rename from auth/angular-ecommerce-auth.yaml rename to auth/spring-ecommerce-auth.yaml diff --git a/dockerfiles/angular-ecommerce.dockerfile b/dockerfiles/angular-ecommerce.dockerfile index 66f4da708..6149f21cb 100644 --- a/dockerfiles/angular-ecommerce.dockerfile +++ b/dockerfiles/angular-ecommerce.dockerfile @@ -13,5 +13,5 @@ ENTRYPOINT \ # unfortunately dumponexit is completely unreliable in Docker :( # -javaagent:jacocoagent.jar=destfile=./jacoco/angular-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \ -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \ - -Dfile.encoding=ISO-8859-1 -jar angular-ecommerce-sut.jar \ + -Dfile.encoding=ISO-8859-1 -jar spring-ecommerce-sut.jar \ --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elsticsearch.cluster-nodes=elastic:9300 --spring.cache.type=NONE \ No newline at end of file diff --git a/dockerfiles/angular-ecommerce.yaml b/dockerfiles/angular-ecommerce.yaml index 0a32a587e..1a54b28db 100644 --- a/dockerfiles/angular-ecommerce.yaml +++ b/dockerfiles/angular-ecommerce.yaml @@ -1,7 +1,7 @@ services: - sut-angular-ecommerce: + sut-spring-ecommerce: build: - dockerfile: ./dockerfiles/angular-ecommerce.dockerfile + dockerfile: ./dockerfiles/spring-ecommerce.dockerfile context: .. # environment: # TOOL: ${TOOL:-undefined} @@ -26,8 +26,8 @@ services: volumes: - - ../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh - - ../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json + - ../scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh + - ../scripts/dockerize/data/additional_files/spring-ecommerce/init.json:/fixtures/init.json diff --git a/jdk_8_maven/cs/rest/original/pom.xml b/jdk_8_maven/cs/rest/original/pom.xml index d3b062d8a..8cddfcb8c 100644 --- a/jdk_8_maven/cs/rest/original/pom.xml +++ b/jdk_8_maven/cs/rest/original/pom.xml @@ -26,7 +26,7 @@ spring-batch-rest spring-actuator-demo swagger-petstore - angular-ecommerce + spring-ecommerce diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/README.md b/jdk_8_maven/cs/rest/original/spring-ecommerce/README.md similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/README.md rename to jdk_8_maven/cs/rest/original/spring-ecommerce/README.md diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/pom.xml b/jdk_8_maven/cs/rest/original/spring-ecommerce/pom.xml similarity index 99% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/pom.xml rename to jdk_8_maven/cs/rest/original/spring-ecommerce/pom.xml index f06c2bcd8..fdfb6f59e 100644 --- a/jdk_8_maven/cs/rest/original/angular-ecommerce/pom.xml +++ b/jdk_8_maven/cs/rest/original/spring-ecommerce/pom.xml @@ -133,7 +133,7 @@ spring-boot-maven-plugin - angular-ecommerce + spring-ecommerce sut diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/NgSpringShoppingStoreApplication.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/NgSpringShoppingStoreApplication.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/NgSpringShoppingStoreApplication.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/NgSpringShoppingStoreApplication.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/AppSecurityConfig.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/CustomAccessDeniedHandler.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/CustomAccessDeniedHandler.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/CustomAccessDeniedHandler.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/CustomAccessDeniedHandler.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/ElasticSearchConfig.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/MailConfig.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/MailConfig.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/MailConfig.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/MailConfig.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/SwaggerConfig.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/UnauthorizedEntryPoint.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/UnauthorizedEntryPoint.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/UnauthorizedEntryPoint.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/UnauthorizedEntryPoint.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/WebConfig.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/WebConfig.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/config/WebConfig.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/config/WebConfig.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/AdminController.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/AdminController.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/AdminController.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/AdminController.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/AuthController.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/AuthController.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/AuthController.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/AuthController.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/CartController.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/CartController.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/CartController.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/CartController.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/CatalogController.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/CatalogController.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/CatalogController.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/CatalogController.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/ProductRatingController.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/ProductRatingController.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/controller/ProductRatingController.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/controller/ProductRatingController.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/AuthenticationResponse.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/AuthenticationResponse.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/AuthenticationResponse.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/AuthenticationResponse.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/CategoryDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/CategoryDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/CategoryDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/CategoryDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/FacetDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/FacetDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/FacetDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/FacetDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/FacetValueDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/FacetValueDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/FacetValueDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/FacetValueDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/LoginRequestDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/LoginRequestDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/LoginRequestDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/LoginRequestDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductAvailability.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductAvailability.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductAvailability.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductAvailability.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductRatingDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductRatingDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductRatingDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductRatingDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductSearchResponseDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductSearchResponseDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductSearchResponseDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/ProductSearchResponseDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/RegisterRequestDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/RegisterRequestDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/RegisterRequestDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/RegisterRequestDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/SearchQueryDto.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/SearchQueryDto.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/dto/SearchQueryDto.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/dto/SearchQueryDto.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/ApiResponse.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/ApiResponse.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/ApiResponse.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/ApiResponse.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/SpringShoppingStoreExceptionHandler.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/SpringShoppingStoreExceptionHandler.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/SpringShoppingStoreExceptionHandler.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/SpringShoppingStoreExceptionHandler.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/SpringStoreException.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/SpringStoreException.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/SpringStoreException.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/exceptions/SpringStoreException.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/Category.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/Category.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/Category.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/Category.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ElasticSearchProduct.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ElasticSearchProduct.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ElasticSearchProduct.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ElasticSearchProduct.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/Mail.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/Mail.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/Mail.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/Mail.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/Product.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/Product.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/Product.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/Product.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ProductAttribute.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ProductAttribute.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ProductAttribute.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ProductAttribute.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ProductRating.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ProductRating.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ProductRating.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ProductRating.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ShoppingCart.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ShoppingCart.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ShoppingCart.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ShoppingCart.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ShoppingCartItem.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ShoppingCartItem.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/ShoppingCartItem.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/ShoppingCartItem.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/User.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/User.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/User.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/User.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/VerificationToken.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/VerificationToken.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/model/VerificationToken.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/model/VerificationToken.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/CartRepository.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/CartRepository.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/CartRepository.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/CartRepository.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/CategoryRepository.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/CategoryRepository.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/CategoryRepository.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/CategoryRepository.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/ProductRepository.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/ProductRepository.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/ProductRepository.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/ProductRepository.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/ProductSearchRepository.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/ProductSearchRepository.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/ProductSearchRepository.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/ProductSearchRepository.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/UserRepository.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/UserRepository.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/UserRepository.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/UserRepository.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/VerificationTokenRepository.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/VerificationTokenRepository.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/repository/VerificationTokenRepository.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/repository/VerificationTokenRepository.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/AuthService.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/AuthService.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/AuthService.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/AuthService.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/CartService.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/CartService.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/CartService.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/CartService.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/CategoryService.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/CategoryService.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/CategoryService.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/CategoryService.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/JWTAuthenticationFilter.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/JWTAuthenticationFilter.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/JWTAuthenticationFilter.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/JWTAuthenticationFilter.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/JwtTokenProvider.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/JwtTokenProvider.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/JwtTokenProvider.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/JwtTokenProvider.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/MailContentBuilder.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/MailContentBuilder.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/MailContentBuilder.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/MailContentBuilder.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/MailService.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/MailService.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/MailService.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/MailService.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/ProductMapper.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/ProductMapper.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/ProductMapper.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/ProductMapper.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/ProductService.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/ProductService.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/ProductService.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/ProductService.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/ResponseSerializer.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/ResponseSerializer.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/ResponseSerializer.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/ResponseSerializer.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/SearchService.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/SearchService.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/SearchService.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/SearchService.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/UserDetailServiceImpl.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/UserDetailServiceImpl.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/UserDetailServiceImpl.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/UserDetailServiceImpl.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/UserPrincipal.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/UserPrincipal.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/java/com/techie/shoppingstore/service/UserPrincipal.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/java/com/techie/shoppingstore/service/UserPrincipal.java diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/application.properties similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/application.properties rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/application.properties diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/auth.jks b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/auth.jks similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/auth.jks rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/auth.jks diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/Category.json b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/Category.json similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/Category.json rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/Category.json diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/Copy_of_Product.json b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/Copy_of_Product.json similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/Copy_of_Product.json rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/Copy_of_Product.json diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/Product.json b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/Product.json similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/Product.json rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/Product.json diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/User.json b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/User.json similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/User.json rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/User.json diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/VerificationToken.json b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/VerificationToken.json similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/VerificationToken.json rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/VerificationToken.json diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/query.json b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/query.json similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/export/query.json rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/export/query.json diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/category-page-with-filters.PNG b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/category-page-with-filters.PNG similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/category-page-with-filters.PNG rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/category-page-with-filters.PNG diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/category-page.PNG b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/category-page.PNG similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/category-page.PNG rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/category-page.PNG diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/homepage.PNG b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/homepage.PNG similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/homepage.PNG rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/homepage.PNG diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/product-page-description-section.PNG b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/product-page-description-section.PNG similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/product-page-description-section.PNG rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/product-page-description-section.PNG diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/product-page-review-section.PNG b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/product-page-review-section.PNG similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/product-page-review-section.PNG rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/product-page-review-section.PNG diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/product-page.PNG b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/product-page.PNG similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/product-page.PNG rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/product-page.PNG diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/search-page.PNG b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/search-page.PNG similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/images/search-page.PNG rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/images/search-page.PNG diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/templates/mailTemplate.html b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/templates/mailTemplate.html similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/main/resources/templates/mailTemplate.html rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/main/resources/templates/mailTemplate.html diff --git a/jdk_8_maven/cs/rest/original/angular-ecommerce/src/test/java/com/techie/shoppingstore/NgSpringShoppingStoreApplicationTests.java b/jdk_8_maven/cs/rest/original/spring-ecommerce/src/test/java/com/techie/shoppingstore/NgSpringShoppingStoreApplicationTests.java similarity index 100% rename from jdk_8_maven/cs/rest/original/angular-ecommerce/src/test/java/com/techie/shoppingstore/NgSpringShoppingStoreApplicationTests.java rename to jdk_8_maven/cs/rest/original/spring-ecommerce/src/test/java/com/techie/shoppingstore/NgSpringShoppingStoreApplicationTests.java diff --git a/jdk_8_maven/em/embedded/rest/pom.xml b/jdk_8_maven/em/embedded/rest/pom.xml index 3816bbe5e..bb29b118a 100644 --- a/jdk_8_maven/em/embedded/rest/pom.xml +++ b/jdk_8_maven/em/embedded/rest/pom.xml @@ -32,7 +32,7 @@ spring-batch-rest spring-actuator-demo swagger-petstore - angular-ecommerce + spring-ecommerce \ No newline at end of file diff --git a/jdk_8_maven/em/embedded/rest/angular-ecommerce/pom.xml b/jdk_8_maven/em/embedded/rest/spring-ecommerce/pom.xml similarity index 95% rename from jdk_8_maven/em/embedded/rest/angular-ecommerce/pom.xml rename to jdk_8_maven/em/embedded/rest/spring-ecommerce/pom.xml index e16edadc9..eb640bbc5 100644 --- a/jdk_8_maven/em/embedded/rest/angular-ecommerce/pom.xml +++ b/jdk_8_maven/em/embedded/rest/spring-ecommerce/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - evomaster-benchmark-em-embedded-rest-angular-ecommerce + evomaster-benchmark-em-embedded-rest-spring-ecommerce jar diff --git a/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/spring-ecommerce/src/main/java/em/embedded/spring/ecommerce/EmbeddedEvoMasterController.java similarity index 99% rename from jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java rename to jdk_8_maven/em/embedded/rest/spring-ecommerce/src/main/java/em/embedded/spring/ecommerce/EmbeddedEvoMasterController.java index b090eeb8f..9eec799f7 100644 --- a/jdk_8_maven/em/embedded/rest/angular-ecommerce/src/main/java/em/embedded/angular/ecommerce/EmbeddedEvoMasterController.java +++ b/jdk_8_maven/em/embedded/rest/spring-ecommerce/src/main/java/em/embedded/spring/ecommerce/EmbeddedEvoMasterController.java @@ -1,4 +1,4 @@ -package em.embedded.angular.ecommerce; +package em.embedded.spring.ecommerce; import com.mongodb.BasicDBObject; import com.mongodb.client.MongoClient; diff --git a/jdk_8_maven/em/external/rest/pom.xml b/jdk_8_maven/em/external/rest/pom.xml index 7dcd14085..394c969fb 100644 --- a/jdk_8_maven/em/external/rest/pom.xml +++ b/jdk_8_maven/em/external/rest/pom.xml @@ -33,7 +33,7 @@ spring-batch-rest spring-actuator-demo swagger-petstore - angular-ecommerce + spring-ecommerce \ No newline at end of file diff --git a/jdk_8_maven/em/external/rest/angular-ecommerce/pom.xml b/jdk_8_maven/em/external/rest/spring-ecommerce/pom.xml similarity index 92% rename from jdk_8_maven/em/external/rest/angular-ecommerce/pom.xml rename to jdk_8_maven/em/external/rest/spring-ecommerce/pom.xml index 66cae6ddf..9d0466851 100644 --- a/jdk_8_maven/em/external/rest/angular-ecommerce/pom.xml +++ b/jdk_8_maven/em/external/rest/spring-ecommerce/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - evomaster-benchmark-em-external-rest-angular-ecommerce + evomaster-benchmark-em-external-rest-spring-ecommerce jar @@ -50,12 +50,12 @@ shade - angular-ecommerce-evomaster-runner + spring-ecommerce-evomaster-runner - em.external.angular.ecommerce.ExternalEvoMasterController + em.external.spring.ecommerce.ExternalEvoMasterController org.evomaster.client.java.instrumentation.InstrumentingAgent diff --git a/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/spring-ecommerce/src/main/java/em/external/spring/ecommerce/ExternalEvoMasterController.java similarity index 98% rename from jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java rename to jdk_8_maven/em/external/rest/spring-ecommerce/src/main/java/em/external/spring/ecommerce/ExternalEvoMasterController.java index 61acd3527..3c56949fd 100644 --- a/jdk_8_maven/em/external/rest/angular-ecommerce/src/main/java/em/external/angular/ecommerce/ExternalEvoMasterController.java +++ b/jdk_8_maven/em/external/rest/spring-ecommerce/src/main/java/em/external/spring/ecommerce/ExternalEvoMasterController.java @@ -1,4 +1,4 @@ -package em.external.angular.ecommerce; +package em.external.spring.ecommerce; import com.mongodb.BasicDBObject; import com.mongodb.client.MongoClient; @@ -35,12 +35,12 @@ public static void main(String[] args) { if (args.length > 1) { sutPort = Integer.parseInt(args[1]); } - String jarLocation = "cs/rest/original/angular-ecommerce/target"; + String jarLocation = "cs/rest/original/spring-ecommerce/target"; if (args.length > 2) { jarLocation = args[2]; } if(! jarLocation.endsWith(".jar")) { - jarLocation += "/angular-ecommerce-sut.jar"; + jarLocation += "/spring-ecommerce-sut.jar"; } int timeoutSeconds = 120; diff --git a/scripts/dist.py b/scripts/dist.py index 96fb885d4..581cb4fca 100755 --- a/scripts/dist.py +++ b/scripts/dist.py @@ -187,8 +187,8 @@ def build_jdk_8_maven(): copy(folder + "/cs/rest/original/swagger-petstore/target/swagger-petstore-sut.jar", DIST) copy(folder + "/em/external/rest/swagger-petstore/target/swagger-petstore-evomaster-runner.jar", DIST) - copy(folder + "/cs/rest/original/angular-ecommerce/target/angular-ecommerce-sut.jar", DIST) - copy(folder + "/em/external/rest/angular-ecommerce/target/angular-ecommerce-evomaster-runner.jar", DIST) + copy(folder + "/cs/rest/original/spring-ecommerce/target/spring-ecommerce-sut.jar", DIST) + copy(folder + "/em/external/rest/spring-ecommerce/target/spring-ecommerce-evomaster-runner.jar", DIST) # graphql diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/init.json b/scripts/dockerize/data/additional_files/spring-ecommerce/init.json similarity index 100% rename from scripts/dockerize/data/additional_files/angular-ecommerce/init.json rename to scripts/dockerize/data/additional_files/spring-ecommerce/init.json diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh b/scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh similarity index 100% rename from scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh rename to scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh diff --git a/statistics/data.csv b/statistics/data.csv index 8bb0cbb2c..5056cd0f9 100644 --- a/statistics/data.csv +++ b/statistics/data.csv @@ -1,5 +1,4 @@ EMB,NAME,TYPE,LANGUAGE,RUNTIME,BUILD,FILES,LOCS,DATABASE,LICENSE,ENDPOINTS,AUTHENTICATION,URL -TRUE,angular-ecommerce,REST,Java,JDK 8,Maven,58,2223,MongoOB;Redis;Elasticsearch,UNDEFINED,26,TRUE,https://github.com/SaiUpadhyayula/SpringAngularEcommerce TRUE,tiltaksgjennomforing,REST,Java,JDK 17,Maven,472,27316,PostgreSQL,MIT,79,TRUE,https://github.com/navikt/tiltaksgjennomforing-api TRUE,person-controller,REST,Java,JDK 21,Maven,16,1112,MongoDB,Apache,12,FALSE,https://github.com/mongodb-developer/java-spring-boot-mongodb-starter TRUE,tracking-system,REST,Java,JDK 11,Maven,87,5947,H2,UNDEFINED,67,TRUE,https://github.com/SelimHorri/project-tracking-system-backend-app @@ -28,6 +27,7 @@ TRUE,restcountries,REST,Java,JDK 8,Maven,24,1977,,MPL,22,FALSE,https://github.co TRUE,scout-api,REST,Java,JDK 8,Maven,93,9736,H2,MIT,49,TRUE,https://github.com/mikaelsvensson/scout-api TRUE,spring-actuator-demo,REST,Java,JDK 8,Maven,5,117,,UNDEFINED,2,TRUE,https://github.com/callicoder/spring-boot-actuator-demo TRUE,spring-batch-rest,REST,Java,JDK 8,Maven,65,3668,,Apache,5,FALSE,https://github.com/chrisgleissner/spring-batch-rest +TRUE,spring-ecommerce,REST,Java,JDK 8,Maven,58,2223,MongoOB;Redis;Elasticsearch,UNDEFINED,26,TRUE,https://github.com/SaiUpadhyayula/SpringAngularEcommerce TRUE,spring-rest-example,REST,Java,JDK 17,Maven,32,1426,MySQL,MIT,9,FALSE,https://github.com/phantasmicmeans/spring-boot-restful-api-example TRUE,swagger-petstore,REST,Java,JDK 8,Maven,23,1631,,Apache,19,FALSE,https://github.com/swagger-api/swagger-petstore TRUE,genome-nexus,REST,Java,JDK 8,Maven,405,30004,MongoDB,MIT,23,FALSE,https://github.com/genome-nexus/genome-nexus diff --git a/statistics/table_emb.md b/statistics/table_emb.md index 9a7ba9b02..309bb0dff 100644 --- a/statistics/table_emb.md +++ b/statistics/table_emb.md @@ -24,7 +24,7 @@ |__gestaohospital__|REST|3506|33|20|Java|JDK 8|Maven|MongoDB|| |__youtube-mock__|REST|3229|29|1|Java|JDK 8|Maven||| |__features-service__|REST|2275|39|18|Java|JDK 8|Maven|H2|| -|__angular-ecommerce__|REST|2223|58|26|Java|JDK 8|Maven|MongoOB, Redis, Elasticsearch|✓| +|__spring-ecommerce__|REST|2223|58|26|Java|JDK 8|Maven|MongoOB, Redis, Elasticsearch|✓| |__bibliothek__|REST|2176|33|8|Java|JDK 17|Gradle|MongoDB|| |__restcountries__|REST|1977|24|22|Java|JDK 8|Maven||| |__reservations-api__|REST|1853|39|7|Java|JDK 11|Gradle|MongoDB|✓| From bc69e6e300f5dfe2b5a3611c81a22e5499f95a93 Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 24 Jul 2025 12:17:22 +0200 Subject: [PATCH 09/13] gitignore --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ae810620..6346f437b 100644 --- a/.gitignore +++ b/.gitignore @@ -369,6 +369,6 @@ jdk_8_maven/em/external/rest/spring-batch-rest/target /jdk_11_maven/em/embedded/rest/http-patch-spring/target /jdk_11_maven/em/external/rest/http-patch-spring/target -/jdk_8_maven/cs/rest/original/angular-ecommerce/target -/jdk_8_maven/em/embedded/rest/angular-ecommerce/target -/jdk_8_maven/em/external/rest/angular-ecommerce/target \ No newline at end of file +/jdk_8_maven/cs/rest/original/spring-ecommerce/target +/jdk_8_maven/em/embedded/rest/spring-ecommerce/target +/jdk_8_maven/em/external/rest/spring-ecommerce/target \ No newline at end of file From 7948ad8ed4e45b0c17f8a52d632b7efce49ec804 Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 24 Jul 2025 12:28:14 +0200 Subject: [PATCH 10/13] dockerize --- ...gular-ecommerce.dockerfile => spring-ecommerce.dockerfile} | 4 ++-- dockerfiles/{angular-ecommerce.yaml => spring-ecommerce.yaml} | 0 .../data/additional_files/spring-ecommerce/mongo_import.sh | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) rename dockerfiles/{angular-ecommerce.dockerfile => spring-ecommerce.dockerfile} (80%) rename dockerfiles/{angular-ecommerce.yaml => spring-ecommerce.yaml} (100%) diff --git a/dockerfiles/angular-ecommerce.dockerfile b/dockerfiles/spring-ecommerce.dockerfile similarity index 80% rename from dockerfiles/angular-ecommerce.dockerfile rename to dockerfiles/spring-ecommerce.dockerfile index 6149f21cb..d63718260 100644 --- a/dockerfiles/angular-ecommerce.dockerfile +++ b/dockerfiles/spring-ecommerce.dockerfile @@ -1,6 +1,6 @@ FROM amazoncorretto:8-alpine-jdk -COPY ./dist/angular-ecommerce-sut.jar . +COPY ./dist/spring-ecommerce-sut.jar . COPY ./dist/jacocoagent.jar . @@ -11,7 +11,7 @@ COPY ./dist/jacocoagent.jar . ENTRYPOINT \ java \ # unfortunately dumponexit is completely unreliable in Docker :( -# -javaagent:jacocoagent.jar=destfile=./jacoco/angular-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \ +# -javaagent:jacocoagent.jar=destfile=./jacoco/spring-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \ -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \ -Dfile.encoding=ISO-8859-1 -jar spring-ecommerce-sut.jar \ --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elsticsearch.cluster-nodes=elastic:9300 --spring.cache.type=NONE \ No newline at end of file diff --git a/dockerfiles/angular-ecommerce.yaml b/dockerfiles/spring-ecommerce.yaml similarity index 100% rename from dockerfiles/angular-ecommerce.yaml rename to dockerfiles/spring-ecommerce.yaml diff --git a/scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh b/scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh index f869ce484..2e3545ac3 100644 --- a/scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh +++ b/scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh @@ -1,3 +1,2 @@ #!/bin/bash - -mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray \ No newline at end of file +mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray From 37717c3652d66f3744f86528fa4ed4fb3f08ddf2 Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 24 Jul 2025 12:35:16 +0200 Subject: [PATCH 11/13] conflicts --- ...lar-ecommerce.dockerfile => spring-ecommerce.dockerfile} | 4 ++-- .../{angular-ecommerce.yaml => spring-ecommerce.yaml} | 6 +++--- .../data/additional_files/angular-ecommerce/mongo_import.sh | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) rename dockerfiles/{angular-ecommerce.dockerfile => spring-ecommerce.dockerfile} (83%) rename dockerfiles/{angular-ecommerce.yaml => spring-ecommerce.yaml} (74%) diff --git a/dockerfiles/angular-ecommerce.dockerfile b/dockerfiles/spring-ecommerce.dockerfile similarity index 83% rename from dockerfiles/angular-ecommerce.dockerfile rename to dockerfiles/spring-ecommerce.dockerfile index 857308566..cae91bf22 100644 --- a/dockerfiles/angular-ecommerce.dockerfile +++ b/dockerfiles/spring-ecommerce.dockerfile @@ -1,6 +1,6 @@ FROM amazoncorretto:8-alpine-jdk -COPY ./dist/angular-ecommerce-sut.jar . +COPY ./dist/spring-ecommerce-sut.jar . COPY ./dist/jacocoagent.jar . @@ -11,7 +11,7 @@ COPY ./dist/jacocoagent.jar . ENTRYPOINT \ java \ # unfortunately dumponexit is completely unreliable in Docker :( -# -javaagent:jacocoagent.jar=destfile=./jacoco/angular-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \ +# -javaagent:jacocoagent.jar=destfile=./jacoco/spring-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \ -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \ -Dfile.encoding=ISO-8859-1 -jar angular-ecommerce-sut.jar \ --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE \ No newline at end of file diff --git a/dockerfiles/angular-ecommerce.yaml b/dockerfiles/spring-ecommerce.yaml similarity index 74% rename from dockerfiles/angular-ecommerce.yaml rename to dockerfiles/spring-ecommerce.yaml index 0a32a587e..32d111d4c 100644 --- a/dockerfiles/angular-ecommerce.yaml +++ b/dockerfiles/spring-ecommerce.yaml @@ -1,7 +1,7 @@ services: sut-angular-ecommerce: build: - dockerfile: ./dockerfiles/angular-ecommerce.dockerfile + dockerfile: ./dockerfiles/spring-ecommerce.dockerfile context: .. # environment: # TOOL: ${TOOL:-undefined} @@ -26,8 +26,8 @@ services: volumes: - - ../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh - - ../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json + - ../scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh + - ../scripts/dockerize/data/additional_files/spring-ecommerce/init.json:/fixtures/init.json diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh b/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh index f869ce484..2e3545ac3 100644 --- a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh +++ b/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh @@ -1,3 +1,2 @@ #!/bin/bash - -mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray \ No newline at end of file +mongoimport --host localhost --port 27017 --db test --collection User --file /fixtures/init.json --jsonArray From 4868b1bcd7744909247340265be1bf24aa191e09 Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 24 Jul 2025 12:36:36 +0200 Subject: [PATCH 12/13] rename folder --- .../{angular-ecommerce => spring-ecommerce}/init.json | 0 .../{angular-ecommerce => spring-ecommerce}/mongo_import.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename scripts/dockerize/data/additional_files/{angular-ecommerce => spring-ecommerce}/init.json (100%) rename scripts/dockerize/data/additional_files/{angular-ecommerce => spring-ecommerce}/mongo_import.sh (100%) diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/init.json b/scripts/dockerize/data/additional_files/spring-ecommerce/init.json similarity index 100% rename from scripts/dockerize/data/additional_files/angular-ecommerce/init.json rename to scripts/dockerize/data/additional_files/spring-ecommerce/init.json diff --git a/scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh b/scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh similarity index 100% rename from scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh rename to scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh From 8d1ba4d3f89f476ddb819d760b82648edf566abc Mon Sep 17 00:00:00 2001 From: Omur Date: Thu, 24 Jul 2025 12:45:09 +0200 Subject: [PATCH 13/13] dockerfiles fix --- dockerfiles/spring-ecommerce.dockerfile | 2 +- scripts/dockerize/data/sut.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfiles/spring-ecommerce.dockerfile b/dockerfiles/spring-ecommerce.dockerfile index d63718260..c02f9302c 100644 --- a/dockerfiles/spring-ecommerce.dockerfile +++ b/dockerfiles/spring-ecommerce.dockerfile @@ -14,4 +14,4 @@ ENTRYPOINT \ # -javaagent:jacocoagent.jar=destfile=./jacoco/spring-ecommerce__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \ -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \ -Dfile.encoding=ISO-8859-1 -jar spring-ecommerce-sut.jar \ - --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elsticsearch.cluster-nodes=elastic:9300 --spring.cache.type=NONE \ No newline at end of file + --server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE \ No newline at end of file diff --git a/scripts/dockerize/data/sut.csv b/scripts/dockerize/data/sut.csv index e4588aa99..1ab7cffc7 100644 --- a/scripts/dockerize/data/sut.csv +++ b/scripts/dockerize/data/sut.csv @@ -32,4 +32,4 @@ spring-actuator-demo,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-doc webgoat,TRUE,-Drunning.in.docker=true,"--webgoat.port=8080 --webwolf.port=8081 --server.address=""0.0.0.0"" --spring.profiles.active=dev --spring.datasource.driver-class-name=org.h2.Driver --spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect --spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=none --spring.sql.init.mode=never --spring.datasource.url=""jdbc:h2:file:./test"" --spring.datasource.username=sa --spring.datasource.password",http://localhost:8080/WebGoat/v3/api-docs,http://localhost:8080,TRUE,FALSE,"", swagger-petstore,TRUE,"",8080,http://localhost:8080/api/v3/openapi.json,http://localhost:8080,TRUE,FALSE,"", http-patch-spring,TRUE,"",--server.port=8080,http://localhost:8080/v3/api-docs,http://localhost:8080,FALSE,FALSE,"", -angular-ecommerce,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/angular-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/angular-ecommerce/init.json:/fixtures/init.json"", ""health_check_command"": """"}, {""name"": ""redis"", ""image_name"": ""redis:7.0.11"", ""port"": 6379, ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}, {""name"": ""elasticsearch"",""image_name"": ""docker.elastic.co/elasticsearch/elasticsearch:6.8.23"", ""port"": 9300, ""tmp_fs"": ""/usr/share/elasticsearch/data"", ""environment"": ""- discovery.type=single-node;- cluster.name=elasticsearch;- ES_JAVA_OPTS=-Xms512m -Xmx512m;- xpack.security.enabled=false"", ""volume"": """", ""health_check_command"": """"}]" +spring-ecommerce,TRUE,-Dfile.encoding=ISO-8859-1,--server.port=8080 --spring.datasource.host=mongodb --spring.datasource.port=27017 --spring.datasource.database=test --spring.data.mongodb.uri=mongodb://mongodb:27017/test --spring.redis.host=redis --spring.redis.port=6379 --spring.data.elasticsearch.cluster-name=elasticsearch --spring.data.elasticsearch.cluster-nodes=elasticsearch:9300 --spring.elasticsearch.rest.uris=elasticsearch:9200 --spring.data.elasticsearch.host=elasticsearch --spring.data.elasticsearch.port=9300 --spring.cache.type=NONE,http://localhost:8080/v2/api-docs,http://localhost:8080,FALSE,FALSE,"","[{""name"": ""mongodb"", ""image_name"": ""mongo:7.0"", ""port"": 27017.0, ""tmp_fs"": ""/data/db"", ""environment"": ""MONGODB_REPLICA_SET_MODE: primary;ALLOW_EMPTY_PASSWORD: yes"", ""volume"": ""../scripts/dockerize/data/additional_files/spring-ecommerce/mongo_import.sh:/docker-entrypoint-initdb.d/mongo_import.sh;../scripts/dockerize/data/additional_files/spring-ecommerce/init.json:/fixtures/init.json"", ""health_check_command"": """"}, {""name"": ""redis"", ""image_name"": ""redis:7.0.11"", ""port"": 6379, ""tmp_fs"": """", ""environment"": """", ""volume"": """", ""health_check_command"": """"}, {""name"": ""elasticsearch"",""image_name"": ""docker.elastic.co/elasticsearch/elasticsearch:6.8.23"", ""port"": 9300, ""tmp_fs"": ""/usr/share/elasticsearch/data"", ""environment"": ""- discovery.type=single-node;- cluster.name=elasticsearch;- ES_JAVA_OPTS=-Xms512m -Xmx512m;- xpack.security.enabled=false"", ""volume"": """", ""health_check_command"": """"}]"