Adapted properties to follow the Java Spring properties standards. (#179)

Author: tobiasake

.travis.yml

@@ -60,7 +60,7 @@ jobs:
     - stage: test
       name: integrationTests
       script:
-        - "mvn verify -DskipUTs -Dei.backendInstancesListJsonContent=\"[{ 'contextPath': '', 'port': '${EI_BACKEND_PORT}', 'name': 'EI-Backend-1', 'host': 'localhost', 'https': false, 'defaultBackend': true}]\" -B"
+        - "mvn verify -DskipUTs -Dei.backend.instances.list.json.content=\"[{ 'contextPath': '', 'port': '${EI_BACKEND_PORT}', 'name': 'EI-Backend-1', 'host': 'localhost', 'https': false, 'defaultBackend': true}]\" -B"
     - stage: deploy
       name: deployGitHubPages
       before_install: skip    # do not run again

src/main/docker/docker-compose.yml

@@ -185,10 +185,14 @@ services:
     environment:      # Overrides settings in application config file
       - spring.application.name=ei-frontend
       - server.port=8080
-      - ei.frontendServiceHost=${HOST}
-      - ei.frontendServicePort=8081
-      - ei.backendInstancesListJsonContent=${EIFFEL2_EI_FRONTEND_EI_INSTANCES_LIST}
-      - ei.backendInstancesFilePath=/tmp/ei-instances-list.conf
+      - ei.frontend.service.host=${HOST}
+      - ei.frontend.service.port=8081
+      - ei.frontend.context.path=
+      - ei.backend.instances.list.json.content=${EIFFEL2_EI_FRONTEND_EI_INSTANCES_LIST}
+      - ei.backend.instances.filepath=/tmp/ei-instances-list.conf
+      - logging.level.root=OFF
+      - logging.level.org.springframework.web=ERROR
+      - logging.level.com.ericsson.ei=DEBUG
 
 networks:
   eiffel_2.0_1:

src/main/java/com/ericsson/ei/frontend/utils/BackEndInstanceFileUtils.java

@@ -36,10 +36,10 @@ public class BackEndInstanceFileUtils {
     @Autowired
     BackEndInstancesUtils backendInstancesUtils;
 
-    @Value("${ei.backendInstancesFilePath:#{null}}")
+    @Value("${ei.backend.instances.filepath:#{null}}")
     private String backendInstancesFilePath;
 
-    @Value("${ei.backendInstancesListJsonContent:#{null}}")
+    @Value("${ei.backend.instances.list.json.content:#{null}}")
     private String backendInstancesListJsonContent;
 
     @PostConstruct
@@ -116,7 +116,7 @@ private JsonArray parseEiInstancesListJsonObject() {
         if (backendInstancesListJsonContent == null || backendInstancesListJsonContent.isEmpty()) {
             LOG.warn("EI backend instances list json object is empty."
                     + "\nMake sure that EI Instances list flags is set, "
-                    + " 'ei.backendInstancesFilePath' or 'ei.backendInstancesListJsonContent'");
+                    + " 'ei.backend.instances.filepath' or 'ei.backend.instances.list.json.content'");
             return new JsonArray();
         }
 
@@ -125,7 +125,7 @@ private JsonArray parseEiInstancesListJsonObject() {
                     .parse(backendInstancesListJsonContent.toString());
         } catch (JsonSyntaxException e) {
             LOG.error("Failed to parse EI backend instances list json object."
-                    + "\nMake sure ei.backendInstancesListJsonContent property is set with one or more EI Backend instances."
+                    + "\nMake sure ei.backend.instances.list.json.content property is set with one or more EI Backend instances."
                     + "\nError message: " + e.getMessage() + "\nErrors: " + e);
             System.exit(1);
         }

src/main/java/com/ericsson/ei/frontend/utils/WebControllerUtils.java

@@ -40,19 +40,19 @@
 @AllArgsConstructor
 public class WebControllerUtils {
 
-    @Value("${ei.frontendServiceHost:#{null}}")
+    @Value("${ei.frontend.service.host:#{null}}")
     private String frontendServiceHost;
 
-    @Value("${ei.frontendServicePort:#{null}}")
+    @Value("${ei.frontend.service.port:#{null}}")
     private int frontendServicePort;
 
-    @Value("${ei.frontendContextPath:#{null}}")
+    @Value("${ei.frontend.context.path:#{null}}")
     private String frontendContextPath;
 
-    @Value("${ei.useSecureHttpFrontend:#{null}}")
+    @Value("${ei.use.secure.http.frontend:#{null}}")
     private boolean useSecureHttpFrontend;
 
-    @Value("${ei.eiffelDocumentationUrls:#{null}}")
+    @Value("${ei.eiffel.documentation.urls:#{null}}")
     private String eiffelDocumentationUrls;
 
     @Value("${build.version:#{null}}")

src/main/resources/application.properties

@@ -8,21 +8,21 @@ build.version=
 server.port=8080
 #server.ssl.key-store: <keystore.p12>
 #server.ssl.key-store-password: <mypassword>
-#server.ssl.keyStoreType: <PKCS12>
-#server.ssl.keyAlias: <tomcat>
+#server.ssl.key-store-type: <PKCS12>
+#server.ssl.key-alias: <tomcat>
 
 ######## EI Front-End
-ei.frontendServiceHost=localhost
-ei.frontendServicePort=8080
-ei.frontendContextPath=
-ei.useSecureHttpFrontend=false
+ei.frontend.service.host=localhost
+ei.frontend.service.port=8080
+ei.frontend.context.path=
+ei.use.secure.http.frontend=false
 
 ######## EI Default Back-Ends
-ei.backendInstancesFilePath=
-ei.backendInstancesListJsonContent=[{ "contextPath": "", "port": "8090", "name": "EI-Backend-1", "host": "localhost", "https": false, "defaultBackend": true}]
+ei.backend.instances.filepath=
+ei.backend.instances.list.json.content=[{ "contextPath": "", "port": "8090", "name": "EI-Backend-1", "host": "localhost", "https": false, "defaultBackend": true}]
 
 ###### EI Documentation Link Url ##########
-ei.eiffelDocumentationUrls={ "EI Frontend GitHub": "https://github.com/eiffel-community/eiffel-intelligence-frontend",\
+ei.eiffel.documentation.urls={ "EI Frontend GitHub": "https://github.com/eiffel-community/eiffel-intelligence-frontend",\
                              "EI Backend GitHub": "https://github.com/eiffel-community/eiffel-intelligence",\
                              "Eiffel Github main page": "https://github.com/eiffel-community/eiffel",\
                              "Test Rules User Guide": "https://github.com/eiffel-community/eiffel-intelligence-frontend/blob/master/wiki/markdown/test-rules.md" }