Skip to content

Commit

Permalink
Refactor common code in NativeImagePlugin
Browse files Browse the repository at this point in the history 
Refactor the `configureJvmReachabilityConfigurationDirectories`
and `configureJvmReachabilityExcludeConfigArgs` to use a common
method since they share the same logic.
  • Loading branch information
@philwebb
philwebb committed Oct 6, 2022
1 parent 73a945b commit 65d3f63
Showing 1 changed file with 48 additions and 60 deletions.
108 changes: 48 additions & 60 deletions native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
import org.gradle.api.artifacts.ConfigurationContainer;
import org.gradle.api.artifacts.ModuleVersionIdentifier;
import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
import org.gradle.api.artifacts.result.ResolvedComponentResult;
import org.gradle.api.attributes.Attribute;
import org.gradle.api.attributes.AttributeContainer;
import org.gradle.api.file.ArchiveOperations;
Expand Down Expand Up @@ -128,10 +129,13 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static org.graalvm.buildtools.gradle.internal.ConfigurationCacheSupport.serializablePredicateOf;
import static org.graalvm.buildtools.gradle.internal.ConfigurationCacheSupport.serializableSupplierOf;
Expand Down Expand Up @@ -340,69 +344,52 @@ private void configureAutomaticTaskCreation(Project project,
});
}

private void configureJvmReachabilityConfigurationDirectories(Project project, GraalVMExtension graalExtension, NativeImageOptions options, SourceSet sourceSet) {
GraalVMReachabilityMetadataRepositoryExtension repositoryExtension = reachabilityExtensionOn(graalExtension);
Provider<GraalVMReachabilityMetadataService> serviceProvider = graalVMReachabilityMetadataService(project, repositoryExtension);
options.getConfigurationFileDirectories().from(repositoryExtension.getEnabled().flatMap(enabled -> {
if (enabled) {
if (repositoryExtension.getUri().isPresent()) {
Configuration classpath = project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName());
Set<String> excludedModules = repositoryExtension.getExcludedModules().getOrElse(Collections.emptySet());
Map<String, String> forcedVersions = repositoryExtension.getModuleToConfigVersion().getOrElse(Collections.emptyMap());
return serviceProvider.map(repo -> repo.findConfigurationsFor(query -> classpath.getIncoming().getResolutionResult().allComponents(component -> {
ModuleVersionIdentifier moduleVersion = component.getModuleVersion();
String module = Objects.requireNonNull(moduleVersion).getGroup() + ":" + moduleVersion.getName();
if (!excludedModules.contains(module)) {
query.forArtifact(artifact -> {
artifact.gav(module + ":" + moduleVersion.getVersion());
if (forcedVersions.containsKey(module)) {
artifact.forceConfigVersion(forcedVersions.get(module));
}
});
}
query.useLatestConfigWhenVersionIsUntested();
})).stream()
.map(configuration -> configuration.getDirectory().toAbsolutePath())
.map(Path::toFile)
.collect(Collectors.toList()));
}
}
return project.getProviders().provider(Collections::emptySet);
}));
private void configureJvmReachabilityConfigurationDirectories(Project project, GraalVMExtension graalExtension,
NativeImageOptions options, SourceSet sourceSet) {
options.getConfigurationFileDirectories().from(graalVMReachabilityQuery(project, graalExtension, sourceSet,
configuration -> true, this::getConfigurationDirectory,
Collectors.toList()));
}

private File getConfigurationDirectory(ModuleVersionIdentifier moduleVersion,
DirectoryConfiguration configuration) {
return configuration.getDirectory().toAbsolutePath().toFile();
}

private void configureJvmReachabilityExcludeConfigArgs(Project project, GraalVMExtension graalExtension,
NativeImageOptions options, SourceSet sourceSet) {
options.getExcludeConfig().putAll(graalVMReachabilityQuery(project, graalExtension, sourceSet,
DirectoryConfiguration::isOverride, this::getExclusionConfig,
Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
}

private void configureJvmReachabilityExcludeConfigArgs(Project project, GraalVMExtension graalExtension, NativeImageOptions options, SourceSet sourceSet) {
GraalVMReachabilityMetadataRepositoryExtension repositoryExtension = reachabilityExtensionOn(graalExtension);
Provider<GraalVMReachabilityMetadataService> serviceProvider = graalVMReachabilityMetadataService(project, repositoryExtension);
options.getExcludeConfig().putAll(repositoryExtension.getEnabled().flatMap(enabled -> {
if (enabled) {
if (repositoryExtension.getUri().isPresent()) {
Configuration classpath = project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName());
Set<String> excludedModules = repositoryExtension.getExcludedModules().getOrElse(Collections.emptySet());
Map<String, String> forcedVersions = repositoryExtension.getModuleToConfigVersion().getOrElse(Collections.emptyMap());
return serviceProvider.map(repo -> classpath.getIncoming().getResolutionResult().getAllComponents().stream().flatMap(component -> {
private Map.Entry<String, List<String>> getExclusionConfig(ModuleVersionIdentifier moduleVersion,
DirectoryConfiguration configuration) {
String gav = moduleVersion.getGroup() + ":" + moduleVersion.getName() + ":" + moduleVersion.getVersion();
return new AbstractMap.SimpleEntry<>(gav, Arrays.asList("^/META-INF/native-image/.*"));
}

private <T, A, R> Provider<R> graalVMReachabilityQuery(Project project, GraalVMExtension graalExtension,
SourceSet sourceSet, Predicate<DirectoryConfiguration> filter,
BiFunction<ModuleVersionIdentifier, DirectoryConfiguration, T> mapper, Collector<T, A, R> collector) {
GraalVMReachabilityMetadataRepositoryExtension extension = reachabilityExtensionOn(graalExtension);
return extension.getEnabled().flatMap(enabled -> {
if (enabled && extension.getUri().isPresent()) {
Configuration classpath = project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName());
Set<String> excludedModules = extension.getExcludedModules().getOrElse(Collections.emptySet());
Map<String, String> forcedVersions = extension.getModuleToConfigVersion().getOrElse(Collections.emptyMap());
return graalVMReachabilityMetadataService(project, extension).map(service -> {
Set<ResolvedComponentResult> components = classpath.getIncoming().getResolutionResult().getAllComponents();
Stream<T> mapped = components.stream().flatMap(component -> {
ModuleVersionIdentifier moduleVersion = component.getModuleVersion();
return repo.findConfigurationsFor(query -> {
String module = Objects.requireNonNull(moduleVersion).getGroup() + ":" + moduleVersion.getName();
if (!excludedModules.contains(module)) {
query.forArtifact(artifact -> {
artifact.gav(module + ":" + moduleVersion.getVersion());
if (forcedVersions.containsKey(module)) {
artifact.forceConfigVersion(forcedVersions.get(module));
}
});
}
query.useLatestConfigWhenVersionIsUntested();
}).stream()
.filter(DirectoryConfiguration::isOverride)
.map(configuration -> new AbstractMap.SimpleEntry<>(
moduleVersion.getGroup() + ":" + moduleVersion.getName() + ":" + moduleVersion.getVersion(),
Arrays.asList("^/META-INF/native-image/.*")));
}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
}
Set<DirectoryConfiguration> configurations = service.findConfigurationsFor(excludedModules, forcedVersions, moduleVersion);
return configurations.stream().filter(filter).map(configuration -> mapper.apply(moduleVersion, configuration));
});
return mapped.collect(collector);
});
}
return project.getProviders().provider(Collections::emptyMap);
}));
return project.getProviders().provider(() -> Stream.<T>empty().collect(collector));
});
}

private Provider<GraalVMReachabilityMetadataService> graalVMReachabilityMetadataService(Project project,
Expand All @@ -413,7 +400,8 @@ private Provider<GraalVMReachabilityMetadataService> graalVMReachabilityMetadata
LogLevel logLevel = determineLogLevel();
spec.getParameters().getLogLevel().set(logLevel);
spec.getParameters().getUri().set(repositoryExtension.getUri());
spec.getParameters().getCacheDir().set(new File(project.getGradle().getGradleUserHomeDir(), "native-build-tools/repositories"));
spec.getParameters().getCacheDir().set(
new File(project.getGradle().getGradleUserHomeDir(), "native-build-tools/repositories"));
});
}

Expand Down

0 comments on commit 65d3f63

Please sign in to comment.