Fixes forge#223 - tries to resolve classes in current package before …

…looking into wildcard import , uses a new mechanism - ParsingContext , resolving java.lang according to actual order

impl/src/main/java/org/jboss/forge/roaster/model/impl/JavaSourceImpl.java

@@ -420,11 +420,7 @@ public String resolveType(final String type)
          return result;
       }
 
-      // java lang types are implicitly imported and we don't allow a duplicate simple name in another package
-      if (Types.isJavaLang(result))
-      {
-         return "java.lang." + result;
-      }
+
 
       List<Import> imports = getImports(); // fetch imports only once
 
@@ -447,6 +443,11 @@ public String resolveType(final String type)
             return className;
          }
       }
+      // java lang types are implicitly imported after package and explicit imports
+      if (Types.isJavaLang(result))
+      {
+         return "java.lang." + result;
+      }
 
       // if we have no imports and no fqn name the following doesn't need to be executed
       if (!imports.isEmpty())

tests/src/test/java/org/jboss/forge/test/roaster/model/ClassLoaderWildcardImportResolverTest.java

@@ -24,6 +24,7 @@ public class ClassLoaderWildcardImportResolverTest
 {
    private static JavaClassSource javaClass;
     private static JavaClassSource second;
+    private static JavaClassSource third;
 
 
     @BeforeAll
@@ -41,6 +42,11 @@ public static void reset() throws IOException
        {
            second = parsingContext.parse(JavaClassSource.class, stream);
        }
+       fileName = "/org/jboss/forge/grammar/java/Object.java";
+       try (InputStream stream = ClassLoaderWildcardImportResolverTest.class.getResourceAsStream(fileName))
+       {
+           third = parsingContext.parse(JavaClassSource.class, stream);
+       }
 
 
    }
@@ -50,6 +56,8 @@ public void testType()
    {
       Assertions.assertEquals(List.class.getCanonicalName(),javaClass.getMethod("getList").getReturnType().getQualifiedName());
       Assertions.assertEquals("org.jboss.forge.grammar.java.HttpRequest",javaClass.getMethod("getHttpRequest").getReturnType().getQualifiedName());
+       Assertions.assertEquals("org.jboss.forge.grammar.java.Object",javaClass.getMethod("getObject").getReturnType().getQualifiedName());
+
 
    }
 

tests/src/test/resources/org/jboss/forge/grammar/java/MockWildcardClass.java

@@ -11,4 +11,7 @@ public List<String> getList(){
     public HttpRequest getHttpRequest(){
         return new HttpRequest();
     }
+    public Object getObject(){
+        return new Object();
+    }
 }

tests/src/test/resources/org/jboss/forge/grammar/java/Object.java

@@ -0,0 +1,17 @@
+package org.jboss.forge.grammar.java;
+
+
+public class Object {
+
+    private String fakeField;
+
+
+    public String getFakeField() {
+        return fakeField;
+    }
+
+    public <T extends Object> T setFakeField(String fakeField) {
+        this.fakeField = fakeField;
+        return (T) this;
+    }
+}