seaFloor allow null

CI-CMG · Aug 26, 2024 · edbb86a · edbb86a
1 parent 3baa74f
commit edbb86a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/.../src/main/java/edu/colorado/cires/pace/data/validation/ValidMarineInstrumentLocation.java b/.../src/main/java/edu/colorado/cires/pace/data/validation/ValidMarineInstrumentLocation.java
@@ -29,24 +29,16 @@ public boolean isValid(MarineInstrumentLocation value, ConstraintValidatorContex
       Float seaFloorDepth = value.getSeaFloorDepth();
       Float instrumentDepth = value.getInstrumentDepth();
 
-      if (seaFloorDepth == null || instrumentDepth == null) {
+      if (instrumentDepth == null) {
         context.disableDefaultConstraintViolation();
 
-        if (seaFloorDepth == null) {
-          context.buildConstraintViolationWithTemplate("must not be null")
-              .addPropertyNode("seaFloorDepth")
-              .addConstraintViolation();
-        }
-
-        if (instrumentDepth == null) {
-          context.buildConstraintViolationWithTemplate("must not be null")
-              .addPropertyNode("instrumentDepth")
-              .addConstraintViolation();
-        }
+        context.buildConstraintViolationWithTemplate("must not be null")
+          .addPropertyNode("instrumentDepth")
+          .addConstraintViolation();
 
         return false;
       } else {
-        if (seaFloorDepth > instrumentDepth) {
+        if (seaFloorDepth != null && seaFloorDepth > instrumentDepth) {
           context.disableDefaultConstraintViolation();
 
           context.buildConstraintViolationWithTemplate("must be less than or equal to instrumentDepth")

diff --git a/...a/edu/colorado/cires/pace/data/validation/ValidMarineInstrumentLocationValidatorTest.java b/...a/edu/colorado/cires/pace/data/validation/ValidMarineInstrumentLocationValidatorTest.java
@@ -43,13 +43,6 @@ void testValidMarineInstrumentLocation(Float seaFloorDepth, Float instrumentDept
           .findFirst().orElseThrow();
       assertEquals(expectedInstrumentDepthMessage, violation.getMessage());
     }
-
-    if (expectedSeaFloorDepthMessage != null) {
-      ConstraintViolation<MarineInstrumentLocation> violation = violations.stream()
-          .filter(v -> v.getPropertyPath().toString().equals("seaFloorDepth"))
-          .findFirst().orElseThrow();
-      assertEquals(expectedSeaFloorDepthMessage, violation.getMessage());
-    }
   }
 
 }