fix middleware type names in request and request builder constructors

zengin · zengin · commit b84dc66a5e2d · 2020-08-20T21:31:03.000-07:00
diff --git a/Templates/CSharp/Base/CollectionRequest.Base.template.tt b/Templates/CSharp/Base/CollectionRequest.Base.template.tt
@@ -13,7 +13,7 @@ public string GetCollectionClassDefinition(OdcmProperty odcmProperty)
 
 public string GetCollectionRequestConstructor(OdcmProperty odcmProperty)
 {
-    return this.GetConstructor(this.GetPropertyCollectionRequestName(odcmProperty));
+    return this.GetConstructor(this.GetPropertyCollectionRequestName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());
 }
 
 
@@ -27,7 +27,7 @@ public string GetCollectionReferencesClassDefinition(OdcmProperty odcmProperty)
 
 public string GetCollectionReferencesRequestConstructor(OdcmProperty odcmProperty)
 {
-    return this.GetConstructor(this.GetPropertyCollectionReferencesRequestName(odcmProperty));
+    return this.GetConstructor(this.GetPropertyCollectionReferencesRequestName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());
 }
 
 
@@ -41,7 +41,7 @@ public string GetCollectionWithReferencesClassDefinition(OdcmProperty odcmProper
 
 public string GetCollectionWithReferencesRequestConstructor(OdcmProperty odcmProperty)
 {
-    return this.GetConstructor(this.GetPropertyCollectionWithReferencesRequestName(odcmProperty));
+    return this.GetConstructor(this.GetPropertyCollectionWithReferencesRequestName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());
 }
 
 
diff --git a/Templates/CSharp/Base/CollectionRequestBuilder.Base.template.tt b/Templates/CSharp/Base/CollectionRequestBuilder.Base.template.tt
@@ -13,7 +13,7 @@ public string GetCollectionClassDefinition(OdcmProperty odcmProperty)
 
 public string GetCollectionRequestBuilderConstructor(OdcmProperty odcmProperty)
 {
-    return this.GetConstructor(this.GetPropertyCollectionRequestBuilderName(odcmProperty));
+    return this.GetConstructor(this.GetPropertyCollectionRequestBuilderName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());
 }
 
 public string GetCollectionRequestMethod(OdcmProperty odcmProperty)
@@ -37,7 +37,7 @@ public string GetCollectionReferencesClassDefinition(OdcmProperty odcmProperty)
 
 public string GetCollectionReferencesRequestBuilderConstructor(OdcmProperty odcmProperty)
 {
-    return this.GetConstructor(this.GetPropertyCollectionReferencesRequestBuilderName(odcmProperty));
+    return this.GetConstructor(this.GetPropertyCollectionReferencesRequestBuilderName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());
 }
 
 public string GetCollectionReferencesRequestMethod(OdcmProperty odcmProperty)
@@ -61,7 +61,7 @@ public string GetCollectionWithReferencesClassDefinition(OdcmProperty odcmProper
 
 public string GetCollectionWithReferencesRequestBuilderConstructor(OdcmProperty odcmProperty)
 {
-    return this.GetConstructor(this.GetPropertyCollectionWithReferencesRequestBuilderName(odcmProperty));
+    return this.GetConstructor(this.GetPropertyCollectionWithReferencesRequestBuilderName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());
 }
 
 public string GetCollectionWithReferencesRequestMethod(OdcmProperty odcmProperty)
diff --git a/Templates/CSharp/Base/EntityRequest.Base.template.tt b/Templates/CSharp/Base/EntityRequest.Base.template.tt
@@ -18,12 +18,12 @@ public string GetEntityWithReferenceRequestClassDefinition(OdcmClass odcmClass)
 
 public string GetEntityReferenceRequestConstructor(OdcmClass odcmClass)
 {
-    return this.GetConstructor(this.GetEntityReferenceRequestName(odcmClass));
+    return this.GetConstructor(this.GetEntityReferenceRequestName(odcmClass), odcmClass.GetNamespaceName());
 }
 
 public string GetEntityWithReferenceRequestConstructor(OdcmClass odcmClass)
 {
-    return this.GetConstructor(this.GetEntityWithReferenceRequestName(odcmClass));
+    return this.GetConstructor(this.GetEntityWithReferenceRequestName(odcmClass), odcmClass.GetNamespaceName());
 }
 
 // -------------------------------------------------------------
@@ -36,7 +36,7 @@ public string GetEntityRequestClassDefinition(OdcmClass odcmClass)
 
 public string GetEntityRequestConstructor(OdcmClass odcmClass)
 {
-    return this.GetConstructor(this.GetEntityRequestName(odcmClass));
+    return this.GetConstructor(this.GetEntityRequestName(odcmClass), odcmClass.GetNamespaceName());
 }
 
 
diff --git a/Templates/CSharp/Base/EntityRequestBuilder.Base.template.tt b/Templates/CSharp/Base/EntityRequestBuilder.Base.template.tt
@@ -13,7 +13,7 @@ public string GetEntityRequestBuilderClassDefinition(OdcmClass odcmClass)
 
 public string GetEntityRequestBuilderConstructor(OdcmClass odcmClass)
 {
-    return this.GetConstructor(this.GetEntityRequestBuilderName(odcmClass));
+    return this.GetConstructor(this.GetEntityRequestBuilderName(odcmClass), odcmClass.GetNamespaceName());
 }
 
 public string GetEntityRequestMethod(OdcmClass odcmClass)
@@ -37,7 +37,7 @@ public string GetEntityReferenceRequestBuilderClassDefinition(OdcmClass odcmClas
 
 public string GetEntityReferenceRequestBuilderConstructor(OdcmClass odcmClass)
 {
-    return this.GetConstructor(this.GetEntityReferenceRequestBuilderName(odcmClass));
+    return this.GetConstructor(this.GetEntityReferenceRequestBuilderName(odcmClass), odcmClass.GetNamespaceName());
 }
 
 public string GetEntityReferenceRequestMethod(OdcmClass odcmClass)
@@ -90,7 +90,7 @@ public string GetEntityWithReferenceRequestBuilderClassDefinition(OdcmClass odcm
 
 public string GetEntityWithReferenceRequestBuilderConstructor(OdcmClass odcmClass)
 {
-    return this.GetConstructor(this.GetEntityWithReferenceRequestBuilderName(odcmClass));
+    return this.GetConstructor(this.GetEntityWithReferenceRequestBuilderName(odcmClass), odcmClass.GetNamespaceName());
 }
 
 public string GetEntityWithReferenceRequestMethod(OdcmClass odcmClass)
diff --git a/Templates/CSharp/Base/Request.Base.template.tt b/Templates/CSharp/Base/Request.Base.template.tt
@@ -18,8 +18,11 @@ public string GetClassDefinition(string className)
     return stringBuilder.ToString();
 }
 
-public string GetConstructor(string instanceTypeName)
+public string GetConstructor(string instanceTypeName, string @namespace)
 {
+    var iBaseClientTypeName = @namespace.GetMiddlewareTypeName("IBaseClient");
+    var optionTypeName = @namespace.GetMiddlewareTypeName("Option");
+
     var stringBuilder = new StringBuilder();
 
     stringBuilder.Append("/// <summary>");
@@ -29,16 +32,22 @@ public string GetConstructor(string instanceTypeName)
     stringBuilder.Append(
 @"        /// </summary>
         /// <param name=""requestUrl"">The URL for the built request.</param>
-        /// <param name=""client"">The <see cref=""IBaseClient""/> for handling requests.</param>
+        /// <param name=""client"">The <see cref=""");
+    stringBuilder.Append(iBaseClientTypeName);
+    stringBuilder.Append(@"""/> for handling requests.</param>
         /// <param name=""options"">Query and header option name value pairs for the request.</param>");
 
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        public {0}(", instanceTypeName);
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.Append(
 @"            string requestUrl,
-            IBaseClient client,
-            IEnumerable<Option> options)
+            ");
+    stringBuilder.Append(iBaseClientTypeName);
+    stringBuilder.Append(@" client,
+            IEnumerable<");
+    stringBuilder.Append(optionTypeName);
+    stringBuilder.Append(@"> options)
             : base(requestUrl, client, options)
         {
         }");
diff --git a/Templates/CSharp/Base/RequestBuilder.Base.template.tt b/Templates/CSharp/Base/RequestBuilder.Base.template.tt
@@ -45,8 +45,10 @@ public string GetEntityClassDefinition(OdcmClass entity)
     return stringBuilder.ToString();
 }
 
-public string GetConstructor(string instanceTypeName)
+public string GetConstructor(string instanceTypeName, string @namespace)
 {
+    var iBaseClientTypeName = @namespace.GetMiddlewareTypeName("IBaseClient");
+
     var stringBuilder = new StringBuilder();
 
     stringBuilder.Append("/// <summary>");
@@ -56,14 +58,17 @@ public string GetConstructor(string instanceTypeName)
     stringBuilder.Append(
 @"        /// </summary>
         /// <param name=""requestUrl"">The URL for the built request.</param>
-        /// <param name=""client"">The <see cref=""IBaseClient""/> for handling requests.</param>");
+        /// <param name=""client"">The <see cref=""");
+    stringBuilder.Append(iBaseClientTypeName);
+    stringBuilder.Append(@"""/> for handling requests.</param>");
 
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        public {0}(", instanceTypeName);
     stringBuilder.Append(Environment.NewLine);
-    stringBuilder.Append(
-@"            string requestUrl,
-            IBaseClient client)
+    stringBuilder.Append(@"            string requestUrl,
+            ");
+    stringBuilder.Append(iBaseClientTypeName);
+    stringBuilder.Append(@" client)
             : base(requestUrl, client)
         {
         }");
diff --git a/src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs b/src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs
@@ -197,6 +197,11 @@ public static string GetNamespaceName(this OdcmProperty property)
             return property.Projection.Type.Namespace.GetNamespaceName();
         }
 
+        public static string GetNamespaceName(this OdcmClass odcmClass)
+        {
+            return odcmClass.Namespace.GetNamespaceName();
+        }
+
         public static bool IsTypeNullable(this OdcmType type)
         {
             var t = type.GetTypeString();

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public string GetCollectionClassDefinition(OdcmProperty odcmProperty)`
`13`	`13`
`14`	`14`	`public string GetCollectionRequestConstructor(OdcmProperty odcmProperty)`
`15`	`15`	`{`
`16`		`- return this.GetConstructor(this.GetPropertyCollectionRequestName(odcmProperty));`
	`16`	`+ return this.GetConstructor(this.GetPropertyCollectionRequestName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());`
`17`	`17`	`}`
`18`	`18`
`19`	`19`
`@@ -27,7 +27,7 @@ public string GetCollectionReferencesClassDefinition(OdcmProperty odcmProperty)`
`27`	`27`
`28`	`28`	`public string GetCollectionReferencesRequestConstructor(OdcmProperty odcmProperty)`
`29`	`29`	`{`
`30`		`- return this.GetConstructor(this.GetPropertyCollectionReferencesRequestName(odcmProperty));`
	`30`	`+ return this.GetConstructor(this.GetPropertyCollectionReferencesRequestName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());`
`31`	`31`	`}`
`32`	`32`
`33`	`33`
`@@ -41,7 +41,7 @@ public string GetCollectionWithReferencesClassDefinition(OdcmProperty odcmProper`
`41`	`41`
`42`	`42`	`public string GetCollectionWithReferencesRequestConstructor(OdcmProperty odcmProperty)`
`43`	`43`	`{`
`44`		`- return this.GetConstructor(this.GetPropertyCollectionWithReferencesRequestName(odcmProperty));`
	`44`	`+ return this.GetConstructor(this.GetPropertyCollectionWithReferencesRequestName(odcmProperty), odcmProperty.Class.AsOdcmClass().GetNamespaceName());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ public string GetEntityWithReferenceRequestClassDefinition(OdcmClass odcmClass)`
`18`	`18`
`19`	`19`	`public string GetEntityReferenceRequestConstructor(OdcmClass odcmClass)`
`20`	`20`	`{`
`21`		`- return this.GetConstructor(this.GetEntityReferenceRequestName(odcmClass));`
	`21`	`+ return this.GetConstructor(this.GetEntityReferenceRequestName(odcmClass), odcmClass.GetNamespaceName());`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public string GetEntityWithReferenceRequestConstructor(OdcmClass odcmClass)`
`25`	`25`	`{`
`26`		`- return this.GetConstructor(this.GetEntityWithReferenceRequestName(odcmClass));`
	`26`	`+ return this.GetConstructor(this.GetEntityWithReferenceRequestName(odcmClass), odcmClass.GetNamespaceName());`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// -------------------------------------------------------------`
`@@ -36,7 +36,7 @@ public string GetEntityRequestClassDefinition(OdcmClass odcmClass)`
`36`	`36`
`37`	`37`	`public string GetEntityRequestConstructor(OdcmClass odcmClass)`
`38`	`38`	`{`
`39`		`- return this.GetConstructor(this.GetEntityRequestName(odcmClass));`
	`39`	`+ return this.GetConstructor(this.GetEntityRequestName(odcmClass), odcmClass.GetNamespaceName());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public string GetEntityRequestBuilderClassDefinition(OdcmClass odcmClass)`
`13`	`13`
`14`	`14`	`public string GetEntityRequestBuilderConstructor(OdcmClass odcmClass)`
`15`	`15`	`{`
`16`		`- return this.GetConstructor(this.GetEntityRequestBuilderName(odcmClass));`
	`16`	`+ return this.GetConstructor(this.GetEntityRequestBuilderName(odcmClass), odcmClass.GetNamespaceName());`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public string GetEntityRequestMethod(OdcmClass odcmClass)`
`@@ -37,7 +37,7 @@ public string GetEntityReferenceRequestBuilderClassDefinition(OdcmClass odcmClas`
`37`	`37`
`38`	`38`	`public string GetEntityReferenceRequestBuilderConstructor(OdcmClass odcmClass)`
`39`	`39`	`{`
`40`		`- return this.GetConstructor(this.GetEntityReferenceRequestBuilderName(odcmClass));`
	`40`	`+ return this.GetConstructor(this.GetEntityReferenceRequestBuilderName(odcmClass), odcmClass.GetNamespaceName());`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public string GetEntityReferenceRequestMethod(OdcmClass odcmClass)`
`@@ -90,7 +90,7 @@ public string GetEntityWithReferenceRequestBuilderClassDefinition(OdcmClass odcm`
`90`	`90`
`91`	`91`	`public string GetEntityWithReferenceRequestBuilderConstructor(OdcmClass odcmClass)`
`92`	`92`	`{`
`93`		`- return this.GetConstructor(this.GetEntityWithReferenceRequestBuilderName(odcmClass));`
	`93`	`+ return this.GetConstructor(this.GetEntityWithReferenceRequestBuilderName(odcmClass), odcmClass.GetNamespaceName());`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`public string GetEntityWithReferenceRequestMethod(OdcmClass odcmClass)`
Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,11 @@ public static string GetNamespaceName(this OdcmProperty property)`
`197`	`197`	`return property.Projection.Type.Namespace.GetNamespaceName();`
`198`	`198`	`}`
`199`	`199`
	`200`	`+ public static string GetNamespaceName(this OdcmClass odcmClass)`
	`201`	`+ {`
	`202`	`+ return odcmClass.Namespace.GetNamespaceName();`
	`203`	`+ }`
	`204`	`+`
`200`	`205`	`public static bool IsTypeNullable(this OdcmType type)`
`201`	`206`	`{`
`202`	`207`	`var t = type.GetTypeString();`