Merge pull request #112 from microsoftgraph/Java

Java

Author: Caitlin Bales (MSFT)

Templates/Android/generated/BaseEntity.java.tt

@@ -17,7 +17,7 @@ import java.util.Map;
     if(((OdcmClass)c).Base == null){
 #>
     @SerializedName("@odata.type")
-    @Expose(serialize = false)
+    @Expose
     public String oDataType;
 
     private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
@@ -30,10 +30,6 @@ import java.util.Map;
     }
 #>
 
-    public <#=BaseTypeName(c)#>() {
-        oDataType = "<#=((OdcmClass)c).FullName#>";
-    }
-
 <#=CreatePropertyDef(((OdcmClass)c).Properties, c is OdcmComplexClass)#>
 <#=CreateRawJsonObject()#>
 <#=UpdatePropertiesWithinSetRawObject(((OdcmClass)c).Properties, c is OdcmComplexClass)#>

Templates/Android/generated/BaseEntityRequestBuilder.java.tt

@@ -36,18 +36,6 @@
 <#
 if (c.AsOdcmClass() != null)
 {
-    foreach(var child in c.AsOdcmClass().Derived)
-    {
-        var childName = child.Name.ToCheckedCase();
-#>
-
-    public <#=ITypeRequestBuilder(child)#> <#=childName.ToLowerFirstChar()#>() {
-        return new <#=TypeRequestBuilder(child)#>(getRequestUrlWithAdditionalSegment("<#=child.Name#>"), getClient(), null);
-    }
-<#
-    }
-#>
-<#
     foreach(var prop in c.AsOdcmClass().NavigationProperties())
     {
         var propName = prop.Name.ToUpperFirstChar();

Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt

@@ -35,18 +35,6 @@
 <#
 if (c.AsOdcmClass() != null)
 {
-    foreach(var child in c.AsOdcmClass().Derived)
-    {
-        var childName = child.Name.ToCheckedCase();
-#>
-
-    public <#=ITypeRequestBuilder(child)#> <#=childName.ToLowerFirstChar()#>() {
-        return new <#=TypeRequestBuilder(child)#>(getRequestUrlWithAdditionalSegment("<#=child.Name#>"), getClient(), null);
-    }
-<#
-    }
-#>
-<#
     foreach(var prop in c.AsOdcmClass().NavigationProperties())
     {
         var propName = prop.Name.ToUpperFirstChar();

Templates/Android/generated/IBaseEntityRequestBuilder.java.tt

@@ -19,16 +19,6 @@
 <#
 if (c.AsOdcmClass() != null)
 {
-    foreach(var child in c.AsOdcmClass().Derived)
-    {
-        var childName = child.Name.ToCheckedCase();
-#>
-
-    <#=ITypeRequestBuilder(child)#> <#=childName.ToLowerFirstChar()#>();
-<#
-    }
-#>
-<#
     foreach(var prop in c.AsOdcmClass().NavigationProperties())
     {
         var propName = prop.Name.ToUpperFirstChar();

Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt

@@ -20,16 +20,6 @@
 <#
 if (c.AsOdcmClass() != null)
 {
-    foreach(var child in c.AsOdcmClass().Derived)
-    {
-        var childName = child.Name.ToCheckedCase();
-#>
-
-    <#=ITypeRequestBuilder(child)#> <#=childName.ToLowerFirstChar()#>();
-<#
-    }
-#>
-<#
     foreach(var prop in c.AsOdcmClass().NavigationProperties())
     {
         var propName = prop.Name.ToUpperFirstChar();