Removing warnings about accessing 'Type' property and moving to using the 'Projection' of a type for CSharp / Android / JavaScript

Robert Anderson · Robert Anderson · commit 9ec15d4442dc · 2016-04-22T09:24:59.000-07:00
diff --git a/Templates/Android/BaseModel.template.tt b/Templates/Android/BaseModel.template.tt
@@ -19,11 +19,11 @@
         if (c is OdcmMethod) {
             return ((OdcmMethod)c).Class.Name.ToUpperFirstChar() + c.Name.Substring(c.Name.IndexOf(".") + 1).ToUpperFirstChar();
         } else if (c is OdcmProperty && c.AsOdcmProperty().IsCollection) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
-        } else if (c is OdcmProperty && c.AsOdcmProperty().Type is OdcmPrimitiveType) {
-            return ClassTypeName(c) + c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
+        } else if (c is OdcmProperty && c.AsOdcmProperty().Projection.Type is OdcmPrimitiveType) {
+            return ClassTypeName(c) + c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         }
         return c.Name.ToUpperFirstChar();
     }
@@ -394,7 +394,7 @@
         if (c is OdcmMethod) {
             return c.AsOdcmMethod().Class.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty && c.AsOdcmProperty().Class is OdcmServiceClass) {
-            return c.AsOdcmProperty().Type.Name.ToUpperFirstChar();
+            return c.AsOdcmProperty().Projection.Type.Name.ToUpperFirstChar();
         } else if (c is OdcmProperty) {
             return c.AsOdcmProperty().Class.Name.ToUpperFirstChar();
         }
@@ -584,7 +584,7 @@ public {1} {2}{3}{4} {{";
 
 ";
 
-        foreach (var property in properties.Where(p => !p.Type.Name.Equals("Stream")))
+        foreach (var property in properties.Where(p => !p.Projection.Type.Name.Equals("Stream")))
         {
             var propertyName = property.Name.ToUpperFirstChar();
             var propertyType = "";
diff --git a/Templates/Android/generated/BaseClient.java.tt b/Templates/Android/generated/BaseClient.java.tt
@@ -65,7 +65,7 @@ foreach (var prop in model.EntityContainer.Properties)
     /**
      * Gets <#=TypeRequestBuilder(c)#>.
      *
-     * @return the <#=prop.Type.GetTypeString()#>.
+     * @return the <#=prop.Projection.Type.GetTypeString()#>.
      */
     public <#=ITypeRequestBuilder(prop)#> get<#=propertyName#>() {
         return new <#=TypeRequestBuilder(prop)#>(getServiceRoot() + "/<#=prop.Name#>", (<#=IClientType(c)#>)this, null);
diff --git a/Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt b/Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt
@@ -89,7 +89,7 @@ if (c.AsOdcmClass() != null)
 #>
 
 <#
-    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))
+    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))
     {
         var propName = prop.Name.ToCheckedCase();
 #>
diff --git a/Templates/Android/generated/IBaseClient.java.tt b/Templates/Android/generated/IBaseClient.java.tt
@@ -38,7 +38,7 @@ foreach (var prop in model.EntityContainer.Properties)
     /**
      * Gets <#=TypeRequestBuilder(c)#>.
      *
-     * @return the <#=prop.Type.GetTypeString()#>.
+     * @return the <#=prop.Projection.Type.GetTypeString()#>.
      */
     <#=ITypeRequestBuilder(prop)#> get<#=propertyName#>();
 <#
diff --git a/Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt b/Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt
@@ -65,7 +65,7 @@ if (c.AsOdcmClass() != null)
 #>
 
 <#
-    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))
+    foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))
     {
         var propName = prop.Name.ToCheckedCase();
 #>
diff --git a/Templates/CSharp/Base/CollectionRequest.Base.template.tt b/Templates/CSharp/Base/CollectionRequest.Base.template.tt
@@ -70,7 +70,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =
 {
     if (!odcmProperty.LongDescriptionContains("readonly"))
     {
-        var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
+        var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
         var propertyType = this.GetPropertyTypeName(odcmProperty);
         
         var templateWriterHost = (CustomT4Host)Host;
@@ -106,7 +106,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("            this.Method = \"POST\";");
         
-        var entity = odcmProperty.Type.AsOdcmClass();
+        var entity = odcmProperty.Projection.Type.AsOdcmClass();
 
         if (entity != null && entity.IsAbstract)
         {
@@ -128,7 +128,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =
 
 public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)
 {
-    var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
+    var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
     var propertyType = this.GetPropertyTypeName(odcmProperty);
         
     var templateWriterHost = (CustomT4Host)Host;
diff --git a/Templates/CSharp/Base/ICollectionRequest.Base.template.tt b/Templates/CSharp/Base/ICollectionRequest.Base.template.tt
@@ -48,7 +48,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty)
 {
     if (!odcmProperty.LongDescriptionContains("readonly"))
     {
-        var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
+        var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
         var propertyType = this.GetPropertyTypeName(odcmProperty);
         
         var templateWriterHost = (CustomT4Host)Host;
@@ -82,7 +82,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty)
 
 public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)
 {
-    var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
+    var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);
     var propertyType = this.GetPropertyTypeName(odcmProperty);
     
     var templateWriterHost = (CustomT4Host)Host;
diff --git a/Templates/CSharp/Base/SharedCSharp.template.tt b/Templates/CSharp/Base/SharedCSharp.template.tt
@@ -176,7 +176,7 @@ public string GetPropertyWithReferencesName(OdcmProperty odcmProperty)
 
 public string GetPropertyTypeName(OdcmProperty odcmProperty)
 {
-    return odcmProperty.Type.Name.ToCheckedCase();
+    return odcmProperty.Projection.Type.Name.ToCheckedCase();
 }
 
 public string GetPropertyReferenceTypeName(OdcmProperty odcmProperty)
diff --git a/Templates/CSharp/Requests/EntityClient.cs.tt b/Templates/CSharp/Requests/EntityClient.cs.tt
@@ -65,7 +65,7 @@ namespace <#=entityContainer.Namespace.GetNamespaceName()#>
         }
         else
         {
-            var requestBuilder = prop.Type.Name.ToCheckedCase() + "RequestBuilder";
+            var requestBuilder = prop.Projection.Type.Name.ToCheckedCase() + "RequestBuilder";
     #>
 
         /// <summary>
diff --git a/Templates/CSharp/Requests/EntityCollectionPage.cs.tt b/Templates/CSharp/Requests/EntityCollectionPage.cs.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty(); 
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity is OdcmPrimitiveType ? innerEntity.GetTypeString() : innerEntity.Name.ToCheckedCase();
 var entityCollectionRequest = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionRequest");
 var entityCollectionPage = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionPage");
diff --git a/Templates/CSharp/Requests/EntityCollectionRequest.cs.tt b/Templates/CSharp/Requests/EntityCollectionRequest.cs.tt
@@ -3,7 +3,7 @@
 <#@ include file="CollectionRequest.Base.template.tt"#>
 <#
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity.Name.ToCheckedCase();
 var collectionRequest = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionRequest");
 var collectionResponse = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionResponse");
diff --git a/Templates/CSharp/Requests/EntityCollectionWithReferencesPage.cs.tt b/Templates/CSharp/Requests/EntityCollectionWithReferencesPage.cs.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty(); 
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity is OdcmPrimitiveType ? innerEntity.GetTypeString() : innerEntity.Name.ToCheckedCase();
 var entityCollectionRequest = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionWithReferencesRequest");
 var entityCollectionPage = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionWithReferencesPage");
diff --git a/Templates/CSharp/Requests/EntityCollectionWithReferencesRequest.cs.tt b/Templates/CSharp/Requests/EntityCollectionWithReferencesRequest.cs.tt
@@ -3,7 +3,7 @@
 <#@ include file="CollectionRequest.Base.template.tt"#>
 <#
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity.Name.ToCheckedCase();
 var collectionRequest = this.GetPropertyCollectionWithReferencesRequestName(prop);
 
diff --git a/Templates/CSharp/Requests/IEntityClient.cs.tt b/Templates/CSharp/Requests/IEntityClient.cs.tt
@@ -34,7 +34,7 @@ namespace <#=entityContainer.Namespace.GetNamespaceName()#>
         else
         {
         
-        var propType = prop.Type.Name.ToCheckedCase();
+        var propType = prop.Projection.Type.Name.ToCheckedCase();
     #>
 
         /// <summary>
diff --git a/Templates/CSharp/Requests/IEntityCollectionPage.cs.tt b/Templates/CSharp/Requests/IEntityCollectionPage.cs.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty(); 
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity is OdcmPrimitiveType ? innerEntity.GetTypeString() : innerEntity.Name.ToCheckedCase();
 var entityCollectionRequest = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionRequest");
 var entityCollectionPage = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionPage");
diff --git a/Templates/CSharp/Requests/IEntityCollectionRequest.cs.tt b/Templates/CSharp/Requests/IEntityCollectionRequest.cs.tt
@@ -3,7 +3,7 @@
 <#@ include file="ICollectionRequest.Base.template.tt"#>
 <#
 var prop = host.CurrentType.AsOdcmProperty();
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity.Name.ToCheckedCase();
 var collectionRequest = this.GetPropertyCollectionRequestName(prop);
 var collectionResponse = string.Concat(prop.Class.Name.ToCheckedCase(), prop.Name.ToCheckedCase(), "CollectionResponse");
diff --git a/Templates/CSharp/Requests/IEntityCollectionWithReferencesPage.cs.tt b/Templates/CSharp/Requests/IEntityCollectionWithReferencesPage.cs.tt
@@ -4,7 +4,7 @@
 <#
 
 var prop = host.CurrentType.AsOdcmProperty(); 
-var innerEntity = prop.Type;
+var innerEntity = prop.Projection.Type;
 var innerEntityType = innerEntity.Name.ToCheckedCase();
 var entityCollectionRequest = this.GetPropertyCollectionWithReferencesRequestName(prop);
 var entityCollectionPage = string.Concat(this.GetEntityNameString(prop.Class), prop.Name.ToCheckedCase(), "CollectionWithReferencesPage");
diff --git a/Templates/CSharp/Requests/MethodCollectionResponse.cs.tt b/Templates/CSharp/Requests/MethodCollectionResponse.cs.tt
@@ -38,7 +38,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>
                 if (!property.LongDescriptionContains("ignorableCollection"))
                 {
                     var propertyName = property.Name.Substring(property.Name.IndexOf('.') + 1).ToCheckedCase();
-                    var propertyType = property.Type.GetTypeString();
+                    var propertyType = property.Projection.Type.GetTypeString();
         #>
 
         /// <summary>
diff --git a/Templates/JavaScript/src/entity_types.coffee.tt b/Templates/JavaScript/src/entity_types.coffee.tt
@@ -89,7 +89,8 @@ entityTypesData =
 <#
       foreach(var navProp in navProperties)
       {
-        var navPropType = navProp.IsCollection ? "Collection(" + navProp.Type.FullName + ")" : navProp.Type.FullName;
+        var fullName = navProp.Projection.Type.FullName;
+        var navPropType = navProp.IsCollection ? "Collection(" + fullName + ")" : fullName;
 #>
       <#= navProp.Name #>:
         type: '<#= navPropType #>'

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ foreach (var prop in model.EntityContainer.Properties)`
`65`	`65`	`/**`
`66`	`66`	`* Gets <#=TypeRequestBuilder(c)#>.`
`67`	`67`	`*`
`68`		`- * @return the <#=prop.Type.GetTypeString()#>.`
	`68`	`+ * @return the <#=prop.Projection.Type.GetTypeString()#>.`
`69`	`69`	`*/`
`70`	`70`	`public <#=ITypeRequestBuilder(prop)#> get<#=propertyName#>() {`
`71`	`71`	`return new <#=TypeRequestBuilder(prop)#>(getServiceRoot() + "/<#=prop.Name#>", (<#=IClientType(c)#>)this, null);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ if (c.AsOdcmClass() != null)`
`89`	`89`	`#>`
`90`	`90`
`91`	`91`	`<#`
`92`		`- foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))`
	`92`	`+ foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))`
`93`	`93`	`{`
`94`	`94`	`var propName = prop.Name.ToCheckedCase();`
`95`	`95`	`#>`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ foreach (var prop in model.EntityContainer.Properties)`
`38`	`38`	`/**`
`39`	`39`	`* Gets <#=TypeRequestBuilder(c)#>.`
`40`	`40`	`*`
`41`		`- * @return the <#=prop.Type.GetTypeString()#>.`
	`41`	`+ * @return the <#=prop.Projection.Type.GetTypeString()#>.`
`42`	`42`	`*/`
`43`	`43`	`<#=ITypeRequestBuilder(prop)#> get<#=propertyName#>();`
`44`	`44`	`<#`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ if (c.AsOdcmClass() != null)`
`65`	`65`	`#>`
`66`	`66`
`67`	`67`	`<#`
`68`		`- foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Type is OdcmMediaClass))`
	`68`	`+ foreach (var prop in c.AsOdcmClass().Properties.Where(x => x.Projection.Type is OdcmMediaClass))`
`69`	`69`	`{`
`70`	`70`	`var propName = prop.Name.ToCheckedCase();`
`71`	`71`	`#>`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =`
`70`	`70`	`{`
`71`	`71`	`if (!odcmProperty.LongDescriptionContains("readonly"))`
`72`	`72`	`{`
`73`		`- var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
	`73`	`+ var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
`74`	`74`	`var propertyType = this.GetPropertyTypeName(odcmProperty);`
`75`	`75`
`76`	`76`	`var templateWriterHost = (CustomT4Host)Host;`
`@@ -106,7 +106,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =`
`106`	`106`	`stringBuilder.Append(Environment.NewLine);`
`107`	`107`	`stringBuilder.Append(" this.Method = \"POST\";");`
`108`	`108`
`109`		`- var entity = odcmProperty.Type.AsOdcmClass();`
	`109`	`+ var entity = odcmProperty.Projection.Type.AsOdcmClass();`
`110`	`110`
`111`	`111`	`if (entity != null && entity.IsAbstract)`
`112`	`112`	`{`
`@@ -128,7 +128,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty, string requestBody =`
`128`	`128`
`129`	`129`	`public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)`
`130`	`130`	`{`
`131`		`- var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
	`131`	`+ var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
`132`	`132`	`var propertyType = this.GetPropertyTypeName(odcmProperty);`
`133`	`133`
`134`	`134`	`var templateWriterHost = (CustomT4Host)Host;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty)`
`48`	`48`	`{`
`49`	`49`	`if (!odcmProperty.LongDescriptionContains("readonly"))`
`50`	`50`	`{`
`51`		`- var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
	`51`	`+ var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
`52`	`52`	`var propertyType = this.GetPropertyTypeName(odcmProperty);`
`53`	`53`
`54`	`54`	`var templateWriterHost = (CustomT4Host)Host;`
`@@ -82,7 +82,7 @@ public string GetPostAsyncMethod(OdcmProperty odcmProperty)`
`82`	`82`
`83`	`83`	`public string GetPostAsyncMethodForReferencesRequest(OdcmProperty odcmProperty)`
`84`	`84`	`{`
`85`		`- var sanitizedPropertyName = odcmProperty.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
	`85`	`+ var sanitizedPropertyName = odcmProperty.Projection.Type.Name.GetSanitizedPropertyName(odcmProperty.Name);`
`86`	`86`	`var propertyType = this.GetPropertyTypeName(odcmProperty);`
`87`	`87`
`88`	`88`	`var templateWriterHost = (CustomT4Host)Host;`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public string GetPropertyWithReferencesName(OdcmProperty odcmProperty)`
`176`	`176`
`177`	`177`	`public string GetPropertyTypeName(OdcmProperty odcmProperty)`
`178`	`178`	`{`
`179`		`- return odcmProperty.Type.Name.ToCheckedCase();`
	`179`	`+ return odcmProperty.Projection.Type.Name.ToCheckedCase();`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public string GetPropertyReferenceTypeName(OdcmProperty odcmProperty)`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ namespace <#=entityContainer.Namespace.GetNamespaceName()#>`
`65`	`65`	`}`
`66`	`66`	`else`
`67`	`67`	`{`
`68`		`- var requestBuilder = prop.Type.Name.ToCheckedCase() + "RequestBuilder";`
	`68`	`+ var requestBuilder = prop.Projection.Type.Name.ToCheckedCase() + "RequestBuilder";`
`69`	`69`	`#>`
`70`	`70`
`71`	`71`	`/// <summary>`