- fixes an issue where naviagation properties would be missing

- fixes an issue where entities ending in request could wreck the code-gen process

Author: baywet

Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt

@@ -39,7 +39,7 @@ import java.util.EnumSet;
      * @return the <#=ITypeRequest(c)#> instance
      */
     public <#=ITypeRequest(c)#> buildRequest(final java.util.List<? extends Option> requestOptions) {
-        return new <#=TypeRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
+        return new <#=host.CurrentModel.NamespaceName()#>.<#=getPrefixForRequests(TypeRequest(c))#>.<#=TypeRequest(c)#>(getRequestUrl(), getClient(), requestOptions);
     }
 
 <#
@@ -59,7 +59,7 @@ import java.util.EnumSet;
 <#
 if (c.AsOdcmClass() != null)
 {
-    foreach(var prop in c.AsOdcmClass().NavigationProperties())
+    foreach(var prop in c.AsOdcmClass().NavigationProperties(true))
     {
         var propName = prop.Name.ToUpperFirstChar();
 		var sanitizedProperty = propName.SanitizePropertyName().ToLowerFirstChar();

Templates/Java/requests_extensions/IBaseEntityRequestBuilder.java.tt

@@ -46,7 +46,7 @@ import java.util.EnumSet;
 <#
 if (c.AsOdcmClass() != null)
 {
-    foreach(var prop in c.AsOdcmClass().NavigationProperties())
+    foreach(var prop in c.AsOdcmClass().NavigationProperties(true))
     {
         var propName = prop.Name.ToUpperFirstChar();
 		var sanitizedName = prop.Name.SanitizePropertyName();
@@ -140,7 +140,7 @@ if (c.AsOdcmClass() != null)
 		var c = host.CurrentType;
 		if (c.AsOdcmClass() != null)
 		{
-			foreach(var prop in c.AsOdcmClass().NavigationProperties())
+			foreach(var prop in c.AsOdcmClass().NavigationProperties(true))
 			{
 				if (prop.IsCollection()) {