ROASTER-34: Created removeParameter methods by type and name

forge · Sep 11, 2014 · 1bfdf1a · 1bfdf1a
1 parent 2714f84
commit 1bfdf1a
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 1 deletion.
diff --git a/api/src/main/java/org/jboss/forge/roaster/model/source/MethodSource.java b/api/src/main/java/org/jboss/forge/roaster/model/source/MethodSource.java
@@ -104,4 +104,21 @@ public interface MethodSource<O extends JavaSource<O>> extends Method<O, MethodS
     * Remove a parameter from this method
     */
    MethodSource<O> removeParameter(ParameterSource<O> parameter);
+
+   /**
+    * Remove a parameter with the specified {@link Class} type and name from this method
+    */
+   MethodSource<O> removeParameter(Class<?> type, String name);
+
+   /**
+    * Remove a parameter with the specified type and name from this method
+    */
+   MethodSource<O> removeParameter(String type, String name);
+
+   /**
+    * Remove a parameter with the specified {@link JavaType} type and name to this method
+    */
+   MethodSource<O> removeParameter(JavaType<?> type, String name);
+
+
 }
diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/impl/MethodImpl.java b/impl/src/main/java/org/jboss/forge/roaster/model/impl/MethodImpl.java
@@ -672,7 +672,8 @@ public ParameterSource<O> addParameter(String type, String name)
       {
          getOrigin().addImport(type);
       }
-      String stub = "public class Stub { public void method( " + Types.toSimpleName(Types.stripGenerics(type)) + " " + name + " ) {} }";
+      String stub = "public class Stub { public void method( " + Types.toSimpleName(Types.stripGenerics(type)) + " "
+               + name + " ) {} }";
       JavaClassSource temp = (JavaClassSource) Roaster.parse(stub);
       List<MethodSource<JavaClassSource>> methods = temp.getMethods();
       List<VariableDeclaration> astParameters = ((MethodDeclaration) methods.get(0).getInternal()).parameters();
@@ -693,4 +694,62 @@ public MethodSource<O> removeParameter(ParameterSource<O> parameter)
       method.parameters().remove(parameter.getInternal());
       return this;
    }
+
+   @Override
+   public MethodSource<O> removeParameter(Class<?> type, String name)
+   {
+      ParameterSource<O> parameter = null;
+      for (ParameterSource<O> param : getParameters())
+      {
+         if (param.getType().isType(type) && param.getName().equals(name))
+         {
+            parameter = param;
+            break;
+         }
+      }
+      if (parameter != null)
+      {
+         removeParameter(parameter);
+      }
+      return this;
+   }
+
+   @Override
+   public MethodSource<O> removeParameter(JavaType<?> type, String name)
+   {
+      ParameterSource<O> parameter = null;
+      for (ParameterSource<O> param : getParameters())
+      {
+         if (param.getType().isType(type.getCanonicalName()) && param.getName().equals(name))
+         {
+            parameter = param;
+            break;
+         }
+      }
+      if (parameter != null)
+      {
+         removeParameter(parameter);
+      }
+      return this;
+   }
+
+   @Override
+   public MethodSource<O> removeParameter(String type, String name)
+   {
+      ParameterSource<O> parameter = null;
+      for (ParameterSource<O> param : getParameters())
+      {
+         if (param.getType().isType(type) && param.getName().equals(name))
+         {
+            parameter = param;
+            break;
+         }
+      }
+      if (parameter != null)
+      {
+         removeParameter(parameter);
+      }
+      return this;
+   }
+
 }
diff --git a/impl/src/test/java/org/jboss/forge/test/roaster/model/JavaClassMethodTest.java b/impl/src/test/java/org/jboss/forge/test/roaster/model/JavaClassMethodTest.java
@@ -161,4 +161,26 @@ public void testRemoveParameter() throws Exception
       assertEquals(1, method.getParameters().size());
    }
 
+   @Test
+   public void testRemoveParameterByClassType() throws Exception
+   {
+      method.removeParameter(String.class, "pattern");
+      assertEquals(1, method.getParameters().size());
+   }
+
+   @Test
+   public void testRemoveParameterByStringType() throws Exception
+   {
+      method.removeParameter("String", "pattern");
+      assertEquals(1, method.getParameters().size());
+   }
+
+   @Test
+   public void testRemoveParameterByJavaType() throws Exception
+   {
+      JavaClassSource type = Roaster.create(JavaClassSource.class).setName("String").setPackage("java.lang");
+      method.removeParameter(type, "pattern");
+      assertEquals(1, method.getParameters().size());
+   }
+
 }