ROASTER-52: Roaster should not import java.lang annotations

forge · Feb 12, 2015 · 3b1d43a · 3b1d43a
1 parent 71eb3b1
commit 3b1d43a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/ast/AnnotationAccessor.java b/impl/src/main/java/org/jboss/forge/roaster/model/ast/AnnotationAccessor.java
@@ -87,7 +87,7 @@ public AnnotationSource<O> addAnnotation(final AnnotationTargetSource<O, T> targ
    private AnnotationSource<O> addAnnotation(final AnnotationTargetSource<O, T> target, final List<?> modifiers,
             final String className)
    {
-      if (!target.getOrigin().hasImport(className) && Types.isQualified(className))
+      if (target.getOrigin().requiresImport(className) && !target.getOrigin().hasImport(className) && Types.isQualified(className))
       {
          target.getOrigin().addImport(className);
       }

diff --git a/impl/src/test/java/org/jboss/forge/test/roaster/model/common/AnnotationTest.java b/impl/src/test/java/org/jboss/forge/test/roaster/model/common/AnnotationTest.java
@@ -19,8 +19,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.jboss.forge.roaster.Roaster;
 import org.jboss.forge.roaster.model.source.AnnotationSource;
 import org.jboss.forge.roaster.model.source.AnnotationTargetSource;
+import org.jboss.forge.roaster.model.source.JavaClassSource;
 import org.jboss.forge.roaster.model.source.JavaSource;
 import org.junit.Assert;
 import org.junit.Before;
@@ -806,5 +808,14 @@ public void testAddAnnotationArrayElementClassNamed() throws Exception
       assertEquals(1, annotation.getAnnotationArrayValue("nested").length);
       assertEquals("MockAnnotation", annotation.getAnnotationArrayValue("nested")[0].getName());
    }
+
+   @Test
+   public void testAddAnnotationShouldNotImportIfJavaLang()
+   {
+      JavaClassSource source = Roaster.create(JavaClassSource.class);
+      source.addAnnotation(Override.class);
+      Assert.assertNull(source.getImport(Override.class));
+   }
+
 
 }