Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplified AbstractJavaSourceMemberHolder#addInterface(java.lang.String) #261

Merged
merged 1 commit into from
Oct 18, 2022
Merged

Simplified AbstractJavaSourceMemberHolder#addInterface(java.lang.String) #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions impl/src/main/java/org/jboss/forge/roaster/model/impl/AbstractJavaSourceMemberHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
33 changes: 33 additions & 0 deletions tests/src/test/java/org/jboss/forge/test/roaster/model/JavaInterfaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}