Skip to content

ROASTER-91 : implementInterface doesn't work for JavaInterfaceSource #52

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

Closed
nchal wants to merge 1 commit into from
Closed

ROASTER-91 : implementInterface doesn't work for JavaInterfaceSource #52

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
27 changes: 16 additions & 11 deletions impl/src/main/java/org/jboss/forge/roaster/model/impl/MethodImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.jboss.forge.roaster.model.source.Import;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.JavaDocSource;
import org.jboss.forge.roaster.model.source.JavaInterfaceSource;
import org.jboss.forge.roaster.model.source.JavaSource;
import org.jboss.forge.roaster.model.source.MethodSource;
import org.jboss.forge.roaster.model.source.ParameterSource;
Expand Down Expand Up @@ -340,24 +341,28 @@ public MethodSource<O> setReturnType(final JavaType<?> type)
@Override
public boolean isAbstract()
{
return modifiers.hasModifier(method, ModifierKeyword.ABSTRACT_KEYWORD);
return (parent instanceof JavaInterfaceSource) ? true
: modifiers.hasModifier(method, ModifierKeyword.ABSTRACT_KEYWORD);
}

@Override
public MethodSource<O> setAbstract(final boolean abstrct)
{
if (abstrct)
if (!(parent instanceof JavaInterfaceSource))
{
modifiers.addModifier(method, ModifierKeyword.ABSTRACT_KEYWORD);
// Abstract methods do not specify a body
setBody((String) null);
}
else
{
modifiers.removeModifier(method, ModifierKeyword.ABSTRACT_KEYWORD);
if (getBody() == null)
if (abstrct)
{
setBody("");
modifiers.addModifier(method, ModifierKeyword.ABSTRACT_KEYWORD);
// Abstract methods do not specify a body
setBody((String) null);
}
else
{
modifiers.removeModifier(method, ModifierKeyword.ABSTRACT_KEYWORD);
if (getBody() == null)
{
setBody("");
}
}
}
return this;
Expand Down
8 changes: 5 additions & 3 deletions impl/src/test/java/org/jboss/forge/test/roaster/model/MethodImplementationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ public void testJavaClassImplementInterface() throws Exception
{
JavaClassSource source = Roaster.create(JavaClassSource.class);
JavaInterfaceSource interfaceSource = Roaster.create(JavaInterfaceSource.class).setName("Bar").setPackage("test");
interfaceSource.addMethod().setAbstract(true).setName("doSomething").setReturnTypeVoid();
interfaceSource.addMethod().setName("doSomething").setReturnTypeVoid();
source.implementInterface(interfaceSource);
Assert.assertThat(interfaceSource.getMethod("doSomething").isAbstract(), is(true));
Assert.assertThat(source.getMethods().size(), is(1));
Assert.assertNotNull(source.getMethod("doSomething"));
Assert.assertThat(source.getMethod("doSomething").isAbstract(), is(false));
Expand All @@ -60,8 +61,9 @@ public void testJavaEnumImplementInterface() throws Exception
{
JavaEnumSource source = Roaster.create(JavaEnumSource.class);
JavaInterfaceSource interfaceSource = Roaster.create(JavaInterfaceSource.class).setName("Bar").setPackage("test");
interfaceSource.addMethod().setAbstract(true).setName("doSomething").setReturnTypeVoid();
interfaceSource.addMethod().setName("doSomething").setReturnTypeVoid();
source.implementInterface(interfaceSource);
Assert.assertThat(interfaceSource.getMethod("doSomething").isAbstract(), is(true));
Assert.assertThat(source.getMethods().size(), is(1));
Assert.assertNotNull(source.getMethod("doSomething"));
Assert.assertThat(source.getMethod("doSomething").isAbstract(), is(false));
Expand Down Expand Up @@ -142,4 +144,4 @@ public void testJavaClassImplementInterfaceWithReflectedMethods() throws Excepti
Assert.assertThat(source.getMethod("lookup", int.class, int.class, boolean.class), notNullValue());
}

}
}