langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java Wed Nov 23 16:16:36 2016 +0000
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java Thu Dec 01 09:02:42 2016 +0000
@@ -38,6 +38,8 @@
import java.io.UncheckedIOException;
import java.lang.module.Configuration;
import java.lang.module.ModuleDescriptor;
+import java.lang.module.ModuleDescriptor.Exports;
+import java.lang.module.ModuleDescriptor.Opens;
import java.lang.module.ModuleFinder;
import java.lang.module.ModuleReader;
import java.lang.module.ModuleReference;
@@ -408,7 +410,7 @@
}
@Override
- public void close() throws IOException {
+ public void close() {
}
};
}
@@ -421,12 +423,18 @@
}
private ModuleDescriptor dropHashes(ModuleDescriptor md) {
- ModuleDescriptor.Builder builder = new ModuleDescriptor.Builder(md.name());
+ ModuleDescriptor.Builder builder = ModuleDescriptor.module(md.name());
md.requires().forEach(builder::requires);
md.exports().forEach(builder::exports);
- md.provides().values().stream().forEach(builder::provides);
+ md.opens().forEach(builder::opens);
+ md.provides().stream().forEach(builder::provides);
md.uses().stream().forEach(builder::uses);
- builder.conceals(md.conceals());
+
+ Set<String> concealed = new HashSet<>(md.packages());
+ md.exports().stream().map(Exports::source).forEach(concealed::remove);
+ md.opens().stream().map(Opens::source).forEach(concealed::remove);
+ concealed.forEach(builder::contains);
+
return builder.build();
}