Refactoring AbstractFormSerializer

Refactoring AbstractFormSerializer to separate the form building logic
into a standalone FormBuilder class.

1 files changed, 35 insertions, 41 deletions

diff --git a/src/main/java/com/p4square/ccbapi/serializer/IndividualProfileSerializer.java b/src/main/java/com/p4square/ccbapi/serializer/IndividualProfileSerializer.java
index 52b1a44..c9cc095 100644
--- a/src/main/java/com/p4square/ccbapi/serializer/IndividualProfileSerializer.java
+++ b/src/main/java/com/p4square/ccbapi/serializer/IndividualProfileSerializer.java
@@ -16,85 +16,85 @@ public class IndividualProfileSerializer extends AbstractFormSerializer<UpdateIn
     private static final PhoneFormSerializer PHONE_FORM_SERIALIZER = new PhoneFormSerializer();
 
     @Override
-    public void encode(final UpdateIndividualProfileRequest request, final StringBuilder builder) {
+    public void encode(final UpdateIndividualProfileRequest request, final FormBuilder builder) {
         // Encode any fields which are present.
         if (request.getSyncId() != null) {
-            appendField(builder, "sync_id", request.getSyncId());
+            builder.appendField("sync_id", request.getSyncId());
         }
         if (request.getOtherId() != null) {
-            appendField(builder, "other_id", request.getOtherId());
+            builder.appendField("other_id", request.getOtherId());
         }
         if (request.getGivingNumber() != null) {
-            appendField(builder, "giving_number", request.getGivingNumber());
+            builder.appendField("giving_number", request.getGivingNumber());
         }
         if (request.getFirstName() != null) {
-            appendField(builder, "first_name", request.getFirstName());
+            builder.appendField("first_name", request.getFirstName());
         }
         if (request.getLastName() != null) {
-            appendField(builder, "last_name", request.getLastName());
+            builder.appendField("last_name", request.getLastName());
         }
         if (request.getMiddleName() != null) {
-            appendField(builder, "middle_name", request.getMiddleName());
+            builder.appendField("middle_name", request.getMiddleName());
         }
         if (request.getLegalFirstName() != null) {
-            appendField(builder, "legal_first_name", request.getLegalFirstName());
+            builder.appendField("legal_first_name", request.getLegalFirstName());
         }
         if (request.getSalutation() != null) {
-            appendField(builder, "salutation", request.getSalutation());
+            builder.appendField("salutation", request.getSalutation());
         }
         if (request.getSuffix() != null) {
-            appendField(builder, "suffix", request.getSuffix());
+            builder.appendField("suffix", request.getSuffix());
         }
         if (request.getFamilyId() != null) {
-            appendField(builder, "family_id", request.getFamilyId());
+            builder.appendField("family_id", request.getFamilyId());
         }
         if (request.getFamilyPosition() != null) {
-            appendField(builder, "family_position", request.getFamilyPosition().getCode());
+            builder.appendField("family_position", request.getFamilyPosition().getCode());
         }
         if (request.getMaritalStatus() != null) {
-            appendField(builder, "marital_status", request.getMaritalStatus().getCode());
+            builder.appendField("marital_status", request.getMaritalStatus().getCode());
         }
         if (request.getGender() != null) {
-            appendField(builder, "gender", request.getGender().getCode());
+            builder.appendField("gender", request.getGender().getCode());
         }
         if (request.getBirthday() != null) {
-            appendField(builder, "birthday", request.getBirthday());
+            builder.appendField("birthday", request.getBirthday());
         }
         if (request.getAnniversary() != null) {
-            appendField(builder, "anniversary", request.getAnniversary());
+            builder.appendField("anniversary", request.getAnniversary());
         }
         if (request.getDeceased() != null) {
-            appendField(builder, "deceased", request.getDeceased());
+            builder.appendField("deceased", request.getDeceased());
         }
         if (request.getMembershipDate() != null) {
-            appendField(builder, "membership_date", request.getMembershipDate());
+            builder.appendField("membership_date", request.getMembershipDate());
         }
         if (request.getMembershipEnd() != null) {
-            appendField(builder, "membership_end", request.getMembershipEnd());
+            builder.appendField("membership_end", request.getMembershipEnd());
         }
         if (request.getEmail() != null) {
-            appendField(builder, "email", request.getEmail());
+            builder.appendField("email", request.getEmail());
         }
         if (request.getEmergencyContactName() != null) {
-            appendField(builder, "emergency_contact_name", request.getEmergencyContactName());
+            builder.appendField("emergency_contact_name", request.getEmergencyContactName());
         }
         if (request.getAllergies() != null) {
-            appendField(builder, "allergies", request.getAllergies());
+            builder.appendField("allergies", request.getAllergies());
         }
         if (request.getConfirmedNoAllergies() != null) {
-            appendField(builder, "confirmed_no_allergies", request.getConfirmedNoAllergies());
+            builder.appendField("confirmed_no_allergies", request.getConfirmedNoAllergies());
         }
         if (request.getBaptized() != null) {
-            appendField(builder, "baptized", request.getBaptized());
+            builder.appendField("baptized", request.getBaptized());
         }
         if (request.getModifiedById() != null) {
-            appendField(builder, "modifier_id", request.getModifiedById());
+            builder.appendField("modifier_id", request.getModifiedById());
         }
 
         // Encode all the addresses.
         if (request.getAddresses() != null) {
             for (Address address : request.getAddresses()) {
-                ADDRESS_FORM_SERIALIZER.encode(address, builder);
+                ADDRESS_FORM_SERIALIZER.encode(address, builder.getStringBuilder());
             }
         }
 
@@ -106,20 +106,14 @@ public class IndividualProfileSerializer extends AbstractFormSerializer<UpdateIn
         }
 
         // Add the User-defined fields.
-        for (Map.Entry<String, String> entry : request.getCustomTextFields().entrySet()) {
-            if (entry.getValue() != null) {
-                appendField(builder, entry.getKey(), entry.getValue());
-            }
-        }
-        for (Map.Entry<String, LocalDate> entry : request.getCustomDateFields().entrySet()) {
-            if (entry.getValue() != null) {
-                appendField(builder, entry.getKey(), entry.getValue());
-            }
-        }
-        for (Map.Entry<String, Integer> entry : request.getCustomPulldownFields().entrySet()) {
-            if (entry.getValue() != null) {
-                appendField(builder, entry.getKey(), entry.getValue());
-            }
-        }
+        request.getCustomTextFields().entrySet().stream()
+                .filter(entry -> entry.getValue() != null)
+                .forEach(entry -> builder.appendField(entry.getKey(), entry.getValue()));
+        request.getCustomDateFields().entrySet().stream()
+                .filter(entry -> entry.getValue() != null)
+                .forEach(entry -> builder.appendField(entry.getKey(), entry.getValue()));
+        request.getCustomPulldownFields().entrySet().stream()
+                .filter(entry -> entry.getValue() != null)
+                .forEach(entry -> builder.appendField(entry.getKey(), entry.getValue()));
     }
 }