Updated to use Hub-Common-Rest 1.2.5 to resolve encoding exception

blackducksoftware · May 23, 2017 · 8112e30 · 8112e30
1 parent 4dd6365
commit 8112e30
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>hub-common</artifactId>
-  <version>11.0.1-SNAPSHOT</version>
+  <version>11.0.1</version>
   <packaging>bundle</packaging>
 
   <name>Hub Common</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.blackducksoftware.integration</groupId>
       <artifactId>hub-common-rest</artifactId>
-      <version>1.1.1</version>
+      <version>1.2.5</version>
     </dependency>
     <dependency>
       <groupId>com.blackducksoftware.integration</groupId>

diff --git a/src/main/java/com/blackducksoftware/integration/hub/global/HubCredentialsFieldEnum.java b/src/main/java/com/blackducksoftware/integration/hub/global/HubCredentialsFieldEnum.java
@@ -23,7 +23,9 @@
  */
 package com.blackducksoftware.integration.hub.global;
 
-public enum HubCredentialsFieldEnum implements GlobalFieldKey {
+import com.blackducksoftware.integration.validator.FieldEnum;
+
+public enum HubCredentialsFieldEnum implements FieldEnum {
     USERNAME("hubUsername"), PASSWORD("hubPassword");
 
     private String key;

diff --git a/src/main/java/com/blackducksoftware/integration/hub/global/HubProxyInfoFieldEnum.java b/src/main/java/com/blackducksoftware/integration/hub/global/HubProxyInfoFieldEnum.java
@@ -23,7 +23,9 @@
  */
 package com.blackducksoftware.integration.hub.global;
 
-public enum HubProxyInfoFieldEnum implements GlobalFieldKey {
+import com.blackducksoftware.integration.validator.FieldEnum;
+
+public enum HubProxyInfoFieldEnum implements FieldEnum {
     PROXYHOST("hubProxyHost"),
     PROXYPORT("hubProxyPort"),
     PROXYUSERNAME("hubProxyUsername"),

diff --git a/src/main/java/com/blackducksoftware/integration/hub/global/HubServerConfigFieldEnum.java b/src/main/java/com/blackducksoftware/integration/hub/global/HubServerConfigFieldEnum.java
@@ -23,7 +23,9 @@
  */
 package com.blackducksoftware.integration.hub.global;
 
-public enum HubServerConfigFieldEnum implements GlobalFieldKey {
+import com.blackducksoftware.integration.validator.FieldEnum;
+
+public enum HubServerConfigFieldEnum implements FieldEnum {
     HUBURL("hubUrl"), CREDENTIALS("hubCredentials"), PROXYINFO("hubProxyInfo"), HUBTIMEOUT("hubTimeout");
 
     private String key;

diff --git a/src/main/java/com/blackducksoftware/integration/hub/scan/HubScanConfigFieldEnum.java b/src/main/java/com/blackducksoftware/integration/hub/scan/HubScanConfigFieldEnum.java
@@ -23,7 +23,9 @@
  */
 package com.blackducksoftware.integration.hub.scan;
 
-public enum HubScanConfigFieldEnum {
+import com.blackducksoftware.integration.validator.FieldEnum;
+
+public enum HubScanConfigFieldEnum implements FieldEnum{
     PROJECT("hubProject"),
     VERSION("hubVersion"),
     PHASE("hubPhase"),

diff --git a/src/main/java/com/blackducksoftware/integration/hub/validator/HubServerConfigValidator.java b/src/main/java/com/blackducksoftware/integration/hub/validator/HubServerConfigValidator.java
@@ -86,8 +86,8 @@ public ValidationResults assertValid() {
         final ValidationResults proxyResult = assertProxyValid();
         final ValidationResults credentialResult = assertCredentialsValid();
         final ValidationResults result = new ValidationResults();
-        result.addAllResultsStrings(proxyResult.getResultMap(), proxyResult.getValidationStatus());
-        result.addAllResultsStrings(credentialResult.getResultMap(), credentialResult.getValidationStatus());
+        result.addAllResults(proxyResult.getResultMap());
+        result.addAllResults(credentialResult.getResultMap());
         validateHubUrl(result);
         validateTimeout(result, null);
         return result;
@@ -142,7 +142,7 @@ public void validateHubUrl(final ValidationResults result) {
         if (proxyHost != null && proxyPort != null && proxyInfo == null) {
             // asserting proxy is valid if the User set the proxy information
             final ValidationResults proxyResults = assertProxyValid();
-            result.addAllResultsStrings(proxyResults.getResultMap(), proxyResults.getValidationStatus());
+            result.addAllResults(proxyResults.getResultMap());
         }
         URL hubURL = null;
         try {

diff --git a/src/test/java/com/blackducksoftware/integration/hub/global/HubCredentialsBuilderTest.java b/src/test/java/com/blackducksoftware/integration/hub/global/HubCredentialsBuilderTest.java
@@ -34,7 +34,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -43,6 +42,8 @@
 
 import com.blackducksoftware.integration.hub.builder.HubCredentialsBuilder;
 import com.blackducksoftware.integration.hub.validator.HubCredentialsValidator;
+import com.blackducksoftware.integration.validator.FieldEnum;
+import com.blackducksoftware.integration.validator.ValidationResult;
 import com.blackducksoftware.integration.validator.ValidationResults;
 
 public class HubCredentialsBuilderTest {
@@ -87,13 +88,12 @@ public void tearDown() {
 
     private List<String> getMessages(final ValidationResults result) {
         final List<String> messageList = new ArrayList<>();
-        final Map<Object, Set<String>> resultMap = result.getResultMap();
+        final Map<FieldEnum, Set<ValidationResult>> resultMap = result.getResultMap();
         for (final Object key : resultMap.keySet()) {
-            final Set<String> resultList = resultMap.get(key);
-
-            for (final String item : resultList) {
-                if (StringUtils.isNotBlank(item)) {
-                    messageList.add(item);
+            final Set<ValidationResult> resultList = resultMap.get(key);
+            for (final ValidationResult item : resultList) {
+                if (item != null) {
+                    messageList.add(item.toString());
                 }
             }
         }

diff --git a/src/test/java/com/blackducksoftware/integration/hub/global/HubProxyInfoBuilderTest.java b/src/test/java/com/blackducksoftware/integration/hub/global/HubProxyInfoBuilderTest.java
@@ -35,7 +35,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -44,6 +43,8 @@
 
 import com.blackducksoftware.integration.hub.builder.HubProxyInfoBuilder;
 import com.blackducksoftware.integration.hub.validator.HubProxyValidator;
+import com.blackducksoftware.integration.validator.FieldEnum;
+import com.blackducksoftware.integration.validator.ValidationResult;
 import com.blackducksoftware.integration.validator.ValidationResults;
 
 public class HubProxyInfoBuilderTest {
@@ -96,13 +97,13 @@ public void tearDown() {
 
     private List<String> getMessages(final ValidationResults result) {
         final List<String> messageList = new ArrayList<>();
-        final Map<Object, Set<String>> resultMap = result.getResultMap();
+        final Map<FieldEnum, Set<ValidationResult>> resultMap = result.getResultMap();
         for (final Object key : resultMap.keySet()) {
-            final Set<String> resultList = resultMap.get(key);
+            final Set<ValidationResult> resultList = resultMap.get(key);
 
-            for (final String item : resultList) {
-                if (StringUtils.isNotBlank(item)) {
-                    messageList.add(item);
+            for (final ValidationResult item : resultList) {
+                if (item != null) {
+                    messageList.add(item.toString());
                 }
             }
         }

diff --git a/src/test/java/com/blackducksoftware/integration/hub/global/HubServerConfigBuilderTest.java b/src/test/java/com/blackducksoftware/integration/hub/global/HubServerConfigBuilderTest.java
@@ -33,13 +33,14 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.blackducksoftware.integration.hub.builder.HubServerConfigBuilder;
 import com.blackducksoftware.integration.hub.validator.HubServerConfigValidator;
+import com.blackducksoftware.integration.validator.FieldEnum;
+import com.blackducksoftware.integration.validator.ValidationResult;
 import com.blackducksoftware.integration.validator.ValidationResults;
 
 public class HubServerConfigBuilderTest {
@@ -92,13 +93,13 @@ public void tearDown() {
 
     private List<String> getMessages(final ValidationResults result) {
         final List<String> messageList = new ArrayList<>();
-        final Map<Object, Set<String>> resultMap = result.getResultMap();
+        final Map<FieldEnum, Set<ValidationResult>> resultMap = result.getResultMap();
         for (final Object key : resultMap.keySet()) {
-            final Set<String> resultList = resultMap.get(key);
+            final Set<ValidationResult> resultList = resultMap.get(key);
 
-            for (final String item : resultList) {
-                if (StringUtils.isNotBlank(item)) {
-                    messageList.add(item);
+            for (final ValidationResult item : resultList) {
+                if (item != null) {
+                    messageList.add(item.toString());
                 }
             }
         }