< prev index next >
src/jdk.jartool/share/classes/sun/tools/jar/Main.java
Print this page
rev 14279 : [mq]: 8140281-deprecation-optional.get
*** 1679,1689 ****
.append(toString(p.providers(), "", "")));
}
Optional<String> mc = md.mainClass();
if (mc.isPresent())
! sb.append("\nMain class:\n " + mc.get());
s = md.conceals();
if (!s.isEmpty()) {
sb.append("\nConceals:");
s.forEach(p -> sb.append("\n ").append(p));
--- 1679,1689 ----
.append(toString(p.providers(), "", "")));
}
Optional<String> mc = md.mainClass();
if (mc.isPresent())
! sb.append("\nMain class:\n " + mc.getWhenPresent());
s = md.conceals();
if (!s.isEmpty()) {
sb.append("\nConceals:");
s.forEach(p -> sb.append("\n ").append(p));
*** 1694,1704 ****
m.setAccessible(true);
Optional<Hasher.DependencyHashes> optHashes =
(Optional<Hasher.DependencyHashes>) m.invoke(md);
if (optHashes.isPresent()) {
! Hasher.DependencyHashes hashes = optHashes.get();
sb.append("\nHashes:");
sb.append("\n Algorithm: " + hashes.algorithm());
hashes.names().stream().forEach(mod ->
sb.append("\n ").append(mod)
.append(": ").append(hashes.hashFor(mod)));
--- 1694,1704 ----
m.setAccessible(true);
Optional<Hasher.DependencyHashes> optHashes =
(Optional<Hasher.DependencyHashes>) m.invoke(md);
if (optHashes.isPresent()) {
! Hasher.DependencyHashes hashes = optHashes.getWhenPresent();
sb.append("\nHashes:");
sb.append("\n Algorithm: " + hashes.algorithm());
hashes.names().stream().forEach(mod ->
sb.append("\n ").append(mod)
.append(": ").append(hashes.hashFor(mod)));
*** 1803,1813 ****
if (matcher.reset(dn).find()) {
Optional<ModuleReference> omref = moduleFinder.find(dn);
if (!omref.isPresent()) {
throw new IOException(formatMsg2("error.hash.dep", name , dn));
}
! map.put(dn, modRefToPath(omref.get()));
}
}
if (map.size() == 0) {
return null;
--- 1803,1813 ----
if (matcher.reset(dn).find()) {
Optional<ModuleReference> omref = moduleFinder.find(dn);
if (!omref.isPresent()) {
throw new IOException(formatMsg2("error.hash.dep", name , dn));
}
! map.put(dn, modRefToPath(omref.getWhenPresent()));
}
}
if (map.size() == 0) {
return null;
*** 1815,1823 ****
return Hasher.generate(map, "SHA-256");
}
}
private static Path modRefToPath(ModuleReference mref) {
! URI location = mref.location().get();
return Paths.get(location);
}
}
--- 1815,1823 ----
return Hasher.generate(map, "SHA-256");
}
}
private static Path modRefToPath(ModuleReference mref) {
! URI location = mref.location().getWhenPresent();
return Paths.get(location);
}
}
< prev index next >