refactor: changing blackduck to blackDuck where appropriate

blackducksoftware · May 2, 2019 · 160e65e · 160e65e
1 parent 5838efb
commit 160e65e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...configuration/src/main/java/com/synopsys/integration/detect/help/DetectOptionManager.java b/...configuration/src/main/java/com/synopsys/integration/detect/help/DetectOptionManager.java
@@ -104,11 +104,11 @@ private void init() {
         checkForRemovedProperties();
     }
 
-    public BlackDuckServerConfig createBlackduckServerConfig() throws DetectUserFriendlyException {
-        return createBlackduckServerConfig(new SilentIntLogger());
+    public BlackDuckServerConfig createBlackDuckServerConfig() throws DetectUserFriendlyException {
+        return createBlackDuckServerConfig(new SilentIntLogger());
     }
 
-    public BlackDuckServerConfig createBlackduckServerConfig(IntLogger logger) throws DetectUserFriendlyException {
+    public BlackDuckServerConfig createBlackDuckServerConfig(IntLogger logger) throws DetectUserFriendlyException {
         final BlackDuckServerConfigBuilder blackDuckServerConfigBuilder = new BlackDuckServerConfigBuilder().setLogger(logger);
 
         Set<String> allBlackDuckKeys = new HashSet<>(blackDuckServerConfigBuilder.getPropertyKeys());

diff --git a/...rc/main/java/com/synopsys/integration/detect/interactive/mode/DefaultInteractiveMode.java b/...rc/main/java/com/synopsys/integration/detect/interactive/mode/DefaultInteractiveMode.java
@@ -87,7 +87,7 @@ public void configure() {
                     ConnectionResult connectionAttempt = null;
                     try {
                         detectOptionManager.applyInteractiveOptions(getInteractiveOptions());
-                        BlackDuckServerConfig blackDuckServerConfig = detectOptionManager.createBlackduckServerConfig();
+                        BlackDuckServerConfig blackDuckServerConfig = detectOptionManager.createBlackDuckServerConfig();
                         connectionAttempt = blackDuckServerConfig.attemptConnection(new SilentIntLogger());
                     } catch (final Exception e) {
                         println("Failed to test connection.");

diff --git a/...ain/groovy/com/synopsys/integration/detect/lifecycle/boot/product/ProductBootFactory.java b/...ain/groovy/com/synopsys/integration/detect/lifecycle/boot/product/ProductBootFactory.java
@@ -63,6 +63,6 @@ public PhoneHomeManager createPhoneHomeManager(BlackDuckServicesFactory blackDuc
     }
 
     public BlackDuckServerConfig createBlackDuckServerConfig() throws DetectUserFriendlyException {
-        return detectOptionManager.createBlackduckServerConfig();
+        return detectOptionManager.createBlackDuckServerConfig();
     }
 }
diff --git a/src/main/groovy/com/synopsys/integration/detect/lifecycle/run/RunManager.java b/src/main/groovy/com/synopsys/integration/detect/lifecycle/run/RunManager.java
@@ -121,7 +121,7 @@ public RunResult run(final ProductRunData productRunData) throws DetectUserFrien
         final NameVersion projectNameVersion = runUniversalProjectTools(detectConfiguration, detectConfigurationFactory, directoryManager, eventSystem, runResult, runOptions, detectToolFilter);
 
         if (productRunData.shouldUseBlackDuckProduct()) {
-            runBlackduckProduct(productRunData, detectConfiguration, detectConfigurationFactory, directoryManager, eventSystem, codeLocationNameManager, bdioCodeLocationCreator, detectInfo, runResult, runOptions, detectToolFilter, projectNameVersion, detectPostActions);
+            runBlackDuckProduct(productRunData, detectConfiguration, detectConfigurationFactory, directoryManager, eventSystem, codeLocationNameManager, bdioCodeLocationCreator, detectInfo, runResult, runOptions, detectToolFilter, projectNameVersion, detectPostActions);
         } else {
             logger.info("Black Duck tools will NOT be run.");
         }
@@ -215,7 +215,7 @@ private void runPolarisProduct(ProductRunData productRunData, DetectConfiguratio
         }
     }
 
-    private void runBlackduckProduct(ProductRunData productRunData, DetectConfiguration detectConfiguration, DetectConfigurationFactory detectConfigurationFactory, DirectoryManager directoryManager, EventSystem eventSystem, CodeLocationNameManager codeLocationNameManager, BdioCodeLocationCreator bdioCodeLocationCreator, DetectInfo detectInfo, RunResult runResult, RunOptions runOptions, DetectToolFilter detectToolFilter, NameVersion projectNameVersion, DetectPostActions detectPostActions) throws IntegrationException, DetectUserFriendlyException {
+    private void runBlackDuckProduct(ProductRunData productRunData, DetectConfiguration detectConfiguration, DetectConfigurationFactory detectConfigurationFactory, DirectoryManager directoryManager, EventSystem eventSystem, CodeLocationNameManager codeLocationNameManager, BdioCodeLocationCreator bdioCodeLocationCreator, DetectInfo detectInfo, RunResult runResult, RunOptions runOptions, DetectToolFilter detectToolFilter, NameVersion projectNameVersion, DetectPostActions detectPostActions) throws IntegrationException, DetectUserFriendlyException {
         logger.info(ReportConstants.RUN_SEPARATOR);
         logger.info("Black Duck tools will run.");
 

diff --git a/src/main/groovy/com/synopsys/integration/detect/workflow/DetectPostActions.java b/src/main/groovy/com/synopsys/integration/detect/workflow/DetectPostActions.java
@@ -48,10 +48,10 @@ public class DetectPostActions {
     private boolean shouldHaveScanned;
 
     public void runPostActions() throws DetectUserFriendlyException {
-        runPostBlackduckActions();
+        runPostBlackDuckActions();
     }
 
-    private void runPostBlackduckActions() throws DetectUserFriendlyException {
+    private void runPostBlackDuckActions() throws DetectUserFriendlyException {
         logger.info(ReportConstants.RUN_SEPARATOR);
         if (null == projectVersionWrapper || null == blackDuckRunData || null == blackDuckPostActions || null == blackDuckPostOptions || null == codeLocationWaitData || 0 >= timeoutInSeconds) {
             logger.debug("Will not perform Black Duck post actions: Detect is not online.");