fix(rules): GoCli now yields to GoGradle.

blackducksoftware · Sep 4, 2019 · bea83f4 · bea83f4
1 parent fec7b1a
commit bea83f4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/synopsys/integration/detect/tool/detector/DetectorRuleFactory.java b/src/main/java/com/synopsys/integration/detect/tool/detector/DetectorRuleFactory.java
@@ -48,17 +48,18 @@ private DetectorRuleSet createRules(final DetectableFactory detectableFactory) {
         ruleSet.addDetector(DetectorType.CPAN, "Cpan Cli", detectableFactory::createCpanCliDetectable).defaults().build();
         ruleSet.addDetector(DetectorType.CRAN, "Packrat Lock", detectableFactory::createPackratLockDetectable).defaults().build();
 
+        final DetectorRule goGradle = ruleSet.addDetector(DetectorType.GO_GRADLE, "Go Gradle", detectableFactory::createGoGradleDetectable).defaults().build();
         final DetectorRule goLock = ruleSet.addDetector(DetectorType.GO_DEP, "Go Lock", detectableFactory::createGoLockDetectable).defaults().build();
         final DetectorRule goVnd = ruleSet.addDetector(DetectorType.GO_VNDR, "Go Vndr", detectableFactory::createGoVndrDetectable).defaults().build();
         final DetectorRule goVendor = ruleSet.addDetector(DetectorType.GO_VENDOR, "Go Vendor", detectableFactory::createGoVendorDetectable).defaults().build();
         final DetectorRule goCli = ruleSet.addDetector(DetectorType.GO_DEP, "Go Cli", detectableFactory::createGoCliDetectable).defaults().build();
 
+        ruleSet.yield(goCli).to(goGradle);
         ruleSet.yield(goCli).to(goLock);
         ruleSet.yield(goCli).to(goVnd);
         ruleSet.yield(goCli).to(goVendor);
 
         ruleSet.addDetector(DetectorType.GRADLE, "Gradle Inspector", detectableFactory::createGradleDetectable).defaults().build();
-        ruleSet.addDetector(DetectorType.GO_GRADLE, "Go Gradle", detectableFactory::createGoGradleDetectable).defaults().build();
         ruleSet.addDetector(DetectorType.HEX, "Rebar", detectableFactory::createRebarDetectable).defaults().build();
 
         ruleSet.addDetector(DetectorType.MAVEN, "Maven Pom", detectableFactory::createMavenPomDetectable).defaults().build();