Fixes issue with serialized polled items (stack overflow).

opensrp · Jul 29, 2019 · b7bf8fc · b7bf8fc
1 parent 9a8e80f
commit b7bf8fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...ain/java/org/dhis2/fhir/adapter/dhis/service/impl/DhisMetadataPolledItemDeserializer.java b/...ain/java/org/dhis2/fhir/adapter/dhis/service/impl/DhisMetadataPolledItemDeserializer.java
@@ -33,6 +33,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.dhis2.fhir.adapter.dhis.poll.PolledItems;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -72,6 +73,11 @@ public DhisMetadataPolledItems deserialize( JsonParser p, DeserializationContext
             }
         }
 
-        return p.getCodec().treeToValue( rootNode, DhisMetadataPolledItems.class );
+        return new DhisMetadataPolledItems( p.getCodec().treeToValue( rootNode, InternalDhisMetadataPolledItems.class ) );
+    }
+
+    public static class InternalDhisMetadataPolledItems extends PolledItems<DhisMetadataPolledItem>
+    {
+        private static final long serialVersionUID = -3139366174834526658L;
     }
 }
diff --git a/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/service/impl/DhisMetadataPolledItems.java b/dhis/src/main/java/org/dhis2/fhir/adapter/dhis/service/impl/DhisMetadataPolledItems.java
@@ -53,4 +53,10 @@ public DhisMetadataPolledItems( @Nonnull List<DhisMetadataPolledItem> items )
     {
         setItems( items );
     }
+
+    public DhisMetadataPolledItems( @Nonnull PolledItems<DhisMetadataPolledItem> polledItems )
+    {
+        setItems( polledItems.getItems() );
+        setPager( polledItems.getPager() );
+    }
 }