Skip to content

Commit 92fcb57

Browse files
committed
make use of default property values
1 parent 7399aaa commit 92fcb57

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

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

+1-8
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,7 @@ public DetectToolFilter createToolFilter(RunDecision runDecision, BlackDuckDecis
241241
public RapidScanOptions createRapidScanOptions() {
242242
RapidCompareMode rapidCompareMode = detectConfiguration.getValue(DetectProperties.DETECT_BLACKDUCK_RAPID_COMPARE_MODE);
243243
BlackduckScanMode scanMode= detectConfiguration.getValue(DetectProperties.DETECT_BLACKDUCK_SCAN_MODE);
244-
245-
AllNoneEnumList<PolicyRuleSeverityType> value = detectConfiguration.getValue(DetectProperties.DETECT_STATELESS_POLICY_CHECK_FAIL_ON_SEVERITIES);
246-
List<PolicyRuleSeverityType> severitiesToFailPolicyCheck;
247-
if (value.containsNone()) {
248-
severitiesToFailPolicyCheck = new ArrayList<>(Arrays.asList(PolicyRuleSeverityType.BLOCKER, PolicyRuleSeverityType.CRITICAL));
249-
} else {
250-
severitiesToFailPolicyCheck = value.representedValues();
251-
}
244+
List<PolicyRuleSeverityType> severitiesToFailPolicyCheck = detectConfiguration.getValue(DetectProperties.DETECT_STATELESS_POLICY_CHECK_FAIL_ON_SEVERITIES).representedValues();
252245

253246
long detectTimeout = findTimeoutInSeconds();
254247
return new RapidScanOptions(rapidCompareMode, scanMode, detectTimeout, severitiesToFailPolicyCheck);

src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ private DetectProperties() {
13951395
.build();
13961396

13971397
public static final AllNoneEnumListProperty<PolicyRuleSeverityType> DETECT_STATELESS_POLICY_CHECK_FAIL_ON_SEVERITIES =
1398-
AllNoneEnumListProperty.newBuilder("detect.stateless.policy.check.fail.on.severities", AllNoneEnum.NONE, PolicyRuleSeverityType.class)
1398+
AllNoneEnumListProperty.newBuilder("detect.stateless.policy.check.fail.on.severities", Arrays.asList(PolicyRuleSeverityType.BLOCKER, PolicyRuleSeverityType.CRITICAL), PolicyRuleSeverityType.class)
13991399
.setInfo("Fail on Stateless Policy Violation Severities", DetectPropertyFromVersion.VERSION_10_5_0)
14001400
.setHelp(
14011401
"A comma-separated list of policy violation severities that will fail Detect. If this is set to NONE, Detect will not fail due to policy violations. A value of ALL is equivalent to all of the other possible values except NONE.")

0 commit comments

Comments
 (0)