revert bridge port handling

revert bridge port handling

Author: vasile-baluta

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("${server.port:#{null}}")
+    @Value("${ei.frontend.service.port:#{null}}")
     private int frontendServicePort;
 
     @Value("${ei.frontend.context.path:#{null}}")
@@ -76,19 +76,18 @@ public void init() throws IOException {
     /**
      * Formats the parameters in the class to an URL as String.
      *
-     * @return String
-     *      URL to this service
+     * @return String URL to this service
      */
     public String getFrontEndServiceUrl() {
         String requestedUrl = null;
         String http = "http";
         String contextPath = "";
         if (useSecureHttpFrontend) {
-        	http = "https";
+            http = "https";
         }
 
         if (frontendContextPath != null && !frontendContextPath.isEmpty()) {
-        	contextPath = ("/" + frontendContextPath).replace("//", "/");
+            contextPath = ("/" + frontendContextPath).replace("//", "/");
         }
 
         requestedUrl = String.format("%s://%s:%d%s", http, frontendServiceHost, frontendServicePort, contextPath);
@@ -101,8 +100,7 @@ public String getFrontEndServiceUrl() {
      * BackendInformation for this name, or null if no name was found.
      *
      * @param httpSession
-     * @return String
-     *      URL from found BackendInformation
+     * @return String URL from found BackendInformation
      */
     public String getBackEndServiceUrl(HttpSession httpSession) {
         String activeInstance = null;

src/main/resources/application.properties

@@ -7,6 +7,7 @@ spring.jackson.default-property-inclusion=non_null
 
 ######## EI Front-End
 server.port=8080
+ei.frontend.service.port=${server.port}
 ei.frontend.service.host=localhost
 ei.frontend.context.path=