using latest hub-common

blackducksoftware · Dec 27, 2016 · a7892bc · a7892bc
1 parent cafd3b4
commit a7892bc
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 65 deletions.
diff --git a/build.gradle b/build.gradle
@@ -31,10 +31,7 @@ description='Black Duck Hub Gradle Plugin'
 dependencies {
 	compile gradleApi()
 	compile localGroovy()
-	compile 'com.blackducksoftware.integration:build-tool-common:2.3.0'
-	compile 'com.blackducksoftware.integration:hub-common:5.3.0'
-	compile 'commons-io:commons-io:2.5'
-	compile 'com.google.code.gson:gson:2.7'
+	compile 'com.blackducksoftware.integration:hub-common:5.4.0'
 
 	testCompile 'junit:junit:4.12'
 }

diff --git a/src/main/java/com/blackducksoftware/integration/gradle/DependencyGatherer.java b/src/main/java/com/blackducksoftware/integration/gradle/DependencyGatherer.java
@@ -36,8 +36,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.blackducksoftware.integration.build.DependencyNode;
-import com.blackducksoftware.integration.build.Gav;
+import com.blackducksoftware.integration.hub.buildtool.DependencyNode;
+import com.blackducksoftware.integration.hub.buildtool.Gav;
 
 public class DependencyGatherer {
     private final Logger logger = LoggerFactory.getLogger(DependencyGatherer.class);

diff --git a/src/main/java/com/blackducksoftware/integration/gradle/HubGradlePlugin.java b/src/main/java/com/blackducksoftware/integration/gradle/HubGradlePlugin.java
@@ -21,11 +21,11 @@
  *******************************************************************************/
 package com.blackducksoftware.integration.gradle;
 
-import static com.blackducksoftware.integration.build.Constants.CHECK_POLICIES;
-import static com.blackducksoftware.integration.build.Constants.CREATE_FLAT_DEPENDENCY_LIST;
-import static com.blackducksoftware.integration.build.Constants.CREATE_HUB_OUTPUT;
-import static com.blackducksoftware.integration.build.Constants.DEPLOY_HUB_OUTPUT;
-import static com.blackducksoftware.integration.build.Constants.DEPLOY_HUB_OUTPUT_AND_CHECK_POLICIES;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CHECK_POLICIES;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_FLAT_DEPENDENCY_LIST;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_HUB_OUTPUT;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.DEPLOY_HUB_OUTPUT;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.DEPLOY_HUB_OUTPUT_AND_CHECK_POLICIES;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;

diff --git a/src/main/java/com/blackducksoftware/integration/gradle/PluginHelper.java b/src/main/java/com/blackducksoftware/integration/gradle/PluginHelper.java
@@ -21,18 +21,29 @@
  *******************************************************************************/
 package com.blackducksoftware.integration.gradle;
 
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.BDIO_FILE_MEDIA_TYPE;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.SCAN_ERROR_MESSAGE;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.UPLOAD_FILE_MESSAGE;
+
 import java.io.File;
 import java.io.IOException;
 
 import org.gradle.api.Project;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.blackducksoftware.integration.build.Constants;
-import com.blackducksoftware.integration.build.DependencyNode;
-import com.blackducksoftware.integration.build.utils.BdioDependencyWriter;
-import com.blackducksoftware.integration.build.utils.FlatDependencyListWriter;
-import com.blackducksoftware.integration.build.utils.ProjectVersionWriter;
+import com.blackducksoftware.integration.hub.api.bom.BomImportRequestService;
+import com.blackducksoftware.integration.hub.api.policy.PolicyStatusItem;
+import com.blackducksoftware.integration.hub.buildtool.DependencyNode;
+import com.blackducksoftware.integration.hub.buildtool.FlatDependencyListWriter;
+import com.blackducksoftware.integration.hub.buildtool.HubProjectDetailsWriter;
+import com.blackducksoftware.integration.hub.buildtool.bdio.BdioDependencyWriter;
+import com.blackducksoftware.integration.hub.dataservice.policystatus.PolicyStatusDataService;
+import com.blackducksoftware.integration.hub.dataservice.report.RiskReportDataService;
+import com.blackducksoftware.integration.hub.dataservice.scan.ScanStatusDataService;
+import com.blackducksoftware.integration.hub.exception.HubIntegrationException;
+import com.blackducksoftware.integration.hub.service.HubServicesFactory;
+import com.blackducksoftware.integration.log.Slf4jIntLogger;
 
 public class PluginHelper {
     private final Logger logger = LoggerFactory.getLogger(PluginHelper.class);
@@ -45,8 +56,8 @@ public void createFlatDependencyList(final Project project, final String hubProj
         final FlatDependencyListWriter flatDependencyListWriter = new FlatDependencyListWriter();
         flatDependencyListWriter.write(outputDirectory, hubProjectName, rootNode);
 
-        final ProjectVersionWriter projectVersionWriter = new ProjectVersionWriter();
-        projectVersionWriter.write(outputDirectory, hubProjectVersion);
+        final HubProjectDetailsWriter hubProjectDetailsWriter = new HubProjectDetailsWriter();
+        hubProjectDetailsWriter.write(outputDirectory, hubProjectName, hubProjectVersion);
     }
 
     public void createHubOutput(final Project project, final String hubProjectName, final String hubProjectVersion,
@@ -57,18 +68,18 @@ public void createHubOutput(final Project project, final String hubProjectName,
         final BdioDependencyWriter bdioDependencyWriter = new BdioDependencyWriter();
         bdioDependencyWriter.write(outputDirectory, project.getName(), hubProjectName, rootNode);
 
-        final ProjectVersionWriter projectVersionWriter = new ProjectVersionWriter();
-        projectVersionWriter.write(outputDirectory, hubProjectVersion);
+        final HubProjectDetailsWriter hubProjectDetailsWriter = new HubProjectDetailsWriter();
+        hubProjectDetailsWriter.write(outputDirectory, hubProjectName, hubProjectVersion);
     }
 
     public void deployHubOutput(final Slf4jIntLogger logger, final HubServicesFactory services,
             final File outputDirectory, final String hubProjectName) throws HubIntegrationException {
         final String filename = BdioDependencyWriter.getFilename(hubProjectName);
         final File file = new File(outputDirectory, filename);
         final BomImportRequestService bomImportRequestService = services.createBomImportRequestService();
-        bomImportRequestService.importBomFile(file, Constants.BDIO_FILE_MEDIA_TYPE);
+        bomImportRequestService.importBomFile(file, BDIO_FILE_MEDIA_TYPE);
 
-        logger.info(String.format(Constants.UPLOAD_FILE_MESSAGE, file, bomImportRequestService.getRestConnection().getBaseUrl()));
+        logger.info(String.format(UPLOAD_FILE_MESSAGE, file, bomImportRequestService.getRestConnection().getBaseUrl()));
     }
 
     public void waitForHub(final HubServicesFactory services, final String hubProjectName,
@@ -78,7 +89,7 @@ public void waitForHub(final HubServicesFactory services, final String hubProjec
             scanStatusDataService.assertBomImportScanStartedThenFinished(hubProjectName, hubProjectVersion,
                     scanStartedTimeout * 1000, scanFinishedTimeout * 1000, new Slf4jIntLogger(logger));
         } catch (final HubIntegrationException e) {
-            logger.error(String.format(Constants.SCAN_ERROR_MESSAGE, e.getMessage()), e);
+            logger.error(String.format(SCAN_ERROR_MESSAGE, e.getMessage()), e);
         }
     }
 

diff --git a/src/main/java/com/blackducksoftware/integration/gradle/task/CheckPoliciesTask.java b/src/main/java/com/blackducksoftware/integration/gradle/task/CheckPoliciesTask.java
@@ -21,9 +21,9 @@
  *******************************************************************************/
 package com.blackducksoftware.integration.gradle.task;
 
-import static com.blackducksoftware.integration.build.Constants.CHECK_POLICIES_ERROR;
-import static com.blackducksoftware.integration.build.Constants.CHECK_POLICIES_FINISHED;
-import static com.blackducksoftware.integration.build.Constants.CHECK_POLICIES_STARTING;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CHECK_POLICIES_ERROR;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CHECK_POLICIES_FINISHED;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CHECK_POLICIES_STARTING;
 
 import org.gradle.api.GradleException;
 
@@ -43,7 +43,7 @@ public void performTask() {
         final HubServerConfig hubServerConfig = getHubServerConfigBuilder().build();
         try {
             final RestConnection restConnection = new CredentialsRestConnection(hubServerConfig);
-            HubServicesFactory services = new HubServicesFactory(restConnection);
+            final HubServicesFactory services = new HubServicesFactory(restConnection);
             final PolicyStatusItem policyStatusItem = PLUGIN_HELPER.checkPolicies(services, getHubProjectName(),
                     getHubVersionName());
             handlePolicyStatusItem(policyStatusItem);

diff --git a/...main/java/com/blackducksoftware/integration/gradle/task/CreateFlatDependencyListTask.java b/...main/java/com/blackducksoftware/integration/gradle/task/CreateFlatDependencyListTask.java
@@ -21,9 +21,9 @@
  *******************************************************************************/
 package com.blackducksoftware.integration.gradle.task;
 
-import static com.blackducksoftware.integration.build.Constants.CREATE_FLAT_DEPENDENCY_LIST_ERROR;
-import static com.blackducksoftware.integration.build.Constants.CREATE_FLAT_DEPENDENCY_LIST_FINISHED;
-import static com.blackducksoftware.integration.build.Constants.CREATE_FLAT_DEPENDENCY_LIST_STARTING;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_FLAT_DEPENDENCY_LIST_ERROR;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_FLAT_DEPENDENCY_LIST_FINISHED;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_FLAT_DEPENDENCY_LIST_STARTING;
 
 import java.io.IOException;
 

diff --git a/src/main/java/com/blackducksoftware/integration/gradle/task/CreateHubOutputTask.java b/src/main/java/com/blackducksoftware/integration/gradle/task/CreateHubOutputTask.java
@@ -21,9 +21,9 @@
  *******************************************************************************/
 package com.blackducksoftware.integration.gradle.task;
 
-import static com.blackducksoftware.integration.build.Constants.CREATE_HUB_OUTPUT_ERROR;
-import static com.blackducksoftware.integration.build.Constants.CREATE_HUB_OUTPUT_FINISHED;
-import static com.blackducksoftware.integration.build.Constants.CREATE_HUB_OUTPUT_STARTING;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_HUB_OUTPUT_ERROR;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_HUB_OUTPUT_FINISHED;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_HUB_OUTPUT_STARTING;
 
 import java.io.IOException;
 

diff --git a/...va/com/blackducksoftware/integration/gradle/task/DeployHubOutputAndCheckPoliciesTask.java b/...va/com/blackducksoftware/integration/gradle/task/DeployHubOutputAndCheckPoliciesTask.java
@@ -21,12 +21,12 @@
  *******************************************************************************/
 package com.blackducksoftware.integration.gradle.task;
 
-import static com.blackducksoftware.integration.build.Constants.CHECK_POLICIES_ERROR;
-import static com.blackducksoftware.integration.build.Constants.CREATE_HUB_OUTPUT_ERROR;
-import static com.blackducksoftware.integration.build.Constants.DEPLOY_HUB_OUTPUT_AND_CHECK_POLICIES_FINISHED;
-import static com.blackducksoftware.integration.build.Constants.DEPLOY_HUB_OUTPUT_AND_CHECK_POLICIES_STARTING;
-import static com.blackducksoftware.integration.build.Constants.DEPLOY_HUB_OUTPUT_ERROR;
-import static com.blackducksoftware.integration.build.Constants.FAILED_TO_CREATE_REPORT;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CHECK_POLICIES_ERROR;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_HUB_OUTPUT_ERROR;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.DEPLOY_HUB_OUTPUT_AND_CHECK_POLICIES_FINISHED;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.DEPLOY_HUB_OUTPUT_AND_CHECK_POLICIES_STARTING;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.DEPLOY_HUB_OUTPUT_ERROR;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.FAILED_TO_CREATE_REPORT;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/src/main/java/com/blackducksoftware/integration/gradle/task/DeployHubOutputTask.java b/src/main/java/com/blackducksoftware/integration/gradle/task/DeployHubOutputTask.java
@@ -21,11 +21,11 @@
  *******************************************************************************/
 package com.blackducksoftware.integration.gradle.task;
 
-import static com.blackducksoftware.integration.build.Constants.CREATE_HUB_OUTPUT_ERROR;
-import static com.blackducksoftware.integration.build.Constants.DEPLOY_HUB_OUTPUT_ERROR;
-import static com.blackducksoftware.integration.build.Constants.DEPLOY_HUB_OUTPUT_FINISHED;
-import static com.blackducksoftware.integration.build.Constants.DEPLOY_HUB_OUTPUT_STARTING;
-import static com.blackducksoftware.integration.build.Constants.FAILED_TO_CREATE_REPORT;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.CREATE_HUB_OUTPUT_ERROR;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.DEPLOY_HUB_OUTPUT_ERROR;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.DEPLOY_HUB_OUTPUT_FINISHED;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.DEPLOY_HUB_OUTPUT_STARTING;
+import static com.blackducksoftware.integration.hub.buildtool.BuildToolConstants.FAILED_TO_CREATE_REPORT;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/src/main/java/com/blackducksoftware/integration/gradle/task/HubTask.java b/src/main/java/com/blackducksoftware/integration/gradle/task/HubTask.java
@@ -30,12 +30,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.blackducksoftware.integration.build.utils.BdioDependencyWriter;
-import com.blackducksoftware.integration.build.utils.FlatDependencyListWriter;
 import com.blackducksoftware.integration.gradle.PluginHelper;
 import com.blackducksoftware.integration.hub.api.policy.PolicyStatusEnum;
 import com.blackducksoftware.integration.hub.api.policy.PolicyStatusItem;
 import com.blackducksoftware.integration.hub.builder.HubServerConfigBuilder;
+import com.blackducksoftware.integration.hub.buildtool.FlatDependencyListWriter;
+import com.blackducksoftware.integration.hub.buildtool.bdio.BdioDependencyWriter;
 import com.blackducksoftware.integration.hub.dataservice.policystatus.PolicyStatusDescription;
 
 public abstract class HubTask extends DefaultTask {
@@ -103,7 +103,7 @@ public void task() {
 
     public abstract void performTask();
 
-    public void handlePolicyStatusItem(PolicyStatusItem policyStatusItem) {
+    public void handlePolicyStatusItem(final PolicyStatusItem policyStatusItem) {
         final PolicyStatusDescription policyStatusDescription = new PolicyStatusDescription(policyStatusItem);
         final String policyStatusMessage = policyStatusDescription.getPolicyStatusMessage();
         logger.info(policyStatusMessage);
@@ -155,135 +155,135 @@ public boolean getCreateHubReport() {
         return createHubReport;
     }
 
-    public void setCreateHubReport(boolean createHubReport) {
+    public void setCreateHubReport(final boolean createHubReport) {
         this.createHubReport = createHubReport;
     }
 
     public boolean isHubIgnoreFailure() {
         return hubIgnoreFailure;
     }
 
-    public void setHubIgnoreFailure(boolean hubIgnoreFailure) {
+    public void setHubIgnoreFailure(final boolean hubIgnoreFailure) {
         this.hubIgnoreFailure = hubIgnoreFailure;
     }
 
     public String getHubUrl() {
         return hubUrl;
     }
 
-    public void setHubUrl(String hubUrl) {
+    public void setHubUrl(final String hubUrl) {
         this.hubUrl = hubUrl;
     }
 
     public String getHubUsername() {
         return hubUsername;
     }
 
-    public void setHubUsername(String hubUsername) {
+    public void setHubUsername(final String hubUsername) {
         this.hubUsername = hubUsername;
     }
 
     public String getHubPassword() {
         return hubPassword;
     }
 
-    public void setHubPassword(String hubPassword) {
+    public void setHubPassword(final String hubPassword) {
         this.hubPassword = hubPassword;
     }
 
     public int getHubTimeout() {
         return hubTimeout;
     }
 
-    public void setHubTimeout(int hubTimeout) {
+    public void setHubTimeout(final int hubTimeout) {
         this.hubTimeout = hubTimeout;
     }
 
     public String getHubProxyHost() {
         return hubProxyHost;
     }
 
-    public void setHubProxyHost(String hubProxyHost) {
+    public void setHubProxyHost(final String hubProxyHost) {
         this.hubProxyHost = hubProxyHost;
     }
 
     public String getHubProxyPort() {
         return hubProxyPort;
     }
 
-    public void setHubProxyPort(String hubProxyPort) {
+    public void setHubProxyPort(final String hubProxyPort) {
         this.hubProxyPort = hubProxyPort;
     }
 
     public String getHubNoProxyHosts() {
         return hubNoProxyHosts;
     }
 
-    public void setHubNoProxyHosts(String hubNoProxyHosts) {
+    public void setHubNoProxyHosts(final String hubNoProxyHosts) {
         this.hubNoProxyHosts = hubNoProxyHosts;
     }
 
     public String getHubProxyUsername() {
         return hubProxyUsername;
     }
 
-    public void setHubProxyUsername(String hubProxyUsername) {
+    public void setHubProxyUsername(final String hubProxyUsername) {
         this.hubProxyUsername = hubProxyUsername;
     }
 
     public String getHubProxyPassword() {
         return hubProxyPassword;
     }
 
-    public void setHubProxyPassword(String hubProxyPassword) {
+    public void setHubProxyPassword(final String hubProxyPassword) {
         this.hubProxyPassword = hubProxyPassword;
     }
 
     public File getOutputDirectory() {
         return outputDirectory;
     }
 
-    public void setOutputDirectory(File outputDirectory) {
+    public void setOutputDirectory(final File outputDirectory) {
         this.outputDirectory = outputDirectory;
     }
 
-    public void setHubProjectName(String hubProjectName) {
+    public void setHubProjectName(final String hubProjectName) {
         this.hubProjectName = hubProjectName;
     }
 
-    public void setHubVersionName(String hubVersionName) {
+    public void setHubVersionName(final String hubVersionName) {
         this.hubVersionName = hubVersionName;
     }
 
     public long getHubScanStartedTimeout() {
         return hubScanStartedTimeout;
     }
 
-    public void setHubScanStartedTimeout(long hubScanStartedTimeout) {
+    public void setHubScanStartedTimeout(final long hubScanStartedTimeout) {
         this.hubScanStartedTimeout = hubScanStartedTimeout;
     }
 
     public long getHubScanFinishedTimeout() {
         return hubScanFinishedTimeout;
     }
 
-    public void setHubScanFinishedTimeout(long hubScanFinishedTimeout) {
+    public void setHubScanFinishedTimeout(final long hubScanFinishedTimeout) {
         this.hubScanFinishedTimeout = hubScanFinishedTimeout;
     }
 
     public String getIncludedConfigurations() {
         return includedConfigurations;
     }
 
-    public void setIncludedConfigurations(String includedConfigurations) {
+    public void setIncludedConfigurations(final String includedConfigurations) {
         this.includedConfigurations = includedConfigurations;
     }
 
     public String getExcludedModules() {
         return excludedModules;
     }
 
-    public void setExcludedModules(String excludedModules) {
+    public void setExcludedModules(final String excludedModules) {
         this.excludedModules = excludedModules;
     }