Update application.properties fro EI back-end to use URI, remove build.version (#281)

* Update to use uri.
* Remove all traces of build.version

Author: Anders Breid

src/integrationtest/resources/integration-test.properties

@@ -1,9 +1,5 @@
 spring.application.name=eiffel-intelligence
 
-# 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=
-
 # Port where Eiffel Intelligence will run
 server.port: 8090
 
@@ -42,16 +38,9 @@ rabbitmq.binding.key:#
 rabbitmq.waitlist.queue.suffix:waitlist
 
 # Details for connection to mongoDB database
-spring.data.mongodb.host: localhost
-spring.data.mongodb.port: 27017
-#spring.data.mongodb.username:
-#spring.data.mongodb.password:
-# Check configuration documentation for using jasypt encrypted passswords
+spring.data.mongodb.uri: mongodb://localhost:27017
 spring.data.mongodb.database: eiffel_intelligence
-# We cannot have empty username and password property here
-# if these properties are empty, remove or comment them
-# spring.data.mongodb.username:
-# spring.data.mongodb.password:
+
 # Configure the session storage expiration time for logged in users of Eiffel Intelligence front-end
 server.session-timeout: 1200
 # Configure the database collection name to store sessions

src/main/docker/env.bash

@@ -14,9 +14,12 @@ export MAILSERVER_IMAGE="mailhog/mailhog"
 export REMREM_GENERATE_IMAGE="eiffelericsson/eiffel-remrem-generate:2.0.4"
 export REMREM_PUBLISH_IMAGE="eiffelericsson/eiffel-remrem-publish:2.0.2"
 export JENKINS_IMAGE="bitnami/jenkins:2.138.3"
+export LDAP_IMAGE="osixia/openldap:1.2.4"
+
+# Update EI in docker-compose.yml to use spring.data.mongodb.uri when updating this image version to version 3+
 export EI_BACKEND_IMAGE="eiffelericsson/eiffel-intelligence-backend:2.0.0"
+# Update EI front-end in docker-compose.yml, remove ei.backend.instances.filepath= property when updating to EI-f version 3+
 export EI_FRONTEND_IMAGE="eiffelericsson/eiffel-intelligence-frontend:2.0.0"
-export LDAP_IMAGE="osixia/openldap:1.2.4"
 
 export MONGODB_PORT=27017
 export RABBITMQ_AMQP_PORT=5672

src/main/java/com/ericsson/ei/frontend/WebController.java

@@ -59,7 +59,6 @@ public String testRules(Model model) {
     public String info(Model model, HttpServletRequest request) {
         model.addAttribute("frontendServiceUrl", frontEndUtils.getFrontEndServiceUrl());
         model.addAttribute("version", frontEndUtils.getVersion());
-        model.addAttribute("applicationPropertiesVersion", frontEndUtils.getApplicationPropertiesVersion());
         model.addAttribute("frontendAppName", frontEndUtils.getApplicationName());
         return "information";
     }

src/main/java/com/ericsson/ei/frontend/config/ConfigurationLogger.java

@@ -27,7 +27,6 @@ public void logAndCheckConfiguration() {
                 + "ei.frontend.service.host: " + env.getProperty("ei.frontend.service.host") + "\n"
                 + "ei.frontend.context.path: " + env.getProperty("ei.frontend.context.path") + "\n"
                 + "ei.use.secure.http.frontend: " + env.getProperty("ei.use.secure.http.frontend") + "\n"
-                + "ei.backend.instances.filepath: " + env.getProperty("ei.backend.instances.filepath") + "\n"
                 + "ei.backend.instances.list.json.content: " + env.getProperty("ei.backend.instances.list.json.content") + "\n"
                 + "ei.eiffel.documentation.urls: " + env.getProperty("ei.eiffel.documentation.urls") + "\n"
                 + "logging.level.root: " + env.getProperty("logging.level.root") + "\n"

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

@@ -52,9 +52,6 @@ public class WebControllerUtils {
     @Value("${ei.eiffel.documentation.urls:#{null}}")
     private String eiffelDocumentationUrls;
 
-    @Value("${build.version:#{null}}")
-    private String applicationPropertiesVersion;
-
     private String version;
 
     private String applicationName;

src/main/resources/application.properties

@@ -1,10 +1,6 @@
 # REST api returns json in pretty format with jackson
 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=
-
 ######## EI Front-End
 server.port=8080
 ei.frontend.service.port=${server.port}
@@ -19,7 +15,6 @@ ei.use.secure.http.frontend=false
 #server.ssl.key-alias: <tomcat>
 
 ######## EI Default Back-Ends
-ei.backend.instances.filepath=
 #ei.backend.instances.list.json.content=
 ei.backend.instances.list.json.content=[{"name":"EI-Backend-1","host":"localhost","port":8090,"contextPath":"","https":false,"defaultBackend":true}]
 

src/main/resources/static/js/information.js

@@ -3,7 +3,6 @@ jQuery(document).ready(function () {
 
     // Fetch injected URL from DOM
     var frontEndVersion = $("#frontEndVersion").text();
-    var frontEndApplicationPropertiesVersion = $("#frontEndApplicationPropertiesVersion").text();
     var frontEndAppName = $("#frontendAppName").text();
 
     var body = document.getElementById("eiPageFrame");
@@ -24,9 +23,6 @@ jQuery(document).ready(function () {
     }
 
     function createFrontEndGeneralInfo() {
-        if (frontEndApplicationPropertiesVersion) {
-            frontEndVersion = frontEndVersion + " (" + frontEndApplicationPropertiesVersion + ")";
-        }
         var tableContent = [
             { key: "Application name", value: frontEndAppName },
             { key: "Version", value: frontEndVersion },

src/main/resources/templates/information.html

@@ -1,5 +1,4 @@
 <div class="d-none" id="frontEndVersion" th:text="${version}"></div>
-<div class="d-none" id="frontEndApplicationPropertiesVersion" th:text="${applicationPropertiesVersion}"></div>
 <div class="d-none" id="frontendAppName" th:text="${frontendAppName}"></div>
 <div class="d-none" id="backendServerUrl" th:text="${backendServerUrl}"></div>
 

src/test/java/com/ericsson/ei/frontend/WebControllerUtilsTest.java

@@ -35,7 +35,10 @@ public class WebControllerUtilsTest {
     @Test
     public void testGetFrontEndServiceUrl() throws Exception {
       String expectedUrl = String.format("http://%s:%s%s", HOST, PORT, CONTEXT_PATH);
-      controllerUtils = new WebControllerUtils(HOST, PORT, CONTEXT_PATH, false, null, null, null, null, null);
+      controllerUtils = new WebControllerUtils();
+      controllerUtils.setFrontendServiceHost(HOST);
+      controllerUtils.setFrontendServicePort(PORT);
+      controllerUtils.setFrontendContextPath(CONTEXT_PATH);
       assertEquals(expectedUrl, controllerUtils.getFrontEndServiceUrl());
     }
 }