Append implicit EntitySet for Java templates

Author: Caitlin Bales (MSFT)

Templates/Java/requests_generated/BaseEntityCollectionReferenceRequest.java.tt

@@ -24,18 +24,24 @@
 <#
 		var navigationProperty = c.AsOdcmProperty().GetServiceCollectionNavigationPropertyForPropertyType();
 		if (navigationProperty != null) {
+
+			//Append the singleton's navigation type to the @odata.id if relevant
+			var implicitNavigationProperty = string.Empty;
+			if (navigationProperty.GetType() == typeof(OdcmSingleton)) 
+				implicitNavigationProperty = c.AsOdcmProperty().Name + "/";
+
             String prop = c.AsOdcmProperty().GetServiceCollectionNavigationPropertyForPropertyType().Name;
 #>
         final String requestUrl = getBaseRequest().getRequestUrl().toString();
-        final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/" + new<#=TypeName(c)#>.id);
+        final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=TypeName(c)#>.id);
         new <#=TypeWithReferencesRequestBuilder(c)#>(requestUrl, getBaseRequest().getClient(), /* Options */ null)
             .buildRequest(getBaseRequest().getOptions())
             .post(new<#=TypeName(c)#>, body, callback);
     }
 
     public <#=TypeName(c)#> post(final <#=TypeName(c)#> new<#=TypeName(c)#>) throws ClientException {
         final String requestUrl = getBaseRequest().getRequestUrl().toString();
-        final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/" + new<#=TypeName(c)#>.id);
+        final ReferenceRequestBody body = new ReferenceRequestBody(getBaseRequest().getClient().getServiceRoot() + "/<#=prop#>/<#=implicitNavigationProperty#>" + new<#=TypeName(c)#>.id);
         return new <#=TypeWithReferencesRequestBuilder(c)#>(requestUrl,getBaseRequest().getClient(), /* Options */ null)
                 .buildRequest(getBaseRequest().getOptions())
                 .post(new<#=TypeName(c)#>, body);