langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
equal
deleted
inserted
replaced
116 if (allDefaultModules) { |
116 if (allDefaultModules) { |
117 mods.addAll(systemModulePath.defaultSystemRoots()); |
117 mods.addAll(systemModulePath.defaultSystemRoots()); |
118 } |
118 } |
119 |
119 |
120 this.configuration = Configuration.empty() |
120 this.configuration = Configuration.empty() |
121 .resolveRequires(finder, ModuleFinder.of(), mods); |
121 .resolve(finder, ModuleFinder.of(), mods); |
122 |
122 |
123 this.configuration.modules().stream() |
123 this.configuration.modules().stream() |
124 .map(ResolvedModule::reference) |
124 .map(ResolvedModule::reference) |
125 .forEach(this::addModuleReference); |
125 .forEach(this::addModuleReference); |
126 |
126 |
270 public Stream<Module> resolve(Set<String> roots) { |
270 public Stream<Module> resolve(Set<String> roots) { |
271 if (roots.isEmpty()) { |
271 if (roots.isEmpty()) { |
272 return nameToModule.values().stream(); |
272 return nameToModule.values().stream(); |
273 } else { |
273 } else { |
274 return Configuration.empty() |
274 return Configuration.empty() |
275 .resolveRequires(finder, ModuleFinder.of(), roots) |
275 .resolve(finder, ModuleFinder.of(), roots) |
276 .modules().stream() |
276 .modules().stream() |
277 .map(ResolvedModule::name) |
277 .map(ResolvedModule::name) |
278 .map(nameToModule::get); |
278 .map(nameToModule::get); |
279 } |
279 } |
280 } |
280 } |
420 throw new UncheckedIOException(e); |
420 throw new UncheckedIOException(e); |
421 } |
421 } |
422 } |
422 } |
423 |
423 |
424 private ModuleDescriptor dropHashes(ModuleDescriptor md) { |
424 private ModuleDescriptor dropHashes(ModuleDescriptor md) { |
425 ModuleDescriptor.Builder builder = ModuleDescriptor.module(md.name()); |
425 ModuleDescriptor.Builder builder = ModuleDescriptor.newModule(md.name()); |
426 md.requires().forEach(builder::requires); |
426 md.requires().forEach(builder::requires); |
427 md.exports().forEach(builder::exports); |
427 md.exports().forEach(builder::exports); |
428 md.opens().forEach(builder::opens); |
428 md.opens().forEach(builder::opens); |
429 md.provides().stream().forEach(builder::provides); |
429 md.provides().stream().forEach(builder::provides); |
430 md.uses().stream().forEach(builder::uses); |
430 md.uses().stream().forEach(builder::uses); |
431 |
431 builder.packages(md.packages()); |
432 Set<String> concealed = new HashSet<>(md.packages()); |
|
433 md.exports().stream().map(Exports::source).forEach(concealed::remove); |
|
434 md.opens().stream().map(Opens::source).forEach(concealed::remove); |
|
435 concealed.forEach(builder::contains); |
|
436 |
|
437 return builder.build(); |
432 return builder.build(); |
438 } |
433 } |
439 |
434 |
440 @Override |
435 @Override |
441 public Set<ModuleReference> findAll() { |
436 public Set<ModuleReference> findAll() { |