refactor(api): Handles null and empty list for setBounds(List).

Closes #593
INRIA · Apr 19, 2016 · c23a63e · c23a63e
1 parent 5c33091
commit c23a63e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/src/main/java/spoon/reflect/reference/CtTypeParameterReference.java b/src/main/java/spoon/reflect/reference/CtTypeParameterReference.java
@@ -37,6 +37,8 @@ public interface CtTypeParameterReference extends CtTypeReference<Object> {
 
  /**
  * Sets the bounds (aka generics) of the referenced parameter.
+ *
+ * If you give null or an empty list, it'll clear bounds of the reference.
  */
  @Deprecated
  <T extends CtTypeParameterReference> T setBounds(List<CtTypeReference<?>> bounds);

diff --git a/src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java b/src/main/java/spoon/support/reflect/reference/CtTypeParameterReferenceImpl.java
@@ -65,7 +65,8 @@ public boolean isUpper() {
 
  @Override
  public <T extends CtTypeParameterReference> T setBounds(List<CtTypeReference<?>> bounds) {
- if (bounds == null) {
+ if (bounds == null || bounds.isEmpty()) {
+ setBoundingType(null);
  return (T) this;
  }
  if (getBoundingType() instanceof CtIntersectionTypeReference<?>) {

diff --git a/src/test/java/spoon/test/reference/TypeReferenceTest.java b/src/test/java/spoon/test/reference/TypeReferenceTest.java
@@ -26,6 +26,7 @@
 import spoon.test.reference.testclasses.EnumValue;
 import spoon.testing.utils.ModelUtils;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -37,6 +38,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static spoon.testing.utils.ModelUtils.canBeBuilt;
+import static spoon.testing.utils.ModelUtils.createFactory;
 
 /**
  * @author Lionel Seinturier
@@ -474,6 +476,27 @@ public void testShortTypeReference() throws Exception {
 
  }
 
+ @Test
+ public void testClearBoundsForTypeParameterReference() throws Exception {
+ final Factory factory = createFactory();
+ final CtTypeParameterReference reference = factory.Type().createTypeParameterReference("T");
+ reference.addBound(factory.Type().createReference(String.class));
+
+ assertEquals(1, reference.getBounds().size());
+
+ reference.setBounds(null);
+
+ assertEquals(0, reference.getBounds().size());
+
+ reference.addBound(factory.Type().createReference(String.class));
+
+ assertEquals(1, reference.getBounds().size());
+
+ reference.setBounds(new ArrayList<>());
+
+ assertEquals(0, reference.getBounds().size());
+ }
+
  class A {
  class Tacos<K> {
  }