Updated to use Hub-Common 29.0.0, normalized path

build.gradle

@@ -14,7 +14,7 @@ version = '0.0.16-SNAPSHOT'
 apply plugin: 'com.blackducksoftware.integration.library'
 
 dependencies {
-    compile('com.blackducksoftware.integration:hub-common:28.0.4')
+    compile('com.blackducksoftware.integration:hub-common:29.0.0')
     compile 'org.codehaus.groovy:groovy-all:2.4.12'
     compile 'org.apache.commons:commons-compress:1.13'
 

src/main/groovy/com/blackducksoftware/integration/hub/artifactory/ArtifactoryUriCombiner.java

@@ -0,0 +1,26 @@
+package com.blackducksoftware.integration.hub.artifactory;
+
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.apache.http.client.utils.URIBuilder;
+
+import com.blackducksoftware.integration.exception.IntegrationException;
+import com.blackducksoftware.integration.hub.service.model.UriCombiner;
+
+public class ArtifactoryUriCombiner extends UriCombiner {
+    @Override
+    public String pieceTogetherUri(final URL baseUrl, final String path) throws IntegrationException {
+        String uri;
+        final String normalizedPath = path.startsWith("/") ? path : "/" + path;
+        try {
+            final URIBuilder uriBuilder = new URIBuilder(baseUrl.toURI());
+            uriBuilder.setPath(normalizedPath);
+            uri = uriBuilder.build().toString();
+        } catch (final URISyntaxException e) {
+            throw new IntegrationException(e.getMessage(), e);
+        }
+        return uri;
+    }
+
+}

src/main/groovy/com/blackducksoftware/integration/hub/artifactory/BlackDuckArtifactoryConfig.java

@@ -30,6 +30,8 @@
 
 import com.blackducksoftware.integration.hub.configuration.HubServerConfig;
 import com.blackducksoftware.integration.hub.configuration.HubServerConfigBuilder;
+import com.blackducksoftware.integration.hub.configuration.HubServerConfigValidator;
+import com.blackducksoftware.integration.hub.service.model.HubServerVerifier;
 
 public class BlackDuckArtifactoryConfig {
     private File homeDirectory;
@@ -51,7 +53,10 @@ public void loadProperties(final File propertiesFile) throws IOException {
             properties.load(fileInputStream);
         }
 
-        final HubServerConfigBuilder hubServerConfigBuilder = new HubServerConfigBuilder();
+        final ArtifactoryUriCombiner artifactoryUriCombiner = new ArtifactoryUriCombiner();
+        final HubServerVerifier hubServerVerifier = new HubServerVerifier(artifactoryUriCombiner);
+        final HubServerConfigValidator hubServerConfigValidator = new HubServerConfigValidator(hubServerVerifier);
+        final HubServerConfigBuilder hubServerConfigBuilder = new HubServerConfigBuilder(hubServerConfigValidator);
         hubServerConfigBuilder.setFromProperties(properties);
         hubServerConfig = hubServerConfigBuilder.build();
     }