Simplified `AbstractJavaSourceMemberHolder#addInterface(java.lang.Str…

…ing)` (forge#261)
chncaption · Oct 18, 2022 · b3d8ef0 · b3d8ef0
1 parent a00cf44
commit b3d8ef0
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 20 deletions.
diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/impl/AbstractJavaSourceMemberHolder.java b/impl/src/main/java/org/jboss/forge/roaster/model/impl/AbstractJavaSourceMemberHolder.java
@@ -17,11 17,13 @@
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
 import org.eclipse.jdt.core.dom.BodyDeclaration;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.FieldDeclaration;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.SimpleType;
 import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jface.text.Document;
@@ -30,7 32,6 @@
 import org.jboss.forge.roaster.model.JavaInterface;
 import org.jboss.forge.roaster.model.JavaType;
 import org.jboss.forge.roaster.model.Method;
-import org.jboss.forge.roaster.model.Parameter;
 import org.jboss.forge.roaster.model.Property;
 import org.jboss.forge.roaster.model.ast.MethodFinderVisitor;
 import org.jboss.forge.roaster.model.source.FieldSource;
@@ -309,29 310,21 @@ public List<String> getInterfaces()
  @Override
  public O addInterface(final String type)
  {
- if (!this.hasInterface(type))
  if (!hasInterface(type))
  {
- final String simpleName = Types.toSimpleName(type);
-
- Type interfaceType = JDTHelper.getInterfaces(
- Roaster.parse(JavaInterfaceImpl.class,
- "public interface Mock extends " simpleName " {}")
- .getDeclaration())
- .get(0);
-
- if (this.hasInterface(simpleName) || this.hasImport(simpleName))
  String typeName;
  if (addImport(type) != null)
  {
- interfaceType = JDTHelper.getInterfaces(Roaster.parse(JavaInterfaceImpl.class,
- "public interface Mock extends " type " {}").getDeclaration()).get(0);
  typeName = Types.toSimpleName(type);
  }
-
- if (!this.hasImport(simpleName))
  else
  {
- this.addImport(type);
  typeName = type;
  }
-
- ASTNode node = ASTNode.copySubtree(unit.getAST(), interfaceType);
- JDTHelper.getInterfaces(getDeclaration()).add((Type) node);
  AbstractTypeDeclaration declaration = getDeclaration();
  AST ast = getDeclaration().getAST();
  SimpleType simpleType = ast.newSimpleType(ast.newName(typeName));
  JDTHelper.getInterfaces(declaration).add(simpleType);
  }
  return (O) this;
  }

diff --git a/tests/src/test/java/org/jboss/forge/test/roaster/model/JavaInterfaceTest.java b/tests/src/test/java/org/jboss/forge/test/roaster/model/JavaInterfaceTest.java
@@ -139,4 139,37 @@ public void testImportInterfaceFromSamePackage()
  assertThat(javaImplementation.getInterfaces()).contains("com.foo.forge.MyInterface");
  }
 
  @Test
  public void testExtendDifferentPackage() {
  JavaInterfaceSource outer = Roaster.create(JavaInterfaceSource.class)
  .setPackage("outer")
  .setName("Buggy")
  .setPublic();
 
  JavaInterfaceSource inner = Roaster.create(JavaInterfaceSource.class)
  .setPackage("outer.inner")
  .setName("Buggy")
  .setPublic();
 
  inner.addInterface(outer);
  assertThat(inner.toString()).contains("public interface Buggy extends outer.Buggy");
  }
 
  @Test
  public void testExtendIfImportAlreadyExists() {
 
  JavaInterfaceSource foo = Roaster.create(JavaInterfaceSource.class)
  .setPackage("org.pkg")
  .setName("Foo")
  .setPublic();
 
  JavaInterfaceSource bar = Roaster.create(JavaInterfaceSource.class)
  .setPackage("org.pkg")
  .setName("Bar")
  .setPublic();
 
  foo.addImport(bar);
  foo.addInterface(bar);
  assertThat(foo.toString()).contains("public interface Foo extends Bar");
  }
 }