chore(warnings): make operator precedence explicit

clanesf · Jan 31, 2018 · 4322619 · 4322619
1 parent bf35e28
commit 4322619
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/render/RenderUtil.java b/...src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/render/RenderUtil.java
@@ -94,7 +94,7 @@ public static RenderContext createDefaultRenderContext(PipelineTemplate template
     RenderContext context = new DefaultRenderContext(configuration.getPipeline().getApplication(), template, trigger);
     if (template != null && template.getVariables() != null) {
       template.getVariables().stream()
-        .filter(v -> v.isNullable() && v.getDefaultValue() == null || v.hasDefaultValue())
+        .filter(v -> (v.isNullable() && v.getDefaultValue() == null) || v.hasDefaultValue())
         .forEach(v -> context.getVariables().put(v.getName(), v.getDefaultValue()));
     }
     if (configuration.getPipeline().getVariables() != null) {

diff --git a/...etemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/validator/Errors.java b/...etemplate/src/main/java/com/netflix/spinnaker/orca/pipelinetemplate/validator/Errors.java
@@ -66,6 +66,7 @@ public enum Severity {
     WARN
   }
 
+  @SuppressWarnings("JavaLangClash")
   public static class Error {
     Severity severity = Severity.FATAL;
     String message;