version changes done no test fixes

Author: dterrybd

src/main/java/com/synopsys/integration/detect/configuration/DetectConfigurationFactory.java

@@ -331,12 +331,10 @@ public ProjectSyncOptions createDetectProjectServiceOptions(BlackDuckRunData bla
         String projectDescription = detectConfiguration.getNullableValue(DetectProperties.DETECT_PROJECT_DESCRIPTION);
         String projectVersionNotes = detectConfiguration.getNullableValue(DetectProperties.DETECT_PROJECT_VERSION_NOTES);
 
-        // TODO insert version check here, 10 and later use this
-        
         List<ProjectCloneCategoriesType> cloneCategories;
         AllNoneEnumList<ProjectCloneCategoriesType> categoriesEnum = detectConfiguration.getValue(DetectProperties.DETECT_PROJECT_CLONE_CATEGORIES);
 
-        if (canSendSummaryData(null)) {
+        if (canSendSummaryData(blackDuckRunData.getBlackDuckServerVersion())) {
             cloneCategories = categoriesEnum.representedValuesStreamlined();
         } else {
             cloneCategories = categoriesEnum.representedValues();
@@ -542,18 +540,25 @@ private List<String> collectDirectoryExclusions(@NotNull List<String> givenExclu
         return directoryExclusionPatterns;
     }
 
-    private boolean canSendSummaryData(BlackDuckConnectivityResult blackDuckConnectivityResult) {
-        BlackDuckVersionParser parser = new BlackDuckVersionParser();
-        Optional<BlackDuckVersion> blackDuckServerVersion = parser.parse(blackDuckConnectivityResult.getContactedServerVersion());
-        BlackDuckVersion minVersion = new BlackDuckVersion(2023, 1, 1);
+    /**
+     * Newer BlackDuck servers allow us to send ALL and null values for project categories. BlackDuck will then 
+     * determine the appropriate values to display in the UI. For older servers we have to send all the values that we know
+     * about, for all, which can cause problems if we send a value Detect knows about but an older BlackDuck server does not.
+     * Eventually we can pull this code once all servers we support are 2023.10.0 or higher.
+     * 
+     * @param blackDuckVersion the version of the BlackDuck server specified in blackduck.url
+     * @return true if we can optimize the categories argument, false otherwise
+     */
+    private boolean canSendSummaryData(BlackDuckVersion blackDuckVersion) {
+        boolean canSendSummaryData = false;
 
-        boolean waitAtScanLevel = false;
+        BlackDuckVersion minVersion = new BlackDuckVersion(2023, 10, 0);
 
-        if (blackDuckServerVersion.isPresent() && blackDuckServerVersion.get().isAtLeast(minVersion)) {
-            waitAtScanLevel = true;
+        if (blackDuckVersion != null && blackDuckVersion.isAtLeast(minVersion)) {
+            canSendSummaryData = true;
         }
 
-        return waitAtScanLevel;
+        return canSendSummaryData;
     }
 
     public Optional<String> getContainerScanFilePath() {

src/main/java/com/synopsys/integration/detect/lifecycle/boot/product/ProductBoot.java

@@ -118,12 +118,12 @@ private BlackDuckRunData getBlackDuckRunData(
                     blackDuckDecision.scanMode(),
                     blackDuckServicesFactory,
                     phoneHomeManager,
-                    blackDuckConnectivityResult.getBlackDuckServerConfig(),
+                    blackDuckConnectivityResult,
                     waitAtScanLevel
                 );
             } else {
                 logger.debug("Skipping phone home due to Black Duck global settings.");
-                bdRunData = BlackDuckRunData.onlineNoPhoneHome(blackDuckDecision.scanMode(), blackDuckServicesFactory, blackDuckConnectivityResult.getBlackDuckServerConfig(), waitAtScanLevel);
+                bdRunData = BlackDuckRunData.onlineNoPhoneHome(blackDuckDecision.scanMode(), blackDuckServicesFactory, blackDuckConnectivityResult, waitAtScanLevel);
             }
             return bdRunData;
         } else {

src/main/java/com/synopsys/integration/detect/lifecycle/run/data/BlackDuckRunData.java

@@ -4,7 +4,10 @@
 
 import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig;
 import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory;
+import com.synopsys.integration.blackduck.version.BlackDuckVersion;
 import com.synopsys.integration.detect.configuration.enumeration.BlackduckScanMode;
+import com.synopsys.integration.detect.lifecycle.boot.product.BlackDuckConnectivityResult;
+import com.synopsys.integration.detect.lifecycle.boot.product.version.BlackDuckVersionParser;
 import com.synopsys.integration.detect.workflow.phonehome.PhoneHomeManager;
 
 public class BlackDuckRunData {
@@ -13,19 +16,24 @@ public class BlackDuckRunData {
     private final BlackDuckServicesFactory blackDuckServicesFactory;
     private final BlackduckScanMode scanMode;
     private final boolean waitAtScanLevel;
+    private final BlackDuckVersion blackDuckServerVersion;
 
     protected BlackDuckRunData(
         PhoneHomeManager phoneHomeManager,
-        BlackDuckServerConfig blackDuckServerConfig,
+        BlackDuckConnectivityResult blackDuckConnectivityResult,
         BlackDuckServicesFactory blackDuckServicesFactory,
         BlackduckScanMode scanMode,
         boolean waitAtScanLevel
     ) {
         this.phoneHomeManager = phoneHomeManager;
-        this.blackDuckServerConfig = blackDuckServerConfig;
+        this.blackDuckServerConfig = blackDuckConnectivityResult.getBlackDuckServerConfig();
         this.blackDuckServicesFactory = blackDuckServicesFactory;
         this.scanMode = scanMode;
         this.waitAtScanLevel = waitAtScanLevel;
+        
+        BlackDuckVersionParser parser = new BlackDuckVersionParser();
+        Optional<BlackDuckVersion> blackDuckServerVersion = parser.parse(blackDuckConnectivityResult.getContactedServerVersion());
+        this.blackDuckServerVersion = blackDuckServerVersion.isPresent() ? blackDuckServerVersion.get() : null;
     }
 
     public boolean isOnline() {
@@ -52,14 +60,14 @@ public static BlackDuckRunData online(
         BlackduckScanMode scanMode,
         BlackDuckServicesFactory blackDuckServicesFactory,
         PhoneHomeManager phoneHomeManager,
-        BlackDuckServerConfig blackDuckServerConfig,
+        BlackDuckConnectivityResult blackDuckConnectivityResult,
         boolean waitAtScanLevel
     ) {
-        return new BlackDuckRunData(phoneHomeManager, blackDuckServerConfig, blackDuckServicesFactory, scanMode, waitAtScanLevel);
+        return new BlackDuckRunData(phoneHomeManager, blackDuckConnectivityResult, blackDuckServicesFactory, scanMode, waitAtScanLevel);
     }
 
-    public static BlackDuckRunData onlineNoPhoneHome(BlackduckScanMode scanMode, BlackDuckServicesFactory blackDuckServicesFactory, BlackDuckServerConfig blackDuckServerConfig, boolean waitAtScanLevel) {
-        return new BlackDuckRunData(null, blackDuckServerConfig, blackDuckServicesFactory, scanMode, waitAtScanLevel);
+    public static BlackDuckRunData onlineNoPhoneHome(BlackduckScanMode scanMode, BlackDuckServicesFactory blackDuckServicesFactory, BlackDuckConnectivityResult blackDuckConnectivityResult, boolean waitAtScanLevel) {
+        return new BlackDuckRunData(null, blackDuckConnectivityResult, blackDuckServicesFactory, scanMode, waitAtScanLevel);
     }
 
     public Boolean isNonPersistent() {
@@ -73,4 +81,8 @@ public BlackduckScanMode getScanMode() {
     public boolean shouldWaitAtScanLevel() {
         return waitAtScanLevel;
     }
+
+    public BlackDuckVersion getBlackDuckServerVersion() {
+        return blackDuckServerVersion;
+    }
 }