Fail on null

hsb-cc-18 · Jan 10, 2019 · d33afe8 · d33afe8
1 parent 5053929
commit d33afe8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...ain/java/com/cloudcomputing/docker/limits/model/validator/ContainsLabelKeysValidator.java b/...ain/java/com/cloudcomputing/docker/limits/model/validator/ContainsLabelKeysValidator.java
@@ -29,7 +29,7 @@ public void initialize(ContainsLabelKeys constraintAnnotation) {
     @Override
     public boolean isValid(Collection<String> value, ConstraintValidatorContext context) {
         if( value == null ) {
-            return true;
+            return false;
         }
 
         boolean isValid = false;

diff --git a/src/test/java/com/cloudcomputing/docker/limits/model/io/DockerComposeValidatorTest.java b/src/test/java/com/cloudcomputing/docker/limits/model/io/DockerComposeValidatorTest.java
@@ -66,6 +66,12 @@ public void testLabeledService() {
         when(dockerCompose.getServices()).thenReturn(services);
         violations = dockerComposeValidator.validate(dockerCompose);
         ConstraintViolationSetAssert.assertThat(violations).hasViolationOnPath("services[nginx].labels");
+
+        // Test null label
+        services.get("nginx").labels = null;
+        when(dockerCompose.getServices()).thenReturn(services);
+        violations = dockerComposeValidator.validate(dockerCompose);
+        ConstraintViolationSetAssert.assertThat(violations).hasViolationOnPath("services[nginx].labels");
     }
 
 }