Merge pull request #237 from gastaldi/master

FORGE-275

shell-api/src/main/java/org/jboss/forge/resources/DeletionAware.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.jboss.forge.resources;
+
+import java.util.List;
+
+/**
+ * If a {@link Resource} is deleted, and the {@link Resource} object implements this interface, the methods of this
+ * interface will be called.
+ *
+ * @author <a href="mailto:ggastald@redhat.com">George Gastaldi</a>
+ *
+ */
+public interface DeletionAware
+{
+   /**
+    * Returns a {@link List} of {@link Resource} which do not need confirmation to delete
+    *
+    */
+   List<Resource<?>> getResources();
+
+   /**
+    * Returns a {@link List} of {@link Resource} as candidates for deletion
+    *
+    */
+   List<Resource<?>> getOptionalResources();
+}

shell-api/src/main/java/org/jboss/forge/resources/java/JavaFieldResource.java

@@ -7,19 +7,25 @@
 
 package org.jboss.forge.resources.java;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.jboss.forge.parser.java.Field;
 import org.jboss.forge.parser.java.FieldHolder;
+import org.jboss.forge.parser.java.JavaClass;
 import org.jboss.forge.parser.java.JavaSource;
+import org.jboss.forge.parser.java.Method;
+import org.jboss.forge.parser.java.util.Strings;
+import org.jboss.forge.resources.DeletionAware;
 import org.jboss.forge.resources.Resource;
 import org.jboss.forge.resources.ResourceFlag;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-public class JavaFieldResource extends JavaMemberResource<Field<? extends JavaSource<?>>>
+public class JavaFieldResource extends JavaMemberResource<Field<? extends JavaSource<?>>> implements
+         DeletionAware
 {
    private final Field<? extends JavaSource<?>> field;
 
@@ -83,4 +89,31 @@ public boolean delete(final boolean recursive) throws UnsupportedOperationExcept
    {
       return delete();
    }
+
+   @Override
+   public List<Resource<?>> getResources()
+   {
+      return null;
+   }
+
+   @Override
+   public List<Resource<?>> getOptionalResources()
+   {
+      List<Resource<?>> result = new ArrayList<Resource<?>>();
+      JavaClass entity = (JavaClass) field.getOrigin();
+      String methodNameSuffix = Strings.capitalize(field.getName());
+      // Condition to remove getField()
+      if (entity.hasMethodSignature("get" + methodNameSuffix))
+      {
+         Method<JavaClass> method = entity.getMethod("get" + methodNameSuffix);
+         result.add(new JavaMethodResource(this.getParent(), method));
+      }
+      // Condition to remove setField()
+      if (entity.hasMethodSignature("set" + methodNameSuffix, field.getQualifiedType()))
+      {
+         Method<JavaClass> method = entity.getMethod("set" + methodNameSuffix, field.getQualifiedType());
+         result.add(new JavaMethodResource(this.getParent(), method));
+      }
+      return result;
+   }
 }

shell/src/main/java/org/jboss/forge/shell/plugins/builtin/RmPlugin.java

@@ -6,8 +6,11 @@
  */
 package org.jboss.forge.shell.plugins.builtin;
 
+import java.util.List;
+
 import javax.inject.Inject;
 
+import org.jboss.forge.resources.DeletionAware;
 import org.jboss.forge.resources.Resource;
 import org.jboss.forge.shell.Shell;
 import org.jboss.forge.shell.plugins.Alias;
@@ -41,13 +44,42 @@ public void rm(
    {
       for (Resource<?> resource : paths)
       {
-         if (force || shell.promptBoolean("delete: " + resource.getName() + ": are you sure?"))
+         deleteResource(recursive, force, resource);
+      }
+   }
+
+   private void deleteResource(final boolean recursive, final boolean force, Resource<?> resource)
+   {
+      if (force
+               || shell.promptBoolean("delete: " + resource.getName() + ": are you sure?",
+                        true))
+      {
+         if (!resource.delete(recursive))
          {
-            if (!resource.delete(recursive))
+            throw new RuntimeException("error deleting " + resource);
+         }
+
+         if (resource instanceof DeletionAware)
+         {
+            List<Resource<?>> toDeleteResources = ((DeletionAware) resource).getResources();
+            List<Resource<?>> toDeleteOptionalResources = ((DeletionAware) resource)
+                     .getOptionalResources();
+            if (toDeleteResources != null)
             {
-               throw new RuntimeException("error deleting files.");
+               for (Resource<?> deletionResource : toDeleteResources)
+               {
+                  deleteResource(recursive, true, deletionResource);
+               }
+            }
+            if (toDeleteOptionalResources != null)
+            {
+               for (Resource<?> deletionResource : toDeleteOptionalResources)
+               {
+                  deleteResource(recursive, force, deletionResource);
+               }
             }
          }
+
       }
    }
 }

shell/src/test/java/org/jboss/forge/shell/test/plugins/builtin/RmPluginTest.java

@@ -9,8 +9,14 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.util.List;
+
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.forge.parser.JavaParser;
+import org.jboss.forge.parser.java.JavaClass;
 import org.jboss.forge.project.Project;
+import org.jboss.forge.project.facets.JavaSourceFacet;
+import org.jboss.forge.resources.java.JavaResource;
 import org.jboss.forge.shell.Shell;
 import org.jboss.forge.test.AbstractShellTest;
 import org.junit.Test;
@@ -43,4 +49,25 @@ public void testCanRmRF() throws Exception
       assertFalse(project.getProjectRoot().getChild("f o o").exists());
    }
 
+   @Test
+   public void testRmField() throws Exception
+   {
+      Project project = initializeJavaProject();
+      Shell shell = getShell();
+      JavaSourceFacet java = project.getFacet(JavaSourceFacet.class);
+      JavaClass javaClass = JavaParser
+               .parse(JavaClass.class,
+                        "public class MyClass { private String aField; public String getAField() {return aField;} public void setAField(String field){this.aField = field;}}");
+      javaClass.setPackage("org.example");
+      JavaResource javaResource = java.saveJavaSource(javaClass);
+      shell.setCurrentResource(javaResource);
+
+      // Execute SUT
+      queueInputLines("y", "y", "y");
+      shell.execute("rm aField");
+
+      // Check results
+      List<?> members = javaResource.getJavaSource().getMembers();
+      assertTrue(members.isEmpty());
+   }
 }