perf: Collect list of source files only once (#1486)

* perf: Collect list of source files only once * one more useless call of sourcesFolder.getAllJavaFiles() * added Deprecated tag
INRIA · Jul 31, 2017 · 72146e8 · 72146e8
1 parent e6f0492
commit 72146e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/spoon/support/compiler/jdt/FileCompilerConfig.java b/src/main/java/spoon/support/compiler/jdt/FileCompilerConfig.java
@@ -50,6 +50,10 @@ public FileCompilerConfig(List<SpoonFile> files) {
 		this.files = files;
 	}
 
+	/*
+	 * This method is not used now, so let's get rid of it.
+	 */
+	@Deprecated
 	public FileCompilerConfig(SpoonFolder folder) {
 		this(folder.getAllJavaFiles());
 	}

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java b/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java
@@ -379,20 +379,20 @@ protected boolean buildUnitsAndModel(JDTBuilder jdtBuilder, SpoonFolder sourcesF
 	private static final CompilationUnitDeclaration[] EMPTY_RESULT = new CompilationUnitDeclaration[0];
 
 	protected CompilationUnitDeclaration[] buildUnits(JDTBuilder jdtBuilder, SpoonFolder sourcesFolder, String[] classpath, String debugMessagePrefix, boolean buildOnlyOutdatedFiles) {
-		List<SpoonFile> sourceFiles = sourcesFolder.getAllJavaFiles();
+		List<SpoonFile> sourceFiles = Collections.unmodifiableList(sourcesFolder.getAllJavaFiles());
 		if (sourceFiles.isEmpty()) {
 			return EMPTY_RESULT;
 		}
 
-		JDTBatchCompiler batchCompiler = createBatchCompiler(new FileCompilerConfig(sourcesFolder));
+		JDTBatchCompiler batchCompiler = createBatchCompiler(new FileCompilerConfig(sourceFiles));
 
 		String[] args;
 		if (jdtBuilder == null) {
 			args = new JDTBuilderImpl() //
 					.classpathOptions(new ClasspathOptions().encoding(this.encoding).classpath(classpath)) //
 					.complianceOptions(new ComplianceOptions().compliance(javaCompliance)) //
 					.advancedOptions(new AdvancedOptions().preserveUnusedVars().continueExecution().enableJavadoc()) //
-					.sources(new SourceOptions().sources(sourcesFolder.getAllJavaFiles())) // no sources, handled by the JDTBatchCompiler
+					.sources(new SourceOptions().sources(sourceFiles)) // no sources, handled by the JDTBatchCompiler
 					.build();
 		} else {
 			args = jdtBuilder.build();