moving packages around

blackducksoftware · Feb 14, 2018 · bdb46ff · bdb46ff
1 parent 5b27289
commit bdb46ff
Show file tree

Hide file tree

Showing 83 changed files with 406 additions and 461 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,25 +5,21 @@ install: true
 addons:
   sonarcloud:
     token:
-      secure: "sA/yulmGwH6kSa/N6ajmvy3BgIo+9UWnvLN6X2t+6G3oKasii1rGNlBeUlHJGbTwIwsMfAjWc7/ddEYYNGWOHEnpusvL7zMj7/LKrk2d3spZUsJkwbI0t0bxi2Cv6qATkBlja+/vyhQQCbr90fNlb7OezYGU5zE0h9fOor+rjNXs+vdcVZVGiaRVs1ej49UotPnhu6G1hvbCYL0bINrnTN5OcKIDOJXXRp+FhBRcrJjRSrZQQLFmF2URsTdh43jxbB8eXKcLR/ZdkTWeY0Jnp7iaPNFbOSItdIBo8V2yGN1WL/5pPUQzb1jEAMffNpzkahnrdVVvSlHw0ywA1vfD36KGI677cymvIDWw69+PaostGcYIZu5g9MOKXWq3SPzSBnYM1aEGeUd+i242zx1rHN9RQC/n9EBqhnUcbfZWhUwNhDkQ9h9BYuJEBTY8qc/QgEDBmm3d8fTldFZVtoHOcubCRZBgxA5DgBhBnzQGA4/vDpVAmGweHsZXw+Z5JsQc4c2o/c/4AN+8U/zcjVFeXcqOBwLdyw4xjjEYeLPIQdtdopP4rdaH8ZUsWqrLX49y4OEq2LYeuvcGKIdyYwz263K27GdEdsq3ay72CxBIBH5U7aOCsXWwEp6HC0gMNCaWgIdkI6vF8zn7j8245NGS+BVx4alYiMMYauwgH55rzj8="
+      secure: "waxMwLRzQhFMmJ4jnwGFIM278ih5q0qpjC0tbUbGl7qf902rxzoCb00wMaq45Ib4Iqq5N9ltHRulDE/2NkSkG/dwOvxoI6ys+PUPxESpc0lOVL2KD1jqh/tf3yU0QPiC/bcBbutnlowCtHxiqMSbHuyXO1tdpU7mBHVwhadlgG6h11fpZDKxD0cj6mYvNEtxqp79kWyUAwilyDIqHcUVv8Qhv5N8cXe5JY/3lhnf8PZzX3jBdPrJ9eOjGtSrj+OtOOq/WvezaX8bSvboKZFUGTPqsoJTQOKYo7zJeoCyEvptHtyFl8XjXFdId3iW8A422tJpPjVbVAZgoJY1ge5wBjCDD8/8iTakUpMtd+rdDhBAt06k1wMZ1CEP1sJ6eh0AMcLsP3mg0Ms+nD6Z19VF4HT0iMX3U5wkZpZNX1HEGgC/XbBopVMA0K00jZcxIRw0aOYTBZzkWyO4IXG1RgjLj1u4oek7aKlvlIZv8tNV2C0e/++Vga5zDMvMs7FY/7GfuUSVUwPpK7x3t3EqqdtJR1tqc0NUeUpCNe+2zV5J7LbfghTzMnyBoUw441a8yWz5ltX+qOsYb97r4lQsoaukTtFM0szzzU3Dyt5FF6zEXPB/+yF4rDGljrZPsQvFHY5ZmnL9WE4thwxdAW7OCZNI+/wJh/zIRuBipBPARKPveJY="
 
 jdk:
 - oraclejdk8
 
 notifications:
   email:
     recipients:
-    - akamen@blackducksoftware.com
-    - jrichard@blackducksoftware.com
-    - psantos@blackducksoftware.com
-    - ekerwin@blackducksoftware.com
+    - bdsoss@blackducksoftware.com
 
 script:
- - "./gradlew clean build sonarqube"
+- "./gradlew clean build jacocoTestReport coveralls sonarqube"
 
 after_success:
- - "./gradlew test jacocoTestReport coveralls"
- - bash <(curl -s https://copilot.blackducksoftware.com/ci/travis/scripts/upload)
+- bash <(curl -s https://copilot.blackducksoftware.com/ci/travis/scripts/upload)
 
 cache:
   directories:

diff --git a/src/main/java/com/blackducksoftware/integration/hub/cli/SimpleScanUtility.java b/src/main/java/com/blackducksoftware/integration/hub/cli/SimpleScanUtility.java
@@ -47,15 +47,15 @@
 
 import com.blackducksoftware.integration.exception.EncryptionException;
 import com.blackducksoftware.integration.exception.IntegrationException;
-import com.blackducksoftware.integration.hub.ScannerSplitStream;
-import com.blackducksoftware.integration.hub.StreamRedirectThread;
 import com.blackducksoftware.integration.hub.api.view.ScanSummaryView;
-import com.blackducksoftware.integration.hub.certificate.HubCertificateHandler;
+import com.blackducksoftware.integration.hub.configuration.HubScanConfig;
+import com.blackducksoftware.integration.hub.configuration.HubServerConfig;
 import com.blackducksoftware.integration.hub.exception.HubIntegrationException;
 import com.blackducksoftware.integration.hub.exception.ScanFailedException;
-import com.blackducksoftware.integration.hub.global.HubServerConfig;
 import com.blackducksoftware.integration.hub.proxy.ProxyInfo;
-import com.blackducksoftware.integration.hub.scan.HubScanConfig;
+import com.blackducksoftware.integration.hub.service.model.HubCertificateHandler;
+import com.blackducksoftware.integration.hub.service.model.ScannerSplitStream;
+import com.blackducksoftware.integration.hub.service.model.StreamRedirectThread;
 import com.blackducksoftware.integration.log.IntLogger;
 import com.blackducksoftware.integration.util.CIEnvironmentVariables;
 import com.google.gson.Gson;

diff --git a/...e/integration/hub/scan/HubScanConfig.java → ...tion/hub/configuration/HubScanConfig.java b/...e/integration/hub/scan/HubScanConfig.java → ...tion/hub/configuration/HubScanConfig.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.scan;
+package com.blackducksoftware.integration.hub.configuration;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...ion/hub/builder/HubScanConfigBuilder.java → ...b/configuration/HubScanConfigBuilder.java b/...ion/hub/builder/HubScanConfigBuilder.java → ...b/configuration/HubScanConfigBuilder.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.builder;
+package com.blackducksoftware.integration.hub.configuration;
 
 import java.io.File;
 import java.util.Collections;
@@ -32,8 +32,6 @@
 import org.apache.commons.lang3.math.NumberUtils;
 
 import com.blackducksoftware.integration.builder.AbstractBuilder;
-import com.blackducksoftware.integration.hub.scan.HubScanConfig;
-import com.blackducksoftware.integration.hub.validator.HubScanConfigValidator;
 import com.blackducksoftware.integration.validator.AbstractValidator;
 
 public class HubScanConfigBuilder extends AbstractBuilder<HubScanConfig> {

diff --git a/...tion/hub/scan/HubScanConfigFieldEnum.java → ...configuration/HubScanConfigFieldEnum.java b/...tion/hub/scan/HubScanConfigFieldEnum.java → ...configuration/HubScanConfigFieldEnum.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.scan;
+package com.blackducksoftware.integration.hub.configuration;
 
 import com.blackducksoftware.integration.validator.FieldEnum;
 

diff --git a/...hub/validator/HubScanConfigValidator.java → ...configuration/HubScanConfigValidator.java b/...hub/validator/HubScanConfigValidator.java → ...configuration/HubScanConfigValidator.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.validator;
+package com.blackducksoftware.integration.hub.configuration;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,7 +30,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.blackducksoftware.integration.hub.scan.HubScanConfigFieldEnum;
 import com.blackducksoftware.integration.validator.AbstractValidator;
 import com.blackducksoftware.integration.validator.ValidationResult;
 import com.blackducksoftware.integration.validator.ValidationResultEnum;

diff --git a/...tegration/hub/global/HubServerConfig.java → ...on/hub/configuration/HubServerConfig.java b/...tegration/hub/global/HubServerConfig.java → ...on/hub/configuration/HubServerConfig.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.global;
+package com.blackducksoftware.integration.hub.configuration;
 
 import java.io.Serializable;
 import java.net.URL;

diff --git a/...n/hub/builder/HubServerConfigBuilder.java → ...configuration/HubServerConfigBuilder.java b/...n/hub/builder/HubServerConfigBuilder.java → ...configuration/HubServerConfigBuilder.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.builder;
+package com.blackducksoftware.integration.hub.configuration;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -34,10 +34,8 @@
 import com.blackducksoftware.integration.exception.IntegrationCertificateException;
 import com.blackducksoftware.integration.hub.Credentials;
 import com.blackducksoftware.integration.hub.CredentialsBuilder;
-import com.blackducksoftware.integration.hub.global.HubServerConfig;
 import com.blackducksoftware.integration.hub.proxy.ProxyInfo;
 import com.blackducksoftware.integration.hub.proxy.ProxyInfoBuilder;
-import com.blackducksoftware.integration.hub.validator.HubServerConfigValidator;
 import com.blackducksoftware.integration.log.IntLogger;
 import com.blackducksoftware.integration.log.LogLevel;
 import com.blackducksoftware.integration.log.PrintStreamIntLogger;

diff --git a/.../hub/global/HubServerConfigFieldEnum.java → ...nfiguration/HubServerConfigFieldEnum.java b/.../hub/global/HubServerConfigFieldEnum.java → ...nfiguration/HubServerConfigFieldEnum.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.global;
+package com.blackducksoftware.integration.hub.configuration;
 
 import com.blackducksoftware.integration.validator.FieldEnum;
 

diff --git a/...b/validator/HubServerConfigValidator.java → ...nfiguration/HubServerConfigValidator.java b/...b/validator/HubServerConfigValidator.java → ...nfiguration/HubServerConfigValidator.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.validator;
+package com.blackducksoftware.integration.hub.configuration;
 
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
@@ -34,10 +34,12 @@
 import com.blackducksoftware.integration.hub.ApiKeyField;
 import com.blackducksoftware.integration.hub.Credentials;
 import com.blackducksoftware.integration.hub.CredentialsBuilder;
-import com.blackducksoftware.integration.hub.global.HubServerConfigFieldEnum;
 import com.blackducksoftware.integration.hub.proxy.ProxyInfo;
 import com.blackducksoftware.integration.hub.proxy.ProxyInfoField;
 import com.blackducksoftware.integration.hub.rest.exception.IntegrationRestException;
+import com.blackducksoftware.integration.hub.service.model.HubServerVerifier;
+import com.blackducksoftware.integration.hub.validator.CredentialsValidator;
+import com.blackducksoftware.integration.hub.validator.ProxyInfoValidator;
 import com.blackducksoftware.integration.validator.AbstractValidator;
 import com.blackducksoftware.integration.validator.ValidationResult;
 import com.blackducksoftware.integration.validator.ValidationResultEnum;

diff --git a/...a/com/blackducksoftware/integration/hub/notification/AbstractNotificationTransformer.java b/...a/com/blackducksoftware/integration/hub/notification/AbstractNotificationTransformer.java
@@ -32,34 +32,33 @@
 import com.blackducksoftware.integration.hub.api.generated.view.NotificationView;
 import com.blackducksoftware.integration.hub.api.generated.view.ProjectVersionView;
 import com.blackducksoftware.integration.hub.api.view.MetaHandler;
-import com.blackducksoftware.integration.hub.dataservice.HubDataService;
 import com.blackducksoftware.integration.hub.exception.HubIntegrationException;
 import com.blackducksoftware.integration.hub.exception.HubItemTransformException;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
+import com.blackducksoftware.integration.hub.service.HubService;
 import com.blackducksoftware.integration.log.IntBufferedLogger;
 import com.blackducksoftware.integration.log.IntLogger;
 import com.blackducksoftware.integration.parallel.processor.ItemTransformer;
 
 public abstract class AbstractNotificationTransformer implements ItemTransformer<NotificationContentItem, NotificationView> {
     private final IntLogger logger;
-    private final HubDataService hubResponseService;
+    private final HubService hubResponseService;
     private final MetaHandler metaHandler;
 
-    public AbstractNotificationTransformer(final HubDataService hubResponseService,
+    public AbstractNotificationTransformer(final HubService hubResponseService,
             final MetaHandler metaHandler) {
         this.hubResponseService = hubResponseService;
         this.logger = new IntBufferedLogger();
         this.metaHandler = metaHandler;
     }
 
-    public AbstractNotificationTransformer(final HubDataService hubResponseService, final IntLogger logger,
+    public AbstractNotificationTransformer(final HubService hubResponseService, final IntLogger logger,
             final MetaHandler metaHandler) {
         this.hubResponseService = hubResponseService;
         this.logger = logger;
         this.metaHandler = metaHandler;
     }
 
-    public HubDataService getHubDataService() {
+    public HubService getHubDataService() {
         return hubResponseService;
     }
 

diff --git a/...in/java/com/blackducksoftware/integration/hub/notification/AbstractPolicyTransformer.java b/...in/java/com/blackducksoftware/integration/hub/notification/AbstractPolicyTransformer.java
@@ -35,9 +35,8 @@
 import com.blackducksoftware.integration.hub.api.generated.view.ProjectVersionView;
 import com.blackducksoftware.integration.hub.api.response.ComponentVersionStatus;
 import com.blackducksoftware.integration.hub.api.view.MetaHandler;
-import com.blackducksoftware.integration.hub.dataservice.HubDataService;
 import com.blackducksoftware.integration.hub.exception.HubItemTransformException;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
+import com.blackducksoftware.integration.hub.service.HubService;
 import com.blackducksoftware.integration.log.IntLogger;
 
 public abstract class AbstractPolicyTransformer extends AbstractNotificationTransformer {
@@ -46,14 +45,14 @@ public abstract class AbstractPolicyTransformer extends AbstractNotificationTran
     /**
      * policyFilter.size() == 0: match no rules policyFilter == null: match all rules
      */
-    public AbstractPolicyTransformer(final HubDataService hubResponseService,
+    public AbstractPolicyTransformer(final HubService hubResponseService,
             final PolicyNotificationFilter policyFilter,
             final MetaHandler metaHandler) {
         super(hubResponseService, metaHandler);
         this.policyFilter = policyFilter;
     }
 
-    public AbstractPolicyTransformer(final HubDataService hubResponseService, final IntLogger logger,
+    public AbstractPolicyTransformer(final HubService hubResponseService, final IntLogger logger,
             final PolicyNotificationFilter policyFilter,
             final MetaHandler metaHandler) {
         super(hubResponseService, logger, metaHandler);

diff --git a/...main/java/com/blackducksoftware/integration/hub/notification/NotificationContentItem.java b/...main/java/com/blackducksoftware/integration/hub/notification/NotificationContentItem.java
@@ -30,7 +30,6 @@
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 import com.blackducksoftware.integration.hub.api.generated.view.ComponentVersionView;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
 
 public class NotificationContentItem implements Comparable<NotificationContentItem> {
     private final ProjectVersionModel projectVersion;

diff --git a/src/main/java/com/blackducksoftware/integration/hub/notification/PolicyContentItem.java b/src/main/java/com/blackducksoftware/integration/hub/notification/PolicyContentItem.java
@@ -26,7 +26,6 @@
 import java.util.Date;
 
 import com.blackducksoftware.integration.hub.api.generated.view.ComponentVersionView;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
 
 public class PolicyContentItem extends NotificationContentItem {
     private final String componentUrl;

diff --git a/...in/java/com/blackducksoftware/integration/hub/notification/PolicyOverrideContentItem.java b/...in/java/com/blackducksoftware/integration/hub/notification/PolicyOverrideContentItem.java
@@ -29,7 +29,6 @@
 
 import com.blackducksoftware.integration.hub.api.generated.view.ComponentVersionView;
 import com.blackducksoftware.integration.hub.api.generated.view.PolicyRuleView;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
 
 public class PolicyOverrideContentItem extends PolicyViolationContentItem {
     private final String firstName;

diff --git a/...com/blackducksoftware/integration/hub/notification/PolicyViolationClearedContentItem.java b/...com/blackducksoftware/integration/hub/notification/PolicyViolationClearedContentItem.java
@@ -29,7 +29,6 @@
 
 import com.blackducksoftware.integration.hub.api.generated.view.ComponentVersionView;
 import com.blackducksoftware.integration.hub.api.generated.view.PolicyRuleView;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
 
 public class PolicyViolationClearedContentItem extends PolicyViolationContentItem {
     public PolicyViolationClearedContentItem(final Date createdAt, final ProjectVersionModel projectVersion,

diff --git a/...com/blackducksoftware/integration/hub/notification/PolicyViolationClearedTransformer.java b/...com/blackducksoftware/integration/hub/notification/PolicyViolationClearedTransformer.java
@@ -35,19 +35,18 @@
 import com.blackducksoftware.integration.hub.api.response.ComponentVersionStatus;
 import com.blackducksoftware.integration.hub.api.view.MetaHandler;
 import com.blackducksoftware.integration.hub.api.view.RuleViolationClearedNotificationView;
-import com.blackducksoftware.integration.hub.dataservice.HubDataService;
 import com.blackducksoftware.integration.hub.exception.HubItemTransformException;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
+import com.blackducksoftware.integration.hub.service.HubService;
 import com.blackducksoftware.integration.log.IntLogger;
 
 public class PolicyViolationClearedTransformer extends AbstractPolicyTransformer {
-    public PolicyViolationClearedTransformer(final HubDataService hubResponseService,
+    public PolicyViolationClearedTransformer(final HubService hubResponseService,
             final PolicyNotificationFilter policyFilter, final MetaHandler metaHandler) {
         super(hubResponseService,
                 policyFilter, metaHandler);
     }
 
-    public PolicyViolationClearedTransformer(final HubDataService hubResponseService, final IntLogger logger,
+    public PolicyViolationClearedTransformer(final HubService hubResponseService, final IntLogger logger,
             final PolicyNotificationFilter policyFilter, final MetaHandler metaHandler) {
         super(hubResponseService, logger,
                 policyFilter, metaHandler);

diff --git a/...n/java/com/blackducksoftware/integration/hub/notification/PolicyViolationContentItem.java b/...n/java/com/blackducksoftware/integration/hub/notification/PolicyViolationContentItem.java
@@ -29,7 +29,6 @@
 
 import com.blackducksoftware.integration.hub.api.generated.view.ComponentVersionView;
 import com.blackducksoftware.integration.hub.api.generated.view.PolicyRuleView;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
 
 public class PolicyViolationContentItem extends PolicyContentItem {
     private final List<PolicyRuleView> policyRuleList;

diff --git a/...om/blackducksoftware/integration/hub/notification/PolicyViolationOverrideTransformer.java b/...om/blackducksoftware/integration/hub/notification/PolicyViolationOverrideTransformer.java
@@ -39,19 +39,18 @@
 import com.blackducksoftware.integration.hub.api.response.ComponentVersionStatus;
 import com.blackducksoftware.integration.hub.api.view.MetaHandler;
 import com.blackducksoftware.integration.hub.api.view.PolicyOverrideNotificationView;
-import com.blackducksoftware.integration.hub.dataservice.HubDataService;
 import com.blackducksoftware.integration.hub.exception.HubItemTransformException;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
+import com.blackducksoftware.integration.hub.service.HubService;
 import com.blackducksoftware.integration.log.IntLogger;
 
 public class PolicyViolationOverrideTransformer extends AbstractPolicyTransformer {
-    public PolicyViolationOverrideTransformer(final HubDataService hubResponseService,
+    public PolicyViolationOverrideTransformer(final HubService hubResponseService,
             final PolicyNotificationFilter policyFilter, final MetaHandler metaHandler) {
         super(hubResponseService,
                 policyFilter, metaHandler);
     }
 
-    public PolicyViolationOverrideTransformer(final HubDataService hubResponseService, final IntLogger logger,
+    public PolicyViolationOverrideTransformer(final HubService hubResponseService, final IntLogger logger,
             final PolicyNotificationFilter policyFilter, final MetaHandler metaHandler) {
         super(hubResponseService, logger,
                 policyFilter, metaHandler);

diff --git a/...n/java/com/blackducksoftware/integration/hub/notification/PolicyViolationTransformer.java b/...n/java/com/blackducksoftware/integration/hub/notification/PolicyViolationTransformer.java
@@ -35,18 +35,17 @@
 import com.blackducksoftware.integration.hub.api.response.ComponentVersionStatus;
 import com.blackducksoftware.integration.hub.api.view.MetaHandler;
 import com.blackducksoftware.integration.hub.api.view.RuleViolationNotificationView;
-import com.blackducksoftware.integration.hub.dataservice.HubDataService;
 import com.blackducksoftware.integration.hub.exception.HubItemTransformException;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
+import com.blackducksoftware.integration.hub.service.HubService;
 import com.blackducksoftware.integration.log.IntLogger;
 
 public class PolicyViolationTransformer extends AbstractPolicyTransformer {
-    public PolicyViolationTransformer(final HubDataService hubResponseService,
+    public PolicyViolationTransformer(final HubService hubResponseService,
             final PolicyNotificationFilter policyFilter, final MetaHandler metaHandler) {
         super(hubResponseService, policyFilter, metaHandler);
     }
 
-    public PolicyViolationTransformer(final HubDataService hubResponseService, final IntLogger logger,
+    public PolicyViolationTransformer(final HubService hubResponseService, final IntLogger logger,
             final PolicyNotificationFilter policyFilter, final MetaHandler metaHandler) {
         super(hubResponseService, logger, policyFilter, metaHandler);
     }

diff --git a/...ub/service/model/ProjectVersionModel.java → ...hub/notification/ProjectVersionModel.java b/...ub/service/model/ProjectVersionModel.java → ...hub/notification/ProjectVersionModel.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.service.model;
+package com.blackducksoftware.integration.hub.notification;
 
 import java.util.Date;
 

diff --git a/...ain/java/com/blackducksoftware/integration/hub/notification/VulnerabilityContentItem.java b/...ain/java/com/blackducksoftware/integration/hub/notification/VulnerabilityContentItem.java
@@ -29,7 +29,6 @@
 
 import com.blackducksoftware.integration.hub.api.generated.view.ComponentVersionView;
 import com.blackducksoftware.integration.hub.api.response.VulnerabilitySourceQualifiedId;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
 
 public class VulnerabilityContentItem extends NotificationContentItem {
     private final List<VulnerabilitySourceQualifiedId> addedVulnList;

diff --git a/...ain/java/com/blackducksoftware/integration/hub/notification/VulnerabilityTransformer.java b/...ain/java/com/blackducksoftware/integration/hub/notification/VulnerabilityTransformer.java
@@ -33,16 +33,15 @@
 import com.blackducksoftware.integration.hub.api.response.VulnerabilitySourceQualifiedId;
 import com.blackducksoftware.integration.hub.api.view.MetaHandler;
 import com.blackducksoftware.integration.hub.api.view.VulnerabilityNotificationView;
-import com.blackducksoftware.integration.hub.dataservice.HubDataService;
 import com.blackducksoftware.integration.hub.exception.HubIntegrationException;
 import com.blackducksoftware.integration.hub.exception.HubItemTransformException;
-import com.blackducksoftware.integration.hub.service.model.ProjectVersionModel;
+import com.blackducksoftware.integration.hub.service.HubService;
 import com.blackducksoftware.integration.log.IntLogger;
 
 public class VulnerabilityTransformer extends AbstractNotificationTransformer {
     private final IntLogger logger;
 
-    public VulnerabilityTransformer(final HubDataService hubResponseService, final MetaHandler metaHandler, final IntLogger logger) {
+    public VulnerabilityTransformer(final HubService hubResponseService, final MetaHandler metaHandler, final IntLogger logger) {
         super(hubResponseService,
                 metaHandler);
         this.logger = logger;