Updates code based on recent library changes around

field markers and annnotations
codeforamerica · Nov 2, 2023 · a184283 · a184283
1 parent 11d9027
commit a184283
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/main/java/org/formflowstartertemplate/app/inputs/Ubi.java b/src/main/java/org/formflowstartertemplate/app/inputs/Ubi.java
@@ -1,8 +1,8 @@
 package org.formflowstartertemplate.app.inputs;
 
 import formflow.library.data.FlowInputs;
-import formflow.library.data.validators.Money;
-import formflow.library.data.validators.Phone;
+import formflow.library.data.annotations.Money;
+import formflow.library.data.annotations.Phone;
 import formflow.library.utils.RegexUtils;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Max;

diff --git a/...ava/org/formflowstartertemplate/app/submission/conditions/HomeAddressValidationIsOff.java b/...ava/org/formflowstartertemplate/app/submission/conditions/HomeAddressValidationIsOff.java
@@ -2,7 +2,7 @@
 
 import formflow.library.config.submission.Condition;
 import formflow.library.data.Submission;
-import formflow.library.inputs.UnvalidatedField;
+import formflow.library.inputs.FieldNameMarkers;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -18,6 +18,7 @@ public Boolean run(Submission submission) {
       return true;
     }
 
-    return submission.getInputData().get(UnvalidatedField.VALIDATE_ADDRESS + "residentialAddress").equals("false");
+    return submission.getInputData().get(FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATE_ADDRESS + "residentialAddress")
+        .equals("false");
   }
 }
diff --git a/...ain/java/org/formflowstartertemplate/app/submission/conditions/SmartySuggestionFound.java b/...ain/java/org/formflowstartertemplate/app/submission/conditions/SmartySuggestionFound.java
@@ -2,15 +2,16 @@
 
 import formflow.library.config.submission.Condition;
 import formflow.library.data.Submission;
-import formflow.library.inputs.UnvalidatedField;
+import formflow.library.inputs.FieldNameMarkers;
 import org.springframework.stereotype.Component;
 
 @Component
 public class SmartySuggestionFound implements Condition {
 
   @Override
   public Boolean run(Submission submission) {
-    return submission.getInputData().get(UnvalidatedField.VALIDATE_ADDRESS + "residentialAddress").equals("true") &&
-        submission.getInputData().containsKey("residentialAddressStreetAddress1" + UnvalidatedField.VALIDATED);
+    return submission.getInputData().get(FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATE_ADDRESS + "residentialAddress")
+        .equals("true") && submission.getInputData()
+        .containsKey("residentialAddressStreetAddress1" + FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATED);
   }
 }
diff --git a/.../java/org/formflowstartertemplate/app/submission/conditions/SmartySuggestionNotFound.java b/.../java/org/formflowstartertemplate/app/submission/conditions/SmartySuggestionNotFound.java
@@ -2,15 +2,16 @@
 
 import formflow.library.config.submission.Condition;
 import formflow.library.data.Submission;
-import formflow.library.inputs.UnvalidatedField;
+import formflow.library.inputs.FieldNameMarkers;
 import org.springframework.stereotype.Component;
 
 @Component
 public class SmartySuggestionNotFound implements Condition {
 
   @Override
   public Boolean run(Submission submission) {
-    return submission.getInputData().get(UnvalidatedField.VALIDATE_ADDRESS + "residentialAddress").equals("true") &&
-        !submission.getInputData().containsKey("residentialAddressStreetAddress1" + UnvalidatedField.VALIDATED);
+    return submission.getInputData().get(FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATE_ADDRESS + "residentialAddress")
+        .equals("true") && !submission.getInputData()
+        .containsKey("residentialAddressStreetAddress1" + FieldNameMarkers.UNVALIDATED_FIELD_MARKER_VALIDATED);
   }
 }