Add portal property; correct docker build script.

[portal.git] / ecomp-portal-BE-common / src / main / java / org / openecomp / portalapp / portal / controller / WebAnalyticsExtAppController.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WebAnalyticsExtAppController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WebAnalyticsExtAppController.java
index b576161..662de30 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WebAnalyticsExtAppController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WebAnalyticsExtAppController.java
@@ -77,8 +77,10 @@ public class WebAnalyticsExtAppController extends EPRestrictedRESTfulBaseControl
        private static final String MACHINE_LEARNING_SERVICE_CTX = "/ml_api";
        private static final String REGISTER_ACTION = MACHINE_LEARNING_SERVICE_CTX + "/" + "registerAction";
        private static final String CONSUL_ML_SERVICE_ID = "machine-learning";
-       private static final String SERVICE_PROTOCOL = "http";
        private static final String APP_KEY = "uebkey";
+       private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WebAnalyticsExtAppController.class);
+       private AsyncRestTemplate restTemplate = new AsyncRestTemplate();
+
 
        @Autowired
        AuditService auditService;
@@ -86,10 +88,6 @@ public class WebAnalyticsExtAppController extends EPRestrictedRESTfulBaseControl
        @Autowired
        AppsCacheService appCacheService;
 
-       private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WebAnalyticsExtAppController.class);
-
-       private AsyncRestTemplate restTemplate = new AsyncRestTemplate();
-
        SuccessCallback<ResponseEntity<String>> successCallback = new SuccessCallback<ResponseEntity<String>>() {
                @Override
                public void onSuccess(ResponseEntity<String> arg) {
@@ -230,7 +228,7 @@ public class WebAnalyticsExtAppController extends EPRestrictedRESTfulBaseControl
 
                // send it!
                ListenableFuture<ResponseEntity<String>> out = restTemplate.exchange(
-                               SERVICE_PROTOCOL + "://"
+                               EcompPortalUtils.widgetMsProtocol() + "://"
                                                + consulHealthService.getServiceLocation(CONSUL_ML_SERVICE_ID,
                                                                SystemProperties.getProperty("microservices.m-learn.local.port"))
                                                + REGISTER_ACTION,