Revert "Fix parsing custom fields (#51)" (#53)

This reverts commit e8bbb11.

Author: Crim

src/main/java/com/darksci/pardot/api/request/prospect/ProspectModifyRequest.java

@@ -65,7 +65,7 @@ public T withProspect(final Prospect prospect) {
 
         // Loop through and set custom fields
         if (prospect.getCustomFields() != null) {
-            for (Map.Entry<String, Object> entry: prospect.getCustomFields().entrySet()) {
+            for (Map.Entry<String, String> entry: prospect.getCustomFields().entrySet()) {
                 setParam(entry.getKey(), entry.getValue());
             }
         }

src/main/java/com/darksci/pardot/api/response/prospect/Prospect.java

@@ -17,7 +17,6 @@
 
 package com.darksci.pardot.api.response.prospect;
 
-import com.darksci.pardot.api.ParserException;
 import com.darksci.pardot.api.parser.PardotBooleanSerializer;
 import com.darksci.pardot.api.response.campaign.Campaign;
 import com.darksci.pardot.api.response.list.ListSubscription;
@@ -123,7 +122,7 @@ public class Prospect {
     private LastActivity lastActivity;
 
     // Custom fields
-    private Map<String, Object> customFields = new HashMap<>();
+    private Map<String, String> customFields = new HashMap<>();
 
     // Related Objects
     private Campaign campaign;
@@ -348,7 +347,7 @@ public VisitorActivity getLastActivity() {
 
     // Custom fields
     @JsonAnyGetter
-    public Map<String, Object> getCustomFields() {
+    public Map<String, String> getCustomFields() {
         return customFields;
     }
 
@@ -359,15 +358,11 @@ public Map<String, Object> getCustomFields() {
      * @return Value of the custom field.
      */
     public String getCustomField(final String customFieldName) {
-        return String.valueOf(customFields.get(customFieldName));
-    }
-
-    public Map<String, String> getCustomFieldValues(final String customFieldName) {
-        return (Map<String, String>) customFields.get(customFieldName);
+        return getCustomFields().get(customFieldName);
     }
 
     @JsonAnySetter
-    public void setCustomField(final String fieldName, final Object fieldValue) {
+    public void setCustomField(final String fieldName, final String fieldValue) {
         customFields.put(fieldName, fieldValue);
     }
 

src/test/java/com/darksci/pardot/api/PardotClientIntegrationTest.java

@@ -128,9 +128,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
@@ -1068,14 +1065,6 @@ public void prospectUpsertTest() {
         prospect.setLastName("User");
         prospect.setCity("Some City");
 
-        java.util.List<String> values = new ArrayList<>();
-        values.add("val1");
-        values.add("val2");
-        Map<String, Object> customFields = new HashMap<>();
-        customFields.put("custom", values);
-
-        prospect.setCustomField("custom", customFields);
-
         final ProspectUpsertRequest request = new ProspectUpsertRequest()
             .withProspect(prospect);
 

src/test/java/com/darksci/pardot/api/parser/prospect/ProspectReadResponseParserTest.java

@@ -74,11 +74,9 @@ private void validateProspect1(final Prospect prospect) {
 
         // Validate custom fields
         assertNotNull("Should have non-null custom fields", prospect.getCustomFields());
-        assertEquals("Should have 3 custom fields", 3, prospect.getCustomFields().size());
+        assertEquals("Should have 2 custom fields", 2, prospect.getCustomFields().size());
         assertEquals("Should have first custom field value", "my custom field value", prospect.getCustomField("MyCustom_Field"));
         assertEquals("Should have second custom field value", "my other custom field value", prospect.getCustomField("MyOtherCustom_Field"));
-        assertEquals("Should have object custom field value", "{value=abc}", prospect.getCustomField("Add_Prospect01"));
-        assertEquals("Should have object custom field values", "abc", prospect.getCustomFieldValues("Add_Prospect01").get("value"));
 
         // Validate assigned To user
         assertNotNull("Assigned To is not null", prospect.getAssignedTo());

src/test/resources/mockResponses/prospectRead.xml

@@ -46,9 +46,6 @@
         <is_starred></is_starred>
         <created_at>2017-08-11 21:40:25</created_at>
         <updated_at>2017-08-11 21:40:25</updated_at>
-        <Add_Prospect01>
-            <value>abc</value>
-        </Add_Prospect01>
         <campaign>
             <id>423</id>
             <name>Website Tracking</name>