Skip to content

Commit

Permalink
Replace reflection of JavaFileManager with ForwardingJavaFileManager
Browse files Browse the repository at this point in the history
  • Loading branch information
big-guy committed Jul 9, 2019
1 parent d58bdd6 commit d533875
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 190 deletions.
Expand Up @@ -17,16 +17,17 @@

import org.gradle.api.JavaVersion;
import org.gradle.api.internal.tasks.compile.processing.AnnotationProcessorDeclaration;
import org.gradle.api.internal.tasks.compile.reflect.FilteringClassLoaderInjectingProxy;
import org.gradle.api.internal.tasks.compile.reflect.SourcepathIgnoringProxy;
import org.gradle.api.internal.tasks.compile.reflect.GradleStandardJavaFileManager;
import org.gradle.api.tasks.WorkResult;
import org.gradle.internal.Factory;
import org.gradle.internal.classpath.DefaultClassPath;
import org.gradle.language.base.internal.compile.Compiler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.inject.Inject;
import javax.tools.JavaCompiler;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import java.io.Serializable;
Expand Down Expand Up @@ -61,13 +62,11 @@ private JavaCompiler.CompilationTask createCompileTask(JavaCompileSpec spec, Jdk
List<String> options = new JavaCompilerArgumentsBuilder(spec).build();
JavaCompiler compiler = javaHomeBasedJavaCompilerFactory.create();
MinimalJavaCompileOptions compileOptions = spec.getCompileOptions();
StandardJavaFileManager standardFileManager = compiler.getStandardFileManager(null, null, compileOptions.getEncoding() != null ? Charset.forName(compileOptions.getEncoding()) : null);
Charset charset = compileOptions.getEncoding() != null ? Charset.forName(compileOptions.getEncoding()) : null;
StandardJavaFileManager standardFileManager = compiler.getStandardFileManager(null, null, charset);
Iterable<? extends JavaFileObject> compilationUnits = standardFileManager.getJavaFileObjectsFromFiles(spec.getSourceFiles());
StandardJavaFileManager fileManager = standardFileManager;
if (JavaVersion.current().isJava9Compatible() && emptySourcepathIn(options)) {
fileManager = (StandardJavaFileManager) SourcepathIgnoringProxy.proxy(standardFileManager, StandardJavaFileManager.class);
}
fileManager = (StandardJavaFileManager) FilteringClassLoaderInjectingProxy.proxy(fileManager, StandardJavaFileManager.class);
boolean hasEmptySourcepaths = JavaVersion.current().isJava9Compatible() && emptySourcepathIn(options);
JavaFileManager fileManager = GradleStandardJavaFileManager.wrap(standardFileManager, DefaultClassPath.of(spec.getAnnotationProcessorPath()), hasEmptySourcepaths);
JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, null, options, spec.getClasses(), compilationUnits);

Set<AnnotationProcessorDeclaration> annotationProcessors = spec.getEffectiveAnnotationProcessors();
Expand Down
Expand Up @@ -21,7 +21,7 @@
import javax.annotation.processing.Processor;
import javax.tools.DiagnosticListener;
import javax.tools.JavaCompiler;
import javax.tools.StandardJavaFileManager;
import java.io.Closeable;
import java.nio.charset.Charset;
import java.util.Locale;

Expand All @@ -30,9 +30,9 @@
*/
class ResourceCleaningCompilationTask implements JavaCompiler.CompilationTask {
private final JavaCompiler.CompilationTask delegate;
private final StandardJavaFileManager fileManager;
private final Closeable fileManager;

ResourceCleaningCompilationTask(JavaCompiler.CompilationTask delegate, StandardJavaFileManager fileManager) {
ResourceCleaningCompilationTask(JavaCompiler.CompilationTask delegate, Closeable fileManager) {
this.delegate = delegate;
this.fileManager = fileManager;
}
Expand Down

This file was deleted.

This file was deleted.

@@ -0,0 +1,95 @@
/*
* Copyright 2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.gradle.api.internal.tasks.compile.reflect;

import org.gradle.internal.classpath.ClassPath;

import javax.tools.ForwardingJavaFileManager;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import java.io.IOException;
import java.net.URLClassLoader;
import java.util.Set;

import static org.gradle.api.internal.tasks.compile.filter.AnnotationProcessorFilter.getFilteredClassLoader;

public class GradleStandardJavaFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> {
private final ClassPath annotationProcessorPath;
private final boolean hasEmptySourcePaths;

private GradleStandardJavaFileManager(StandardJavaFileManager fileManager, ClassPath annotationProcessorPath, boolean hasEmptySourcePaths) {
super(fileManager);
this.annotationProcessorPath = annotationProcessorPath;
this.hasEmptySourcePaths = hasEmptySourcePaths;
}

/**
* Overrides particular methods to prevent javac from accessing source files outside of Gradle's understanding or
* classloaders outside of Gradle's control.
*/
public static JavaFileManager wrap(StandardJavaFileManager delegate, ClassPath annotationProcessorPath, boolean hasEmptySourcePaths) {
return new GradleStandardJavaFileManager(delegate, annotationProcessorPath, hasEmptySourcePaths);
}

@Override
public boolean hasLocation(Location location) {
if (hasEmptySourcePaths) {
// There is currently a requirement in the JDK9 javac implementation
// that when javac is invoked with an explicitly empty sourcepath
// (i.e. {@code --sourcepath ""}), it won't allow you to compile a java 9
// module. However, we really want to explicitly set an empty sourcepath
// so that we don't implicitly pull in unrequested sourcefiles which
// haven't been snapshotted because we will consider the task up-to-date
// if the implicit files change.
//
// This implementation of hasLocation() pretends that the JavaFileManager
// has no concept of a source path.
if (location.equals(StandardLocation.SOURCE_PATH)) {
return false;
}
}
return super.hasLocation(location);
}

@Override
public Iterable<JavaFileObject> list(Location location, String packageName, Set<JavaFileObject.Kind> kinds, boolean recurse) throws IOException {
if (hasEmptySourcePaths) {
// If we are pretending that we don't have a sourcepath, the compiler will
// look on the classpath for sources. Since we don't want to bring in any
// sources implicitly from the classpath, we have to ignore source files
// found on the classpath.
if (location.equals(StandardLocation.CLASS_PATH)) {
kinds.remove(JavaFileObject.Kind.SOURCE);
}
}
return super.list(location, packageName, kinds, recurse);
}

@Override
public ClassLoader getClassLoader(Location location) {
ClassLoader classLoader = super.getClassLoader(location);
if (location.equals(StandardLocation.ANNOTATION_PROCESSOR_PATH)) {
if (classLoader instanceof URLClassLoader) {
return new URLClassLoader(annotationProcessorPath.getAsURLArray(), getFilteredClassLoader(classLoader.getParent()));
}
}

return classLoader;
}
}

This file was deleted.

This file was deleted.

0 comments on commit d533875

Please sign in to comment.