X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FA1MediatorConfiguration.java;h=fd1bcbc92ef1db62a31e5c732586638ace6ecc57;hb=662cc613e80c4079fdf5a54ce3135652cb9ad9a1;hp=0c8f4f21cffeabbc982a64a66a92ec939eb43645;hpb=b8f4e986970eab6cfa5729c24680f2816f056edb;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
index 0c8f4f21..fd1bcbc9 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
 package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
-import java.net.URI;
-import java.net.URISyntaxException;
 
 import org.oransc.ric.a1med.client.api.A1MediatorApi;
 import org.oransc.ric.a1med.client.invoker.ApiClient;
@@ -33,13 +31,14 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.DefaultUriBuilderFactory;
 
 /**
  * Creates an A1 mediator client as a bean to be managed by the Spring
  * container.
  */
 @Configuration
-@Profile("!mock")
+@Profile("!test")
 public class A1MediatorConfiguration {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -49,10 +48,10 @@ public class A1MediatorConfiguration {
 
 	@Autowired
 	public A1MediatorConfiguration(@Value("${a1med.url.prefix}") final String urlPrefix, //
-			@Value("${a1med.url.suffix}") final String urlSuffix) throws URISyntaxException {
+			@Value("${a1med.url.suffix}") final String urlSuffix) {
 		logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix);
-		URI uri = new URI(urlPrefix.trim() + "/" + urlSuffix.trim()).normalize();
-		a1medUrl = uri.toString();
+		a1medUrl = new DefaultUriBuilderFactory(urlPrefix.trim()).builder().path(urlSuffix.trim()).build().normalize()
+				.toString();
 		logger.info("Configuring A1 Mediator at URL {}", a1medUrl);
 	}