First pass working implementation of additionalData support

Author: Brian Melton

Templates/Android/generated/BaseEntity.java.tt

@@ -6,6 +6,7 @@
 <#=CreatePackageDef(host)#>
 
 import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import com.google.gson.annotations.*;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,8 +20,12 @@ import java.util.Map;
     @Expose(serialize = false)
     public String oDataType;
 
-    @Expose(serialize = false)
-    public Map<String, Object> additionalData = new HashMap<>();
+    private transient AdditionalDataDelegate additionalDataDelegate = new AdditionalDataDelegate(this);
+
+    @Override
+    public final AdditionalDataDelegate getAdditionalDataDelegate() {
+        return additionalDataDelegate;
+    }
 <#
     }
 #>

Templates/Android/generated/BaseEntityCollectionResponse.java.tt

@@ -26,6 +26,13 @@ import com.google.gson.annotations.*;
     @Expose(serialize = false)
     public String nextLink;
 
+    private transient AdditionalDataDelegate additionalDataDelegate = new AdditionalDataDelegate(this);
+
+    @Override
+    public final AdditionalDataDelegate getAdditionalDataDelegate() {
+        return additionalDataDelegate;
+    }
+
 <#=CreateRawJsonObject()#>
 <#=UpdateListPropertiesWithinSetRawObject(new [] { "value" })#>
 }

Templates/Android/generated/BaseMethodCollectionResponse.java.tt

@@ -20,6 +20,13 @@ import com.google.gson.annotations.*;
     @Expose(serialize = false)
     public String nextLink;
 
+    private transient AdditionalDataDelegate additionalDataDelegate = new AdditionalDataDelegate(this);
+
+    @Override
+    public final AdditionalDataDelegate getAdditionalDataDelegate() {
+        return additionalDataDelegate;
+    }
+
 <#=CreateRawJsonObject()#>
 <# if ( ! ((c as OdcmMethod).ReturnType is OdcmPrimitiveType) ) { #>
 <#=    UpdateListPropertiesWithinSetRawObject(new [] { "value" })#>