- collapses slash and type for odata cast

baywet · baywet · commit abd0c852d9ed · 2020-09-30T13:23:36.000-04:00
diff --git a/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt
@@ -68,11 +68,11 @@ if (c.AsOdcmClass() != null)
         if (prop.IsCollection()) {
 #>
     public <#=prop.ITypeCollectionRequestBuilder()#> <#=sanitizedProperty#>() {
-        return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
+        return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
     }
 
     public <#=prop.ITypeRequestBuilder()#> <#=sanitizedProperty#>(final String id) {
-        return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
+        return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
     }
 <#
         } else {
diff --git a/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseEntityStreamRequestBuilder.java.tt
@@ -50,11 +50,11 @@ if (c.AsOdcmClass() != null)
         if (prop.IsCollection()) {
 #>
     public <#=prop.ITypeCollectionRequestBuilder()#> <#=prop.Name#>() {
-        return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
+        return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
     }
 
     public <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>(final String id) {
-        return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
+        return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
     }
 <#
         } else {
diff --git a/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt b/Templates/Java/requests_extensions/BaseMethodRequestBuilder.java.tt
@@ -83,11 +83,11 @@ if(m != null && m.IsComposable && m.ReturnType != null && m.ReturnType is OdcmCl
         if (prop.IsCollection()) {
 #>
     public <#=prop.ITypeCollectionRequestBuilder()#> <#=sanitizedProperty#>() {
-        return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
+        return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
     }
 
     public <#=prop.ITypeRequestBuilder()#> <#=sanitizedProperty#>(final String id) {
-        return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
+        return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);
     }
 <#
         } else {

Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,11 @@ if (c.AsOdcmClass() != null)`
`68`	`68`	`if (prop.IsCollection()) {`
`69`	`69`	`#>`
`70`	`70`	`public <#=prop.ITypeCollectionRequestBuilder()#> <#=sanitizedProperty#>() {`
`71`		`- return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
	`71`	`+ return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public <#=prop.ITypeRequestBuilder()#> <#=sanitizedProperty#>(final String id) {`
`75`		`- return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
	`75`	`+ return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
`76`	`76`	`}`
`77`	`77`	`<#`
`78`	`78`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,11 @@ if (c.AsOdcmClass() != null)`
`50`	`50`	`if (prop.IsCollection()) {`
`51`	`51`	`#>`
`52`	`52`	`public <#=prop.ITypeCollectionRequestBuilder()#> <#=prop.Name#>() {`
`53`		`- return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
	`53`	`+ return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public <#=prop.ITypeRequestBuilder()#> <#=prop.Name#>(final String id) {`
`57`		`- return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
	`57`	`+ return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
`58`	`58`	`}`
`59`	`59`	`<#`
`60`	`60`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,11 @@ if(m != null && m.IsComposable && m.ReturnType != null && m.ReturnType is OdcmCl`
`83`	`83`	`if (prop.IsCollection()) {`
`84`	`84`	`#>`
`85`	`85`	`public <#=prop.ITypeCollectionRequestBuilder()#> <#=sanitizedProperty#>() {`
`86`		`- return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
	`86`	`+ return new <#=prop.TypeCollectionRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>")<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public <#=prop.ITypeRequestBuilder()#> <#=sanitizedProperty#>(final String id) {`
`90`		`- return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/" + "<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
	`90`	`+ return new <#=prop.TypeRequestBuilder()#>(getRequestUrlWithAdditionalSegment("<#=prop.ParentPropertyType == null ? prop.Name : prop.ParentPropertyType.Name #>") + "/" + id<# if(prop.ParentPropertyType != null) { #> + "/<#=prop.Projection.Type.FullName#>"<# } #>, getClient(), null);`
`91`	`91`	`}`
`92`	`92`	`<#`
`93`	`93`	`} else {`