refactor(ast): Improves generic parameter type of setActualTypeRefere…

…nces. (Closes INRIA#823)
sjd78 · Nov 3, 2016 · e4e090c · e4e090c
1 parent 852d3ad
commit e4e090c
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 9 deletions.
diff --git a/src/main/java/spoon/reflect/code/CtConstructorCall.java b/src/main/java/spoon/reflect/code/CtConstructorCall.java
@@ -43,7 +43,7 @@ public interface CtConstructorCall<T> extends CtTargetedExpression<T, CtExpressi
  * @see CtExecutableReference#getActualTypeArguments()
  */
  @Override
- <T extends CtActualTypeContainer> T setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments);
+ <T extends CtActualTypeContainer> T setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments);
 
  /**
  * Delegate to the executable reference of the constructor call.

diff --git a/src/main/java/spoon/reflect/code/CtInvocation.java b/src/main/java/spoon/reflect/code/CtInvocation.java
@@ -43,7 +43,7 @@ public interface CtInvocation<T> extends CtAbstractInvocation<T>, CtStatement, C
  * @see CtExecutableReference#getActualTypeArguments()
  */
  @Override
- <T extends CtActualTypeContainer> T setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments);
+ <T extends CtActualTypeContainer> T setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments);
 
  /**
  * Delegate to the executable reference of the invocation.

diff --git a/src/main/java/spoon/reflect/code/CtNewClass.java b/src/main/java/spoon/reflect/code/CtNewClass.java
@@ -44,7 +44,7 @@ public interface CtNewClass<T> extends CtConstructorCall<T> {
  * @see CtExecutableReference#getActualTypeArguments()
  */
  @Override
- <T extends CtActualTypeContainer> T setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments);
+ <T extends CtActualTypeContainer> T setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments);
 
  /**
  * Delegate to the executable reference of the new class.

diff --git a/src/main/java/spoon/reflect/reference/CtActualTypeContainer.java b/src/main/java/spoon/reflect/reference/CtActualTypeContainer.java
@@ -33,7 +33,7 @@ public interface CtActualTypeContainer {
  /**
  * Sets the type arguments.
  */
- <T extends CtActualTypeContainer> T setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments);
+ <T extends CtActualTypeContainer> T setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments);
 
  /**
  * Adds a type argument.

diff --git a/src/main/java/spoon/support/reflect/code/CtConstructorCallImpl.java b/src/main/java/spoon/support/reflect/code/CtConstructorCallImpl.java
@@ -146,7 +146,7 @@ public List<CtTypeReference<?>> getActualTypeArguments() {
  }
 
  @Override
- public <T extends CtActualTypeContainer> T setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments) {
+ public <T extends CtActualTypeContainer> T setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments) {
  if (getExecutable() != null) {
  getExecutable().setActualTypeArguments(actualTypeArguments);
  }

diff --git a/src/main/java/spoon/support/reflect/code/CtInvocationImpl.java b/src/main/java/spoon/support/reflect/code/CtInvocationImpl.java
@@ -162,7 +162,7 @@ public List<CtTypeReference<?>> getActualTypeArguments() {
  }
 
  @Override
- public <T extends CtActualTypeContainer> T setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments) {
+ public <T extends CtActualTypeContainer> T setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments) {
  if (getExecutable() != null) {
  getExecutable().setActualTypeArguments(actualTypeArguments);
  }

diff --git a/src/main/java/spoon/support/reflect/reference/CtExecutableReferenceImpl.java b/src/main/java/spoon/support/reflect/reference/CtExecutableReferenceImpl.java
@@ -244,7 +244,7 @@ public boolean isOverriding(CtExecutableReference<?> executable) {
  }
 
  @Override
- public <C extends CtActualTypeContainer> C setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments) {
+ public <C extends CtActualTypeContainer> C setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments) {
  if (actualTypeArguments == null || actualTypeArguments.isEmpty()) {
  this.actualTypeArguments = CtElementImpl.emptyList();
  return (C) this;

diff --git a/src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java b/src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java
@@ -109,7 +109,7 @@ public Class<Object> getActualClass() {
  }
 
  @Override
- public <C extends CtActualTypeContainer> C setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments) {
+ public <C extends CtActualTypeContainer> C setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments) {
  throw new UnsupportedOperationException("Type parameter can't have an actual type argument");
  }
 

diff --git a/src/main/java/spoon/support/reflect/reference/CtTypeReferenceImpl.java b/src/main/java/spoon/support/reflect/reference/CtTypeReferenceImpl.java
@@ -270,7 +270,7 @@ public boolean isSubtypeOf(CtTypeReference<?> type) {
  }
 
  @Override
- public <C extends CtActualTypeContainer> C setActualTypeArguments(List<CtTypeReference<?>> actualTypeArguments) {
+ public <C extends CtActualTypeContainer> C setActualTypeArguments(List<? extends CtTypeReference<?>> actualTypeArguments) {
  if (actualTypeArguments == null || actualTypeArguments.isEmpty()) {
  this.actualTypeArguments = CtElementImpl.emptyList();
  return (C) this;

diff --git a/src/test/java/spoon/test/reference/TypeReferenceTest.java b/src/test/java/spoon/test/reference/TypeReferenceTest.java
@@ -535,4 +535,15 @@ public void testCorrectEnumParent() {
  CtTypeReference correctParent = launcher.getFactory().Type().createReference(java.lang.Enum.class);
  assertEquals(correctParent, e.getReference().getSuperclass());
  }
+
+ @Test
+ public void testImproveAPIActualTypeReference() throws Exception {
+ final Factory factory = createFactory();
+ List<CtTypeParameterReference> typeParameterReferences = new ArrayList<>();
+ typeParameterReferences.add(factory.Type().createTypeParameterReference("Foo"));
+ final CtTypeReference<Object> typeReference = factory.Core().createTypeReference();
+ typeReference.setActualTypeArguments(typeParameterReferences);
+
+ assertEquals(1, typeReference.getActualTypeArguments().size());
+ }
 }