fixing errors from the merge

blackducksoftware · Jun 19, 2018 · f7b84f5 · f7b84f5
1 parent 293b054
commit f7b84f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/...ation/src/main/java/com/blackducksoftware/integration/hub/detect/DetectConfiguration.java b/...ation/src/main/java/com/blackducksoftware/integration/hub/detect/DetectConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * hub-detect
+ * detect-configuration
  *
  * Copyright (C) 2018 Black Duck Software, Inc.
  * http://www.blackducksoftware.com/
@@ -57,21 +57,15 @@
 import com.blackducksoftware.integration.hub.detect.help.HelpDescription;
 import com.blackducksoftware.integration.hub.detect.help.HelpDetailed;
 import com.blackducksoftware.integration.hub.detect.help.HelpGroup;
-import com.blackducksoftware.integration.hub.detect.model.BomToolType;
-import com.blackducksoftware.integration.hub.detect.search.BomToolFinder;
 import com.blackducksoftware.integration.hub.detect.util.TildeInPathResolver;
 import com.blackducksoftware.integration.log.Slf4jIntLogger;
 import com.blackducksoftware.integration.rest.connection.UnauthenticatedRestConnection;
 import com.blackducksoftware.integration.rest.connection.UnauthenticatedRestConnectionBuilder;
 import com.blackducksoftware.integration.rest.proxy.ProxyInfo;
 import com.blackducksoftware.integration.rest.proxy.ProxyInfoBuilder;
-import com.blackducksoftware.integration.util.ExcludedIncludedFilter;
 import com.blackducksoftware.integration.util.ResourceUtil;
 
-import groovy.transform.TypeChecked;
-
 @Component
-@TypeChecked
 public class DetectConfiguration {
     private final Logger logger = LoggerFactory.getLogger(DetectConfiguration.class);
 
@@ -139,7 +133,6 @@ public class DetectConfiguration {
     private boolean usingDefaultSourcePath;
     private boolean usingDefaultOutputPath;
 
-    private ExcludedIncludedFilter bomToolFilter;
     private List<String> bomToolSearchDirectoryExclusions;
 
     public void init(final List<DetectOption> detectOptions) throws DetectUserFriendlyException, IOException, IllegalArgumentException, IllegalAccessException {
@@ -214,8 +207,6 @@ public void init(final List<DetectOption> detectOptions) throws DetectUserFriend
             hubSignatureScannerParallelProcessors = Runtime.getRuntime().availableProcessors();
         }
 
-        bomToolFilter = new ExcludedIncludedFilter(getExcludedBomToolTypes(), getIncludedBomToolTypes());
-
         configureForDocker();
 
         if (StringUtils.isNotBlank(hubSignatureScannerHostUrl) && StringUtils.isNotBlank(hubSignatureScannerOfflineLocalPath)) {
@@ -249,7 +240,7 @@ public void init(final List<DetectOption> detectOptions) throws DetectUserFriend
         }
         try {
             if (bomToolSearchExclusionDefaults) {
-                final String fileContent = ResourceUtil.getResourceAsString(BomToolFinder.class, "/excludedDirectoriesBomToolSearch.txt", StandardCharsets.UTF_8);
+                final String fileContent = ResourceUtil.getResourceAsString(DetectConfiguration.class, "/excludedDirectoriesBomToolSearch.txt", StandardCharsets.UTF_8);
                 bomToolSearchDirectoryExclusions.addAll(Arrays.asList(fileContent.split("\r?\n")));
             }
         } catch (final IOException e) {
@@ -307,10 +298,6 @@ public boolean isUsingDefaultOutputPath() {
         return usingDefaultOutputPath;
     }
 
-    public boolean isBomToolIncluded(final BomToolType type) {
-        return bomToolFilter.shouldInclude(type.toString());
-    }
-
     public String getDetectProperty(final String key) {
         return configurableEnvironment.getProperty(key);
     }
@@ -684,7 +671,7 @@ public Map<String, String> getBlackduckHubProperties() {
     @DefaultValue("External")
     @HelpGroup(primary = GROUP_PROJECT_INFO, additional = { SEARCH_GROUP_PROJECT })
     @HelpDescription("An override for the Project Version distribution")
-    @AcceptableValues(value = { "EXTERNAL", "SAAS", "INTERNAL", "OPENSOURCE" }, caseSensitive = false, strict = false)
+    @AcceptableValues(value = { "EXTERNAL", "SAAS", "INTERNAL", "OPENSOURCE" }, caseSensitive = false, strict = false, isCommaSeparatedList = true)
     private String projectVersionDistribution;
 
     @Value("${detect.project.version.update:}")
@@ -700,12 +687,6 @@ public Map<String, String> getBlackduckHubProperties() {
     @AcceptableValues(value = { "ALL", "BLOCKER", "CRITICAL", "MAJOR", "MINOR", "TRIVIAL" }, caseSensitive = false, strict = false)
     private String policyCheckFailOnSeverities;
 
-    @Value("${detect.code.location.combine.same.names:}")
-    @HelpGroup(primary = GROUP_CODELOCATION)
-    @HelpDescription("If set to true, detect will automatically combine code locations with the same name. Otherwise, duplicate names will be appended with their index.")
-    @DefaultValue("false")
-    private Boolean combineCodeLocations;
-
     @Value("${detect.gradle.inspector.version:}")
     @DefaultValue("latest")
     @HelpGroup(primary = GROUP_GRADLE)
@@ -1292,7 +1273,7 @@ public String getPolicyCheckFailOnSeverities() {
     }
 
     public boolean getCombineCodeLocations() {
-        return combineCodeLocations;
+        return false; // for now this is always false, in the future we could introduce a property.
     }
 
     public String getGradleInspectorVersion() {

diff --git a/...ation/src/main/java/com/blackducksoftware/integration/hub/detect/type/ExecutableType.java b/...ation/src/main/java/com/blackducksoftware/integration/hub/detect/type/ExecutableType.java
@@ -1,5 +1,5 @@
 /**
- * hub-detect
+ * detect-configuration
  *
  * Copyright (C) 2018 Black Duck Software, Inc.
  * http://www.blackducksoftware.com/