Normalize to one trailing slash on Nexus URL

Change-Id: Ib1c463f6c54c067ed60059dea42ff85e53ade265
Issue-ID: ACUMOS-2554
Signed-off-by: Andrew Gauld <agauld@att.com>

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index e262190..46254a5 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -23,10 +23,11 @@ Federation Gateway Release Notes
 This server is available as a Docker image in a Docker registry at the Linux Foundation.
 The image name is "federation-gateway" and the tag is a version string as shown below. 
 
 This server is available as a Docker image in a Docker registry at the Linux Foundation.
 The image name is "federation-gateway" and the tag is a version string as shown below. 
 

-Version 2.0.1, 2019-02-21
+Version 2.0.1, 2019-02-22

 -------------------------
 
 * Add catalogId field in solution search selector (`ACUMOS-2285 <https://jira.acumos.org/browse/ACUMOS-2285>`_)
 -------------------------
 
 * Add catalogId field in solution search selector (`ACUMOS-2285 <https://jira.acumos.org/browse/ACUMOS-2285>`_)

+* Normalize configured Nexus URL to have exactly one trailing slash (`ACUMOS-2554 <https://jira.acumos.org/browse/ACUMOS-2554>`_)

 
 Version 2.0.0, 2019-02-20
 -------------------------
 
 Version 2.0.0, 2019-02-20
 -------------------------

diff --git a/gateway/src/main/java/org/acumos/federation/gateway/config/NexusConfiguration.java b/gateway/src/main/java/org/acumos/federation/gateway/config/NexusConfiguration.java
index 66e988c..adbe69f 100644 (file)
--- a/gateway/src/main/java/org/acumos/federation/gateway/config/NexusConfiguration.java
+++ b/gateway/src/main/java/org/acumos/federation/gateway/config/NexusConfiguration.java
@@ -2,7 +2,7 @@
  * ===============LICENSE_START=======================================================
  * Acumos
  * ===================================================================================
  * ===============LICENSE_START=======================================================
  * Acumos
  * ===================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property & Tech Mahindra. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property & Tech Mahindra. All rights reserved.

  * ===================================================================================
  * This Acumos software file is distributed by AT&T and Tech Mahindra
  * under the Apache License, Version 2.0 (the "License");
  * ===================================================================================
  * This Acumos software file is distributed by AT&T and Tech Mahindra
  * under the Apache License, Version 2.0 (the "License");


@@ -84,9 +84,15 @@ public class NexusConfiguration {
                this.url = new URL(theSpec);
   }
        
                this.url = new URL(theSpec);
   }
        

+
+       /**
+        * Get the normalized URL for the nexus content server.
+        * @return the URL, as a String, with exactly one trailing slash.
+        */
+

        public String getUrl() {
        public String getUrl() {

-               return this.url.toString();
-  }
+               return this.url.toString().replaceAll("/*$", "") + "/";
+       }

 
        public void setUsername(String theUsername) {
                this.username = theUsername;
 
        public void setUsername(String theUsername) {
                this.username = theUsername;