Merge pull request #88 from microsoftgraph/cbales-working

Android & PHP updates for Build

Author: Caitlin Bales (MSFT)

Templates/Android/BaseModel.template.tt

@@ -359,7 +359,7 @@
     public string ParamType(OdcmParameter c) {
         var typeString = c.Type.GetTypeString();
         if (c.IsCollection){
-            typeString = String.Format("List<{0}>", c.Type.GetTypeString());
+            typeString = String.Format("java.util.List<{0}>", c.Type.GetTypeString());
         } else if (typeString.Equals("Stream")) {
 
             // Excel introduced the use of "Edm.Stream" types
@@ -516,7 +516,7 @@ import {0}.options.*;
 import {0}.serializer.*;
 
 import java.util.Arrays;
-import java.util.List;";
+import java.util.EnumSet;";
         return string.Format(format,
             host.CurrentModel.NamespaceName(),
             host.TemplateInfo.OutputParentDirectory);
@@ -620,6 +620,7 @@ public {1} {2}{3}{4} {{";
         var format =
 @"    /**
      * The {0}.
+	 * {4}
      */
     @SerializedName(""{1}"")
     @Expose
@@ -629,6 +630,7 @@ public {1} {2}{3}{4} {{";
         var collectionFormat =
 @"    /**
      * The {0}.
+	 * {4}
      */
     public transient {2} {3};
 
@@ -643,7 +645,7 @@ public {1} {2}{3}{4} {{";
             {
                 if (!property.IsNavigation())
                 {
-                    propertyType = "List<" + property.GetTypeString() + ">";
+                    propertyType = "java.util.List<" + property.GetTypeString() + ">";
                 }
                 else
                 {
@@ -660,7 +662,8 @@ public {1} {2}{3}{4} {{";
                 propertyName.SplitCamelCase(),
                 property.Name,
                 propertyType,
-                property.SanitizePropertyName().ToLowerFirstChar());
+                property.Name.SanitizePropertyName(property).ToLowerFirstChar(),
+				property.LongDescription);
         }
         return sb.ToString();
     }
@@ -672,20 +675,22 @@ public {1} {2}{3}{4} {{";
         var format =
 @"    /**
      * The {0}.
+	 * {1}
      */
-    @SerializedName(""{1}"")
+    @SerializedName(""{2}"")
     @Expose
-    public {2} {3};
+    public {3} {4};
 
 ";
         foreach (var p in parameters)
         {
             sb.AppendFormat(
                 format,
                 ParamName(p).SplitCamelCase(),
+				p.LongDescription,
                 ParamName(p),
                 ParamType(p),
-                p.SanitizePropertyName().ToLowerFirstChar()
+                ParamName(p).SanitizePropertyName(p).ToLowerFirstChar()
             );
         }
         return sb.ToString();
@@ -755,7 +760,7 @@ public {1} {2}{3}{4} {{";
             {0} = new {2}(response, null);
         }}
 ",
-            property.SanitizePropertyName(),
+            property.Name.SanitizePropertyName(property),
             BaseTypeCollectionResponse(property),
             TypeCollectionPage(property),
             property.GetTypeString());

Templates/Android/extensions/EntityCollectionReferenceRequest.java.tt

@@ -15,7 +15,7 @@
      * @param client The service client
      * @param options The options for this request
      */
-    public <#=TypeCollectionReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> options) {
+    public <#=TypeCollectionReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> options) {
         super(requestUrl, client, options);
     }
 }

Templates/Android/extensions/EntityCollectionReferenceRequestBuilder.java.tt

@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions) {
+    public <#=TypeCollectionReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }

Templates/Android/extensions/EntityCollectionRequest.java.tt

@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions) {
+    public <#=TypeCollectionRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }

Templates/Android/extensions/EntityCollectionRequestBuilder.java.tt

@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions) {
+    public <#=TypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }

Templates/Android/extensions/EntityCollectionWithReferencesRequest.java.tt

@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionWithReferencesRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions) {
+    public <#=TypeCollectionWithReferencesRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }

Templates/Android/extensions/EntityCollectionWithReferencesRequestBuilder.java.tt

@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeCollectionWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions) {
+    public <#=TypeCollectionWithReferencesRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }

Templates/Android/extensions/EntityReferenceRequest.java.tt

@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions) {
+    public <#=TypeReferenceRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }

Templates/Android/extensions/EntityReferenceRequestBuilder.java.tt

@@ -15,7 +15,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions) {
+    public <#=TypeReferenceRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
         super(requestUrl, client, requestOptions);
     }
 }

Templates/Android/extensions/EntityRequest.java.tt

@@ -19,7 +19,7 @@
      */
     public <#=TypeRequest(c)#>(final String requestUrl,
             final <#=IBaseClientType()#> client,
-            final List<Option> requestOptions,
+            final java.util.List<Option> requestOptions,
             final Class responseClass) {
         super(requestUrl, client, requestOptions, responseClass);
     }
@@ -32,7 +32,7 @@
      * @param client The service client
      * @param requestOptions The options for this request
      */
-    public <#=TypeRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions) {
+    public <#=TypeRequest(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final java.util.List<Option> requestOptions) {
         super(requestUrl, client, requestOptions, <#=ClassTypeName(c)#>.class);
     }
 }