cleaning up packages

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

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,19 +12,13 @@ version = '27.0.0-SNAPSHOT'
 
 apply plugin: 'com.blackducksoftware.integration.library'
 
-repositories {
-    mavenLocal()
-}
 dependencies {
-    compile ('com.blackducksoftware.integration:hub-common-rest:6.1.0') {
-        exclude group: 'com.blackducksoftware.integration', module: 'integration-common'
-    }
-    compile 'com.blackducksoftware.integration:hub-common-api:4.4.0'
-    compile 'com.blackducksoftware.integration:hub-common-reporting:4.0.0'
-    compile 'com.blackducksoftware.integration:integration-bdio:12.0.0'
-    compile 'com.blackducksoftware.integration:phone-home-client:0.6.1-SNAPSHOT'
+    compile 'com.blackducksoftware.integration:hub-common-rest:6.1.1'
+    compile 'com.blackducksoftware.integration:hub-common-api:4.4.0.1'
+    compile 'com.blackducksoftware.integration:hub-common-reporting:4.0.1'
+    compile 'com.blackducksoftware.integration:integration-bdio:12.0.1'
+    compile 'com.blackducksoftware.integration:phone-home-client:0.6.1'
 
-    compile 'com.blackducksoftware.integration:integration-common:9.1.0-SNAPSHOT'
     compile 'joda-time:joda-time:2.9.6'
 
     testCompile 'org.codehaus.groovy:groovy-all:2.4.12'

diff --git a/...in/java/com/blackducksoftware/integration/hub/dataservice/ExtensionConfigDataService.java b/...in/java/com/blackducksoftware/integration/hub/dataservice/ExtensionConfigDataService.java
@@ -32,12 +32,12 @@
 import com.blackducksoftware.integration.hub.api.generated.view.ExternalExtensionUserView;
 import com.blackducksoftware.integration.hub.api.generated.view.ExternalExtensionView;
 import com.blackducksoftware.integration.hub.api.view.MetaHandler;
-import com.blackducksoftware.integration.hub.notification.ParallelResourceProcessor;
-import com.blackducksoftware.integration.hub.notification.ParallelResourceProcessorResults;
 import com.blackducksoftware.integration.hub.rest.RestConnection;
 import com.blackducksoftware.integration.hub.service.model.UserConfigItem;
 import com.blackducksoftware.integration.hub.service.model.UserConfigTransform;
 import com.blackducksoftware.integration.log.IntLogger;
+import com.blackducksoftware.integration.parallel.processor.ParallelResourceProcessor;
+import com.blackducksoftware.integration.parallel.processor.ParallelResourceProcessorResults;
 
 public class ExtensionConfigDataService extends HubDataService {
     private final UserConfigTransform userConfigTransform;
@@ -47,7 +47,7 @@ public ExtensionConfigDataService(final IntLogger logger, final RestConnection r
         super(restConnection);
         userConfigTransform = new UserConfigTransform(this);
         parallelProcessor = new ParallelResourceProcessor<>(logger);
-        parallelProcessor.addTransform(ExternalExtensionUserView.class, userConfigTransform);
+        parallelProcessor.addTransformer(ExternalExtensionUserView.class, userConfigTransform);
     }
 
     public Map<String, ExternalExtensionConfigValueView> getGlobalConfigMap(final String extensionUrl) throws IntegrationException {

diff --git a/src/main/java/com/blackducksoftware/integration/hub/service/model/UserConfigTransform.java b/src/main/java/com/blackducksoftware/integration/hub/service/model/UserConfigTransform.java
@@ -34,6 +34,7 @@
 import com.blackducksoftware.integration.hub.api.generated.view.ExternalExtensionUserView;
 import com.blackducksoftware.integration.hub.api.generated.view.UserView;
 import com.blackducksoftware.integration.hub.dataservice.HubDataService;
+import com.blackducksoftware.integration.parallel.processor.ItemTransformer;
 
 public class UserConfigTransform implements ItemTransformer<UserConfigItem, ExternalExtensionUserView> {
     private final HubDataService hubService;

diff --git a/...st/groovy/com/blackducksoftware/integration/hub/api/recipe/ProjectErrorsRecipeTest.groovy b/...st/groovy/com/blackducksoftware/integration/hub/api/recipe/ProjectErrorsRecipeTest.groovy
@@ -9,7 +9,7 @@ import org.junit.experimental.categories.Category
 import com.blackducksoftware.integration.IntegrationTest
 import com.blackducksoftware.integration.hub.api.generated.component.ProjectRequest
 import com.blackducksoftware.integration.hub.api.generated.view.ProjectView
-import com.blackducksoftware.integration.hub.dataservice.project.ProjectDataService
+import com.blackducksoftware.integration.hub.dataservice.ProjectDataService
 import com.blackducksoftware.integration.hub.exception.DoesNotExistException
 import com.blackducksoftware.integration.hub.rest.exception.IntegrationRestException