Merge remote-tracking branch 'refs/remotes/origin/master' into dev

Author: Caitlin Bales

graphmeta_excel_noannots.xml 11-17-16_v1_noannots.xmlgraphmeta_excel_noannots.xml renamed to 11-17-16_v1_noannots.xml

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6ACF6CEE-A594-4DFE-9286-C7154E91738B}"
 	ProjectSection(SolutionItems) = preProject

9-22-16-staging-v1_noannots.xml

@@ -7,9 +7,9 @@ Source code writers for [VIPR][vipr-source-repo] utilizing T4 templates. The Gra
 Currently the following target languages are supported by this writer:
 - Android
 - CSharp
-- JavaScript
 - Objective-C
 - Python
+- TypeScript
 
 # Contents
 - [Prerequisites](#prerequisites)
@@ -44,7 +44,7 @@ By default, output source code will be put in a folder named "output" next to th
 ## Template Writer Settings
 ### Available Languages
 
-There are four languages to choose from at the moment.  Java, ObjC, CSharp, and Python.  Specify which language you want to generate in the `TargetLanguage` setting.
+There are five languages to choose from at the moment.  Java, ObjC, CSharp, TypeScript and Python.  Specify which language you want to generate in the `TargetLanguage` setting.
 
 ### Templates
 You must specify a template directory under the `TemplatesDirectory` Settings.  The directory can be a full path or relative to the running directory.  The directory must contain a sub directory for each platform you want to generate code for. See the Templates directory for an example.

GraphODataTemplateWriter.sln

@@ -13,29 +13,10 @@
 <# } #>
 <#+
 
-    /// Is this request type a post?
-    public bool IsPostRequestType(OdcmMethod method) {
-        return method.IsAction()
-            && null != method.Parameters
-            && method.Parameters.Any();
-    }
-
     /// Choose an intermediate class type based on GETs/POSTs
     public string RequestBuilderSuperClass(OdcmObject currentType) {
-        var isPostAction =
-            IsPostRequestType(
-                currentType.AsOdcmMethod()
-            );
-
-        string superClass;
-
-        if (isPostAction) {
-            superClass = "BasePostMethodRequestBuilder";
-        } else {
-            superClass = "BaseGetMethodRequestBuilder";
-        }
-
-        return superClass;
+        return currentType.AsOdcmMethod().IsFunction ?
+            "BaseFunctionRequestBuilder" : "BaseActionRequestBuilder";
     }
 
     /// <summary>
@@ -376,15 +357,37 @@
 
     /// The Type of this param, as a string
     public string ParamType(OdcmParameter c) {
+        var typeString = c.Type.GetTypeString();
         if (c.IsCollection){
-            return String.Format("List<{0}>", c.Type.GetTypeString());
+            typeString = String.Format("List<{0}>", c.Type.GetTypeString());
+        } else if (typeString.Equals("Stream")) {
+
+            // Excel introduced the use of "Edm.Stream" types
+            // normally this would be addressed at the TypeHelper level
+            // but because streams will use different data containers
+            // for outgoing vs. incoming streams I'm going to apply the type
+            // here. Outbound Streams will use byte[]
+
+            typeString = "byte[]";
         }
-        return c.Type.GetTypeString();
+        return typeString;
     }
 
     public string ReturnType(OdcmObject c) {
-        if (c.AsOdcmMethod().ReturnType != null) {
-            return c.AsOdcmMethod().ReturnType.Name.ToUpperFirstChar();
+        var returnType = c.AsOdcmMethod().ReturnType;
+        if (returnType != null) {
+            var returnTypeString = returnType.GetTypeString();
+
+            // Excel introduced the use of "Edm.Stream" types
+            // normally this would be addressed at the TypeHelper level
+            // but because streams will use different data containers
+            // for outgoing vs. incoming streams I'm going to apply the type
+            // here. Inbound Streams will use java.io.InputStream
+
+            if (returnTypeString.Equals("Stream")) {
+                returnTypeString = "java.io.InputStream";
+            }
+            return returnTypeString;
         }
         return "Void";
     }
@@ -619,14 +622,15 @@ public {1} {2}{3}{4} {{";
      * The {0}.
      */
     @SerializedName(""{1}"")
-    public {4}{2} {3};
+    @Expose
+    public {2} {3};
 
 ";
         var collectionFormat =
 @"    /**
      * The {0}.
      */
-    public transient {4}{2} {3};
+    public transient {2} {3};
 
 ";
 
@@ -635,7 +639,6 @@ public {1} {2}{3}{4} {{";
             var propertyName = property.Name.ToUpperFirstChar();
             var propertyType = "";
             var propertyFormat = format;
-            var shouldFullyQualify = TypeHelperAndroid.ReservedNames.Contains(propertyName);
             if (property.IsCollection)
             {
                 if (!property.IsNavigation())
@@ -657,8 +660,7 @@ public {1} {2}{3}{4} {{";
                 propertyName.SplitCamelCase(),
                 property.Name,
                 propertyType,
-                property.SanitizePropertyName().ToLowerFirstChar(),
-                shouldFullyQualify ? "com.microsoft.graph.extensions." : "");
+                property.SanitizePropertyName().ToLowerFirstChar());
         }
         return sb.ToString();
     }
@@ -672,6 +674,7 @@ public {1} {2}{3}{4} {{";
      * The {0}.
      */
     @SerializedName(""{1}"")
+    @Expose
     public {2} {3};
 
 ";

README.md

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

Templates/Android/BaseModel.template.tt

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

Templates/Android/extensions/EntityCollectionReferenceRequestBuilder.java.tt

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

Templates/Android/extensions/EntityCollectionRequest.java.tt

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

Templates/Android/extensions/EntityCollectionRequestBuilder.java.tt

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