< prev index next >
src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java
Print this page
*** 49,75 ****
private static ModuleDescriptor descriptorOf(ResourcePoolModule mod) {
ModuleDescriptor md = mod.descriptor();
// drop hashes
! ModuleDescriptor.Builder builder = ModuleDescriptor.module(md.name());
md.requires().stream()
.forEach(builder::requires);
md.exports().stream()
.forEach(builder::exports);
md.opens().stream()
.forEach(builder::opens);
md.uses().stream()
.forEach(builder::uses);
md.provides().stream()
.forEach(builder::provides);
!
! // build the proper concealed packages
! Set<String> concealed = new HashSet<>(mod.packages());
! md.exports().stream().map(ModuleDescriptor.Exports::source).forEach(concealed::remove);
! md.opens().stream().map(ModuleDescriptor.Opens::source).forEach(concealed::remove);
! concealed.stream().forEach(builder::contains);
md.version().ifPresent(builder::version);
md.mainClass().ifPresent(builder::mainClass);
md.osName().ifPresent(builder::osName);
md.osArch().ifPresent(builder::osArch);
--- 49,70 ----
private static ModuleDescriptor descriptorOf(ResourcePoolModule mod) {
ModuleDescriptor md = mod.descriptor();
// drop hashes
! ModuleDescriptor.Builder builder = ModuleDescriptor.newModule(md.name());
md.requires().stream()
.forEach(builder::requires);
md.exports().stream()
.forEach(builder::exports);
md.opens().stream()
.forEach(builder::opens);
md.uses().stream()
.forEach(builder::uses);
md.provides().stream()
.forEach(builder::provides);
! builder.packages(md.packages());
md.version().ifPresent(builder::version);
md.mainClass().ifPresent(builder::mainClass);
md.osName().ifPresent(builder::osName);
md.osArch().ifPresent(builder::osArch);
*** 122,130 ****
public Set<ModuleReference> findAll() {
return allRefs;
}
};
! return Configuration.empty().resolveRequires(
finder, ModuleFinder.of(), nameToModRef.keySet());
}
}
--- 117,125 ----
public Set<ModuleReference> findAll() {
return allRefs;
}
};
! return Configuration.empty().resolve(
finder, ModuleFinder.of(), nameToModRef.keySet());
}
}
< prev index next >