Merge remote-tracking branch 'origin/develop' into develop

Author: arcuri82

dockerfiles/blogapi.yaml

@@ -30,8 +30,8 @@ services:
 
     volumes:
       - ../scripts/dockerize/data/additional_files/blogapi/mysql_import.sh:/docker-entrypoint-initdb.d/mysql_import.sh
-      - ../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/fixtures/blogapi.sql
-      - ../scripts/dockerize/data/additional_files/blogapi/data.sql:/fixtures/data.sql
+      - ../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
 
 
 

dockerfiles/reservations-api.dockerfile

@@ -13,5 +13,5 @@ ENTRYPOINT \
 #    unfortunately dumponexit is completely unreliable in Docker :(
 #    -javaagent:jacocoagent.jar=destfile=./jacoco/reservations-api__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
-     -jar reservations-api-sut.jar \
+    -Dfile.encoding=ISO-8859-1 -jar reservations-api-sut.jar \
     --server.port=8080 --databaseUrl=mongodb://db:27017/mongo_db --spring.data.mongodb.uri=mongodb://db:27017/mongo_db --app.jwt.secret=abcdef012345678901234567890123456789abcdef012345678901234567890123456789

jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java

@@ -88,6 +88,12 @@ public String startSut() {
         mongoDbUrl = "mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT) + "/" + MONGODB_DATABASE_NAME;
         mongoClient = MongoClients.create(mongoDbUrl);
 
+        /*
+         This parameter is related to "cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestController.java" class.
+         In this class, after the password received as input is decoded, a new String is created. While creating this string, the current computer's default Charset is used and may exhibit different behaviors on different computers. To prevent this, we define a charset.
+         */
+        System.setProperty("file.encoding", "ISO-8859-1");
+
         ctx = SpringApplication.run(ReservationsApi.class,
                 new String[]{"--server.port=0",
                         "--databaseUrl=" + mongoDbUrl,

jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java

@@ -121,7 +121,14 @@ public String[] getInputParameters() {
     }
 
     public String[] getJVMParameters() {
-        return new String[]{};
+
+        return new String[]{
+                /*
+                 This parameter is related to "cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestController.java" class.
+                 In this class, after the password received as input is decoded, a new String is created. While creating this string, the current computer's default Charset is used and may exhibit different behaviors on different computers. To prevent this, we define a charset.
+                 */
+                "-Dfile.encoding=ISO-8859-1"
+        };
     }
 
     @Override

scripts/dockerize/data/additional_files/blogapi/mysql_import.sh

@@ -1,2 +1,2 @@
-mysql -u root -proot blogapi < /fixtures/blogapi.sql
-mysql -u root -proot blogapi < /fixtures/data.sql
+mysql -u root -proot blogapi < /docker-entrypoint-initdb.d/blogapi.sql
+mysql -u root -proot blogapi < /docker-entrypoint-initdb.d/data.sql

scripts/dockerize/data/sut.csv

@@ -3,7 +3,7 @@ familie-ba-sak,TRUE,-DAZUREAD_TOKEN_ENDPOINT_URL=http://fake-azure-token-endpoin
 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,"",--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,
+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,
@@ -18,7 +18,7 @@ restcountries,TRUE,"",--server.port=8080,http://localhost:8080/openapi.yaml,http
 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/mysql_import.sh:/docker-entrypoint-initdb.d/mysql_import.sh;../scripts/dockerize/data/additional_files/blogapi/blogapi.sql:/fixtures/blogapi.sql;../scripts/dockerize/data/additional_files/blogapi/data.sql:/fixtures/data.sql,FALSE,TRUE,"""CMD""; ""mysqladmin""; ""ping""; ""-h""; ""localhost"""
+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/mysql_import.sh:/docker-entrypoint-initdb.d/mysql_import.sh;../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,