Add parameters to include and excludes sources

Author: adamretter

pom.xml

@@ -120,6 +120,12 @@
       <version>${maven-plugin-annotations.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.5.1</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>fr.inria.gforge.spoon</groupId>
       <artifactId>spoon-core</artifactId>

src/main/java/fr/inria/gforge/spoon/SpoonMojoGenerate.java

@@ -21,7 +21,9 @@
 import spoon.processing.ProcessorPropertiesImpl;
 
 import java.io.File;
+import java.util.HashSet;
 import java.util.Properties;
+import java.util.Set;
 
 @Mojo(
 		name = "generate",
@@ -135,6 +137,18 @@ public class SpoonMojoGenerate extends AbstractMojo {
 	)
 	private boolean includeSource;
 
+    /**
+     * A list of inclusion filters for Spoon input.
+     */
+    @Parameter
+    private Set<String> includes = new HashSet<>();
+
+    /**
+     * A list of exclusion filters for Spoon input.
+     */
+    @Parameter
+    private Set<String> excludes = new HashSet<>();
+
     /**
      * Skip execution.
      * 
@@ -311,7 +325,15 @@ public boolean isIncludeSrcDirectories() {
 		return includeSource;
 	}
 
-	/**
+    public Set<String> getIncludes() {
+        return includes;
+    }
+
+    public Set<String> getExcludes() {
+        return excludes;
+    }
+
+    /**
 	 * @return the includeTestDirectories
 	 */
 	public boolean isIncludeTestDirectories() {

src/main/java/fr/inria/gforge/spoon/configuration/AbstractSpoonConfigurationBuilder.java

@@ -5,6 +5,7 @@
 import fr.inria.gforge.spoon.util.LogWrapper;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.DirectoryScanner;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -15,9 +16,13 @@
 abstract class AbstractSpoonConfigurationBuilder
 		implements SpoonConfigurationBuilder {
 
+    private static final String[] EMPTY_STRING_ARRAY = {};
+    private static final String[] DEFAULT_INCLUDES = {"**/**"};
+
 	protected final List<String> parameters = new LinkedList<String>();
 	protected final SpoonMojoGenerate spoon;
 	protected final ReportBuilder reportBuilder;
+    private DirectoryScanner directoryScanner = null;
 
 	protected AbstractSpoonConfigurationBuilder(SpoonMojoGenerate spoon,
 			ReportBuilder reportBuilder) {
@@ -30,43 +35,101 @@ protected AbstractSpoonConfigurationBuilder(SpoonMojoGenerate spoon,
 			parameters.add("--level");
 			parameters.add("INFO");
 		}
-
 	}
 
 	@Override
 	public SpoonConfigurationBuilder addInputFolder() throws SpoonMavenPluginException {
-		final List<File> srcDir = new ArrayList<>();
+		final List<File> inputs = new ArrayList<>();
 		if (spoon.isIncludeSrcDirectories()) {
-			srcDir.add(new File(spoon.getProject().getBuild().getSourceDirectory()));
-			if (!spoon.getSkipGeneratedSources()) {
-				for (String s : spoon.getProject().getCompileSourceRoots()) {
-					srcDir.add(new File(s));
+            final File sourceDirectory = new File(spoon.getProject().getBuild().getSourceDirectory());
+            if (sourceDirectory.exists()) {
+                for (final File input : filterDirectory(sourceDirectory)) {
+                    inputs.add(input);
+                }
+            }
+
+            if (!spoon.getSkipGeneratedSources()) {
+				for (final String compileSourceRootStr : spoon.getProject().getCompileSourceRoots()) {
+                    final File compileSourceRoot = new File(compileSourceRootStr);
+                    if (compileSourceRoot.exists()) {
+                        for (final File input : filterDirectory(compileSourceRoot)) {
+                            inputs.add(input);
+                        }
+                    }
 				}
 			}
 		}
-		if(spoon.isIncludeTestDirectories()) {
-			srcDir.add(new File(spoon.getProject().getBuild().getTestSourceDirectory()));
-			if (!spoon.getSkipGeneratedSources()) {
-				for (String s : spoon.getProject().getTestCompileSourceRoots()) {
-					srcDir.add(new File(s));
+
+		if (spoon.isIncludeTestDirectories()) {
+            final File testSourceDirectory = new File(spoon.getProject().getBuild().getTestSourceDirectory());
+            if (testSourceDirectory.exists()) {
+                for (final File input : filterDirectory(testSourceDirectory)) {
+                    inputs.add(input);
+                }
+            }
+
+            if (!spoon.getSkipGeneratedSources()) {
+				for (final String testCompileSourceRootStr : spoon.getProject().getTestCompileSourceRoots()) {
+                    final File testCompileSourceRoot = new File(testCompileSourceRootStr);
+                    if (testCompileSourceRoot.exists()) {
+                        for (final File input : filterDirectory(testCompileSourceRoot)) {
+                            inputs.add(input);
+                        }
+                    }
 				}
 			}
 		}
 
-
-		srcDir.removeIf(file -> !file.exists());
-
-		if (srcDir.isEmpty()) {
-			throw new SpoonMavenPluginException(String.format("No source directory for %s project.", spoon.getProject().getName()));
+		if (inputs.isEmpty()) {
+			throw new SpoonMavenPluginException(String.format("No input sources for %s project.", spoon.getProject().getName()));
 		}
-		String inputs = srcDir.stream().map(File::getAbsolutePath).collect(Collectors.joining(File.pathSeparator));
+
+		final String inputsString = inputs.stream().map(File::getAbsolutePath).collect(Collectors.joining(File.pathSeparator));
 
 		parameters.add("-i");
-		parameters.add(inputs);
-		reportBuilder.setInput(inputs);
+		parameters.add(inputsString);
+		reportBuilder.setInput(inputsString);
 		return this;
 	}
 
+    private File[] filterDirectory(final File dir) {
+        if (spoon.getIncludes().isEmpty() && spoon.getExcludes().isEmpty()) {
+            return new File[] { dir };
+        }
+
+        if (directoryScanner == null) {
+            directoryScanner = setupScanner();
+        }
+
+        directoryScanner.setBasedir(dir);
+        directoryScanner.scan();
+
+        final String[] includedFiles = directoryScanner.getIncludedFiles();
+        final File[] filtered = new File[includedFiles.length];
+        for (int i = 0; i < includedFiles.length; i++) {
+            filtered[i] = new File(dir, includedFiles[i]);
+        }
+        return filtered;
+    }
+
+    private DirectoryScanner setupScanner() {
+        final DirectoryScanner scanner = new DirectoryScanner();
+
+        if (!spoon.getIncludes().isEmpty()) {
+            scanner.setIncludes(spoon.getIncludes().toArray(EMPTY_STRING_ARRAY));
+        } else {
+            scanner.setIncludes(DEFAULT_INCLUDES);
+        }
+
+
+        if (!spoon.getExcludes().isEmpty()) {
+            String[] excludes = spoon.getExcludes().toArray(EMPTY_STRING_ARRAY);
+            scanner.setExcludes(excludes);
+        }
+
+        return scanner;
+    }
+
 	@Override
 	public SpoonConfigurationBuilder addOutputFolder() {
 		// Create output folder if it doesn't exist.