upgrading to latest hub common

blackducksoftware · Dec 20, 2017 · 3d532cf · 3d532cf
1 parent 231ae74
commit 3d532cf
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 76 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ tasks.withType(GroovyCompile) { options.encoding = 'UTF-8' }
 
 group = 'com.blackducksoftware.integration'
 
-version = '2.4.0-SNAPSHOT'
+version = '2.5.0-SNAPSHOT'
 
 final def versionFile = new File("${projectDir}/src/main/resources/version.txt")
 versionFile.delete()
@@ -86,7 +86,7 @@ artifactory {
 }
 
 dependencies {
-    compile 'com.blackducksoftware.integration:hub-common:21.0.0'
+    compile 'com.blackducksoftware.integration:hub-common:24.0.0'
     compile 'org.springframework.boot:spring-boot-starter'
     compile 'org.apache.maven.shared:maven-invoker:3.0.0'
     compile 'com.esotericsoftware.yamlbeans:yamlbeans:1.11'

diff --git a/src/main/groovy/com/blackducksoftware/integration/hub/detect/Application.groovy b/src/main/groovy/com/blackducksoftware/integration/hub/detect/Application.groovy
@@ -35,8 +35,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder
 import org.springframework.context.annotation.Bean
 
 import com.blackducksoftware.integration.exception.IntegrationException
+import com.blackducksoftware.integration.hub.bdio.BdioNodeFactory
+import com.blackducksoftware.integration.hub.bdio.BdioPropertyHelper
 import com.blackducksoftware.integration.hub.bdio.BdioTransformer
 import com.blackducksoftware.integration.hub.bdio.SimpleBdioFactory
+import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraphTransformer
 import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalIdFactory
 import com.blackducksoftware.integration.hub.detect.exception.DetectUserFriendlyException
 import com.blackducksoftware.integration.hub.detect.exitcode.ExitCodeReporter
@@ -240,7 +243,10 @@ class Application {
 
     @Bean
     SimpleBdioFactory simpleBdioFactory() {
-        new SimpleBdioFactory()
+        BdioPropertyHelper bdioPropertyHelper = new BdioPropertyHelper();
+        BdioNodeFactory bdioNodeFactory = new BdioNodeFactory(bdioPropertyHelper);
+        DependencyGraphTransformer dependencyGraphTransformer = new DependencyGraphTransformer(bdioPropertyHelper, bdioNodeFactory);
+        new SimpleBdioFactory(bdioPropertyHelper, bdioNodeFactory, dependencyGraphTransformer, externalIdFactory(), gson());
     }
 
     @Bean

diff --git a/src/main/groovy/com/blackducksoftware/integration/hub/detect/DetectProjectManager.groovy b/src/main/groovy/com/blackducksoftware/integration/hub/detect/DetectProjectManager.groovy
@@ -170,7 +170,7 @@ class DetectProjectManager implements SummaryResultReporter, ExitCodeReporter {
                 if (outputFile.exists()) {
                     outputFile.delete()
                 }
-                simpleBdioFactory.writeSimpleBdioDocumentToFile(outputFile, gson, simpleBdioDocument)
+                simpleBdioFactory.writeSimpleBdioDocumentToFile(outputFile, simpleBdioDocument)
                 bdioFiles.add(outputFile)
                 logger.info("BDIO Generated: " + outputFile.getAbsolutePath())
             }
@@ -183,7 +183,7 @@ class DetectProjectManager implements SummaryResultReporter, ExitCodeReporter {
             if (aggregateBdioFile.exists()) {
                 aggregateBdioFile.delete()
             }
-            simpleBdioFactory.writeSimpleBdioDocumentToFile(aggregateBdioFile, gson, aggregateBdioDocument)
+            simpleBdioFactory.writeSimpleBdioDocumentToFile(aggregateBdioFile, aggregateBdioDocument)
             logger.info("BDIO Generated: " + aggregateBdioFile.getAbsolutePath())
         }
 
@@ -247,7 +247,7 @@ class DetectProjectManager implements SummaryResultReporter, ExitCodeReporter {
         final String codeLocationName = ''
         final String projectName = detectProject.getProjectName()
         final String projectVersionName = detectProject.projectVersionName
-        final ExternalId projectExternalId = simpleBdioFactory.createNameVersionExternalId(new Forge('', '/'), projectName, projectVersionName)
+        final ExternalId projectExternalId = simpleBdioFactory.createNameVersionExternalId(new Forge('/', '/', ''), projectName, projectVersionName)
 
         createSimpleBdioDocument(codeLocationName, projectName, projectVersionName, projectExternalId, dependencyGraph)
     }

diff --git a/src/main/groovy/com/blackducksoftware/integration/hub/detect/bomtool/DockerBomTool.groovy b/src/main/groovy/com/blackducksoftware/integration/hub/detect/bomtool/DockerBomTool.groovy
@@ -178,7 +178,7 @@ class DockerBomTool extends BomTool {
             String projectName = simpleBdioDocument.project.name
             String projectVersionName = simpleBdioDocument.project.version
 
-            Forge dockerForge = new Forge(simpleBdioDocument.project.bdioExternalIdentifier.forge, ExternalId.BDIO_ID_SEPARATOR)
+            Forge dockerForge = new Forge(ExternalId.BDIO_ID_SEPARATOR, ExternalId.BDIO_ID_SEPARATOR, simpleBdioDocument.project.bdioExternalIdentifier.forge)
             String externalIdPath = simpleBdioDocument.project.bdioExternalIdentifier.externalId
             ExternalId projectExternalId = externalIdFactory.createPathExternalId(dockerForge, externalIdPath)
 

diff --git a/src/main/groovy/com/blackducksoftware/integration/hub/detect/bomtool/GoDepBomTool.groovy b/src/main/groovy/com/blackducksoftware/integration/hub/detect/bomtool/GoDepBomTool.groovy
@@ -47,7 +47,6 @@ class GoDepBomTool extends BomTool {
 
     public static final String GOPKG_LOCK_FILENAME= 'Gopkg.lock'
     public static final String GOFILE_FILENAME_PATTERN= '*.go'
-    public static final Forge GOLANG = new Forge("golang",":")
 
     @Autowired
     GoGodepsBomTool goGodepsBomTool
@@ -97,7 +96,7 @@ class GoDepBomTool extends BomTool {
         String goDepExecutable = findGoDepExecutable()
 
         DependencyGraph graph = goPackager.makeDependencyGraph(sourcePath, goDepExecutable)
-        ExternalId externalId = externalIdFactory.createPathExternalId(GOLANG, sourcePath)
+        ExternalId externalId = externalIdFactory.createPathExternalId(Forge.GOLANG, sourcePath)
         DetectCodeLocation detectCodeLocation = new DetectCodeLocation(getBomToolType(), sourcePath, externalId, graph)
 
         [detectCodeLocation]

diff --git a/...ain/groovy/com/blackducksoftware/integration/hub/detect/bomtool/go/GopkgLockParser.groovy b/...ain/groovy/com/blackducksoftware/integration/hub/detect/bomtool/go/GopkgLockParser.groovy
@@ -25,10 +25,10 @@ package com.blackducksoftware.integration.hub.detect.bomtool.go
 import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraph
 import com.blackducksoftware.integration.hub.bdio.graph.MutableDependencyGraph
 import com.blackducksoftware.integration.hub.bdio.graph.MutableMapDependencyGraph
+import com.blackducksoftware.integration.hub.bdio.model.Forge
 import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency
 import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId
 import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalIdFactory
-import com.blackducksoftware.integration.hub.detect.bomtool.GoDepBomTool
 import com.moandjiezana.toml.Toml
 
 import groovy.transform.TypeChecked
@@ -60,7 +60,7 @@ class GopkgLockParser {
                 if (packageName.startsWith('golang.org/x/')) {
                     packageName = packageName.replaceAll('golang.org/x/', '')
                 }
-                final ExternalId dependencyExternalId = externalIdFactory.createNameVersionExternalId(GoDepBomTool.GOLANG, packageName, version)
+                final ExternalId dependencyExternalId = externalIdFactory.createNameVersionExternalId(Forge.GOLANG, packageName, version)
                 final Dependency dependency = new Dependency(packageName, version, dependencyExternalId)
                 graph.addChildToRoot(dependency)
             }

diff --git a/...roovy/com/blackducksoftware/integration/hub/detect/bomtool/go/godep/GoGodepsParser.groovy b/...roovy/com/blackducksoftware/integration/hub/detect/bomtool/go/godep/GoGodepsParser.groovy
@@ -25,10 +25,10 @@ package com.blackducksoftware.integration.hub.detect.bomtool.go.godep
 import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraph
 import com.blackducksoftware.integration.hub.bdio.graph.MutableDependencyGraph
 import com.blackducksoftware.integration.hub.bdio.graph.MutableMapDependencyGraph
+import com.blackducksoftware.integration.hub.bdio.model.Forge
 import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency
 import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId
 import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalIdFactory
-import com.blackducksoftware.integration.hub.detect.bomtool.GoDepBomTool
 import com.google.gson.Gson
 
 import groovy.transform.TypeChecked
@@ -58,7 +58,7 @@ class GoGodepsParser {
             } else {
                 version = dep.rev.trim()
             }
-            final ExternalId dependencyExternalId = externalIdFactory.createNameVersionExternalId(GoDepBomTool.GOLANG, dep.importPath, version)
+            final ExternalId dependencyExternalId = externalIdFactory.createNameVersionExternalId(Forge.GOLANG, dep.importPath, version)
             final Dependency dependency = new Dependency(dep.importPath, version, dependencyExternalId)
             graph.addChildToRoot(dependency);
         }

diff --git a/...ain/groovy/com/blackducksoftware/integration/hub/detect/bomtool/go/vndr/VndrParser.groovy b/...ain/groovy/com/blackducksoftware/integration/hub/detect/bomtool/go/vndr/VndrParser.groovy
@@ -25,10 +25,10 @@ package com.blackducksoftware.integration.hub.detect.bomtool.go.vndr
 import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraph
 import com.blackducksoftware.integration.hub.bdio.graph.MutableDependencyGraph
 import com.blackducksoftware.integration.hub.bdio.graph.MutableMapDependencyGraph
+import com.blackducksoftware.integration.hub.bdio.model.Forge
 import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency
 import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId
 import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalIdFactory
-import com.blackducksoftware.integration.hub.detect.bomtool.GoDepBomTool
 
 import groovy.transform.TypeChecked
 
@@ -47,7 +47,7 @@ class VndrParser {
             if (line?.trim() && !line.startsWith('#')) {
                 def parts = line.split(' ')
 
-                final ExternalId dependencyExternalId = externalIdFactory.createNameVersionExternalId(GoDepBomTool.GOLANG, parts[0], parts[1])
+                final ExternalId dependencyExternalId = externalIdFactory.createNameVersionExternalId(Forge.GOLANG, parts[0], parts[1])
                 final Dependency dependency = new Dependency(parts[0], parts[1], dependencyExternalId)
                 graph.addChildToRoot(dependency)
             }

diff --git a/src/main/groovy/com/blackducksoftware/integration/hub/detect/hub/BdioUploader.groovy b/src/main/groovy/com/blackducksoftware/integration/hub/detect/hub/BdioUploader.groovy
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 
-import com.blackducksoftware.integration.hub.api.bom.BomImportRequestService
+import com.blackducksoftware.integration.hub.api.bom.BomImportService
 import com.blackducksoftware.integration.hub.dataservice.phonehome.PhoneHomeDataService
 import com.blackducksoftware.integration.hub.detect.DetectConfiguration
 import com.blackducksoftware.integration.hub.detect.DetectInfo
@@ -56,10 +56,10 @@ class BdioUploader {
     @Autowired
     DetectPhoneHomeManager detectPhoneHomeManager
 
-    void uploadBdioFiles(HubServerConfig hubServerConfig, BomImportRequestService bomImportRequestService, PhoneHomeDataService phoneHomeDataService, DetectProject detectProject, List<File> createdBdioFiles) {
+    void uploadBdioFiles(HubServerConfig hubServerConfig, BomImportService bomImportService, PhoneHomeDataService phoneHomeDataService, DetectProject detectProject, List<File> createdBdioFiles) {
         createdBdioFiles.each { file ->
             logger.info("uploading ${file.name} to ${detectConfiguration.getHubUrl()}")
-            bomImportRequestService.importBomFile(file)
+            bomImportService.importBomFile(file)
             if (detectConfiguration.getCleanupBdioFiles()) {
                 file.delete()
             }