Added disambiguation for entities that end with Request.

Author: mmainer

Templates/CSharp/Base/EntityRequest.Base.template.tt

@@ -278,6 +278,12 @@ public string GetEntityGetAsyncMethod(OdcmClass odcmClass, bool initializeCollec
 
     var entityName = this.GetEntityNameString(odcmClass);
 
+	// Special case for when an entity name ends with "Request". Associated with the change in EntityType.cs.tt
+	if (entityName.EndsWith("Request"))
+	{
+		entityName = String.Concat(entityName, "Object");
+	}
+
     this.AppendGetAsyncHeader(entityName, stringBuilder, false);
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        public System.Threading.Tasks.Task<{0}> GetAsync()", entityName);

Templates/CSharp/Base/IEntityRequest.Base.template.tt

@@ -314,6 +314,13 @@ public string GetEntityUpdateAsyncMethod(OdcmClass odcmClass)
 
 public string GetExpandExpressionMethod(string requestType, string underlyingType)
 {
+
+	// Special case for when an entity name ends with "Request". Associated with the change in EntityType.cs.tt
+	if (underlyingType.EndsWith("Request"))
+	{
+		underlyingType = String.Concat(underlyingType, "Object");
+	}
+
     var stringBuilder = new StringBuilder();
 
     stringBuilder.Append(
@@ -346,6 +353,13 @@ public string GetExpandMethod(string entityRequest)
 
 public string GetSelectExpressionMethod(string requestType, string underlyingType)
 {
+
+	// Special case for when an entity name ends with "Request". Associated with the change in EntityType.cs.tt
+	if (underlyingType.EndsWith("Request"))
+	{
+		underlyingType = String.Concat(underlyingType, "Object");
+	}
+
     var stringBuilder = new StringBuilder();
 
     stringBuilder.Append(
@@ -380,13 +394,6 @@ public string GetSelectMethod(string entityRequest)
 public string GetEntityExpandMethods(OdcmClass odcmClass)
 {
     string entityName = this.GetEntityNameString(odcmClass);
-
-	// Special case for when an entity name ends with "Request". Associated with the change in EntityType.cs.tt
-	if (entityName.EndsWith("Request"))
-	{
-		entityName = String.Concat(entityName, "Object");
-	}
-
     return this.GetExpandMethod(this.GetRequestString(entityName)) +
     Environment.NewLine + Environment.NewLine + "        " +
     this.GetExpandExpressionMethod(this.GetRequestString(entityName), entityName);
@@ -395,13 +402,6 @@ public string GetEntityExpandMethods(OdcmClass odcmClass)
 public string GetEntitySelectMethods(OdcmClass odcmClass)
 {
     string entityName = this.GetEntityNameString(odcmClass);
-
-	// Special case for when an entity name ends with "Request". Associated with the change in EntityType.cs.tt
-	if (entityName.EndsWith("Request"))
-	{
-		entityName = String.Concat(entityName, "Object");
-	}
-
     return this.GetSelectMethod(this.GetRequestString(entityName)) +
     Environment.NewLine + Environment.NewLine + "        " +
     this.GetSelectExpressionMethod(this.GetRequestString(entityName), entityName);