Adding @expose annotations to Entities

Author: Brian Melton

Templates/Android/BaseModel.template.tt

@@ -622,6 +622,7 @@ public {1} {2}{3}{4} {{";
      * The {0}.
      */
     @SerializedName(""{1}"")
+    @Expose
     public {2} {3};
 
 ";
@@ -673,6 +674,7 @@ public {1} {2}{3}{4} {{";
      * The {0}.
      */
     @SerializedName(""{1}"")
+    @Expose
     public {2} {3};
 
 ";

Templates/Android/generated/BaseEntity.java.tt

@@ -14,6 +14,7 @@ import com.google.gson.annotations.*;
     if(((OdcmClass)c).Base == null){
 #>
     @SerializedName("@odata.type")
+    @Expose(serialize = false)
     public String oDataType;
 <#
     }

Templates/Android/generated/BaseEntityCollectionResponse.java.tt

@@ -16,12 +16,14 @@ import com.google.gson.annotations.*;
      * The list of <#=TypeName(c)#> within this collection page
      */
     @SerializedName("value")
+    @Expose
     public List<<#=TypeName(c)#>> value;
 
     /**
      * The url to the next page of this collection, or null
      */
     @SerializedName("@odata.nextLink")
+    @Expose(serialize = false)
     public String nextLink;
 
 <#=CreateRawJsonObject()#>

Templates/Android/generated/BaseMethodCollectionResponse.java.tt

@@ -13,9 +13,11 @@ import com.google.gson.annotations.*;
 <#=CreateClassDef(BaseTypeCollectionResponse(c), null, "IJsonBackedObject")#>
 
     @SerializedName("value")
+    @Expose
     public List<<#=OdcmMethodReturnType(c as OdcmMethod)#>> value;
 
     @SerializedName("@odata.nextLink")
+    @Expose(serialize = false)
     public String nextLink;
 
 <#=CreateRawJsonObject()#>