Remove ei.frontend.service.port property (#193)

Restructuring application.properties

Author: Anders Breid

src/main/docker/docker-compose.yml

@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 ##################################################################################################
-# docker-compose commands 
+# docker-compose commands
 #
-# run:         docker-compose up         
+# run:         docker-compose up
 # stop:        docker-compose stop
 # stop/remove: docker-compose down --volumes
 #
 # Cleanup/Remove (if needed):
-#     Dangling Volumes:   docker volume rm `docker volume ls -q -f dangling=true`            
+#     Dangling Volumes:   docker volume rm `docker volume ls -q -f dangling=true`
 #     Unused Images:      docker images -q | xargs docker rmi
-#     Stopped containers: docker rm `docker ps -a -q` 
+#     Stopped containers: docker rm `docker ps -a -q`
 #
 # Maintainer: Eiffel-Community
 ##################################################################################################
@@ -38,11 +38,11 @@ services:
       - "27017"
     ports:
       - "27017:27017"
-    healthcheck: 
+    healthcheck:
         test: ["CMD-SHELL","echo", "'db.stats().ok' | mongo localhost:27017/test", "--quiet"]
         interval: 30s
         timeout: 10s
-        retries: 5        
+        retries: 5
     networks:
           eiffel_2.0_1:
             aliases:
@@ -85,7 +85,7 @@ services:
           eiffel_2.0_1:
             aliases:
               - eiffel-er
-    environment:   # Overrides settings in config file in catalina folder. OBS --> skip quotes for rabbitmq.bindingKey value  
+    environment:   # Overrides settings in config file in catalina folder. OBS --> skip quotes for rabbitmq.bindingKey value
                    # No config file copied to catalina folder in Dockerfile, only uses env vars below ;-)
                    # /eventrepository removed in contextpath
        - server.contextPath=/
@@ -184,9 +184,8 @@ services:
               - ei-frontend
     environment:      # Overrides settings in application config file
       - spring.application.name=ei-frontend
-      - server.port=8080
+      - server.port=8081
       - 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

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

@@ -43,7 +43,7 @@ public class WebControllerUtils {
     @Value("${ei.frontend.service.host:#{null}}")
     private String frontendServiceHost;
 
-    @Value("${ei.frontend.service.port:#{null}}")
+    @Value("${server.port:#{null}}")
     private int frontendServicePort;
 
     @Value("${ei.frontend.context.path:#{null}}")

src/main/resources/application.properties

@@ -3,29 +3,29 @@ spring.jackson.default-property-inclusion=non_null
 
 # An extra optional version tag, version will be added after github release version 
 # Example if build.version=1.2.3-internal becomes Version 0.0.18 (1.2.3-internal)
-build.version=
+#build.version=
 
+######## EI Front-End
 server.port=8080
+ei.frontend.service.host=localhost
+ei.frontend.context.path=
+
+######## EI Front-end security
+ei.use.secure.http.frontend=false
 #server.ssl.key-store: <keystore.p12>
 #server.ssl.key-store-password: <mypassword>
 #server.ssl.key-store-type: <PKCS12>
 #server.ssl.key-alias: <tomcat>
 
-######## EI Front-End
-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.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.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" }
+                               "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" }
 
 #### LOGGING #########
 logging.level.root: INFO