- Fix issue #568

Author: rathnapandi

modules/apim-adapter/src/main/java/com/axway/apim/lib/CoreParameters.java

@@ -74,6 +74,7 @@ public static Mode valueOfDefault(String key) {
     private boolean disableCompression;
     private boolean overrideSpecBasePath;
     private String customHeaders;
+    private String apiBasepath;
 
     public CoreParameters() {
         instance = this;
@@ -143,6 +144,9 @@ public int getPort2() {
 
 
     public String getApiBasepath() {
+        if (apiManagerUrl != null) {
+            return apiBasepath;
+        }
         return DEFAULT_API_BASEPATH;
     }
 
@@ -247,6 +251,7 @@ public void setAPIManagerURL(String apiManagerUrl) throws AppException {
         if (apiManagerUrl == null) return;
         try {
             this.apiManagerUrl = new URI(apiManagerUrl);
+            this.apiBasepath = this.apiManagerUrl.getPath();
         } catch (URISyntaxException e) {
             throw new AppException("Error parsing up API-Manager URL: " + apiManagerUrl, ErrorCode.INVALID_PARAMETER, e);
         }
@@ -257,7 +262,13 @@ public URI getAPIManagerURL() throws AppException {
             if (apiManagerUrl == null) {
                 return new URI("https://" + this.getHostname2() + ":" + this.getPort2());
             }
-            return apiManagerUrl;
+            URI uri = apiManagerUrl.resolve("/");
+            String uriStr = uri.toString();
+            if (uriStr.endsWith("/")) {
+                return new URI(uriStr.substring(0, uriStr.length() - 1));
+            }
+            return uri;
+
         } catch (URISyntaxException e) {
             throw new AppException("Error setting up API-Manager URL", ErrorCode.INVALID_PARAMETER, e);
         }

modules/apim-adapter/src/test/java/com/axway/lib/CoreParametersTest.java

@@ -7,6 +7,9 @@
 import com.axway.apim.adapter.CacheType;
 import com.axway.apim.lib.CoreParameters;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+
 public class CoreParametersTest {
 
 	@Test
@@ -137,4 +140,32 @@ public void testIgnoreQuota(){
 		params.setIgnoreQuotas(true);
 		Assert.assertTrue(params.isIgnoreQuotas());
 	}
+
+    @Test
+    public void testCustomBasepath() throws AppException {
+        CoreParameters params = new CoreParameters();
+        params.setAPIManagerURL("https://localhost:8075/api/portal/v1.4/test");
+        Assert.assertEquals(params.getApiBasepath(), "/api/portal/v1.4/test");
+    }
+
+    @Test
+    public void testDefaultBasepath()  {
+        CoreParameters params = new CoreParameters();
+        Assert.assertEquals(params.getApiBasepath(), "/api/portal/v1.4");
+    }
+
+    @Test
+    public void testApiManagerUrl() throws AppException, URISyntaxException {
+        CoreParameters params = new CoreParameters();
+        params.setAPIManagerURL("https://localhost:8075/api/portal/v1.4/test");
+        Assert.assertEquals(params.getAPIManagerURL(), new URI("https://localhost:8075"));
+    }
+
+    @Test
+    public void testApiManagerUrlWithoutBasepath() throws AppException, URISyntaxException {
+        CoreParameters params = new CoreParameters();
+        params.setAPIManagerURL("https://localhost:8075");
+        Assert.assertEquals(params.getAPIManagerURL(), new URI("https://localhost:8075"));
+    }
+
 }