[cleanup] Simplify code

jenkinsci · Oct 10, 2019 · 83a87e2 · 83a87e2
1 parent 9990442
commit 83a87e2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/advisor/casc/AdvisorRootConfigurator.java b/src/main/java/com/cloudbees/jenkins/plugins/advisor/casc/AdvisorRootConfigurator.java
@@ -55,8 +55,10 @@ protected AdvisorGlobalConfiguration instance(Mapping mapping, ConfigurationCont
         // Scalar values
         final String email = (mapping.get("email") != null ? mapping.getScalarValue("email") : StringUtils.EMPTY);
         final String cc = (mapping.get("cc") != null ? mapping.getScalarValue("cc") : StringUtils.EMPTY);
-        final boolean nagDisabled = (mapping.get("nagDisabled") != null ? BooleanUtils.toBoolean(mapping.getScalarValue("nagDisabled")) : false);
-        final boolean acceptToS = (mapping.get("acceptToS") != null ? BooleanUtils.toBoolean(mapping.getScalarValue("acceptToS")) : false);
+        final boolean nagDisabled = (mapping.get("nagDisabled") != null &&
+                BooleanUtils.toBoolean(mapping.getScalarValue("nagDisabled")));
+        final boolean acceptToS = (mapping.get("acceptToS") != null &&
+                BooleanUtils.toBoolean(mapping.getScalarValue("acceptToS")));
 
         // List values
         final Set<String> excludedComponents = new HashSet<>();