src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java

rev 14279 : [mq]: 8140281-deprecation-optional.get

*** 261,271 ****
                  fail(InternalError.class,
                       "Selected module %s not on module path",
                       name);
              }
  
!             URI uri = omref.get().location().get();
              modPaths.put(name, Paths.get(uri));
  
          }
          return modPaths;
      }
--- 261,271 ----
                  fail(InternalError.class,
                       "Selected module %s not on module path",
                       name);
              }
  
!             URI uri = omref.getWhenPresent().location().getWhenPresent();
              modPaths.put(name, Paths.get(uri));
  
          }
          return modPaths;
      }
*** 344,378 ****
                                    .append(toString(p.providers())));
                      }
  
                      Optional<String> mc = md.mainClass();
                      if (mc.isPresent())
!                         sb.append("\n  main-class " + mc.get());
  
  
  
                      Optional<String> osname = md.osName();
                      if (osname.isPresent())
!                         sb.append("\n  operating-system-name " + osname.get());
  
                      Optional<String> osarch = md.osArch();
                      if (osarch.isPresent())
!                         sb.append("\n  operating-system-architecture " + osarch.get());
  
                      Optional<String> osversion = md.osVersion();
                      if (osversion.isPresent())
!                         sb.append("\n  operating-system-version " + osversion.get());
  
                      try {
                          Method m = ModuleDescriptor.class.getDeclaredMethod("hashes");
                          m.setAccessible(true);
                          @SuppressWarnings("unchecked")
                          Optional<Hasher.DependencyHashes> optHashes =
                                  (Optional<Hasher.DependencyHashes>) m.invoke(md);
  
                          if (optHashes.isPresent()) {
!                             Hasher.DependencyHashes hashes = optHashes.get();
                              hashes.names().stream().forEach(mod ->
                                      sb.append("\n  hashes ").append(mod).append(" ")
                                        .append(hashes.algorithm()).append(" ")
                                        .append(hashes.hashFor(mod)));
                          }
--- 344,378 ----
                                    .append(toString(p.providers())));
                      }
  
                      Optional<String> mc = md.mainClass();
                      if (mc.isPresent())
!                         sb.append("\n  main-class " + mc.getWhenPresent());
  
  
  
                      Optional<String> osname = md.osName();
                      if (osname.isPresent())
!                         sb.append("\n  operating-system-name " + osname.getWhenPresent());
  
                      Optional<String> osarch = md.osArch();
                      if (osarch.isPresent())
!                         sb.append("\n  operating-system-architecture " + osarch.getWhenPresent());
  
                      Optional<String> osversion = md.osVersion();
                      if (osversion.isPresent())
!                         sb.append("\n  operating-system-version " + osversion.getWhenPresent());
  
                      try {
                          Method m = ModuleDescriptor.class.getDeclaredMethod("hashes");
                          m.setAccessible(true);
                          @SuppressWarnings("unchecked")
                          Optional<Hasher.DependencyHashes> optHashes =
                                  (Optional<Hasher.DependencyHashes>) m.invoke(md);
  
                          if (optHashes.isPresent()) {
!                             Hasher.DependencyHashes hashes = optHashes.getWhenPresent();
                              hashes.names().stream().forEach(mod ->
                                      sb.append("\n  hashes ").append(mod).append(" ")
                                        .append(hashes.algorithm()).append(" ")
                                        .append(hashes.hashFor(mod)));
                          }
*** 578,588 ****
                          if (!omref.isPresent()) {
                              throw new RuntimeException("Hashing module " + name
                                  + " dependencies, unable to find module " + dn
                                  + " on module path");
                          }
!                         descriptors.add(omref.get().descriptor());
                      } catch (FindException x) {
                          throw new IOException("error reading module path", x);
                      }
                  }
              }
--- 578,588 ----
                          if (!omref.isPresent()) {
                              throw new RuntimeException("Hashing module " + name
                                  + " dependencies, unable to find module " + dn
                                  + " on module path");
                          }
!                         descriptors.add(omref.getWhenPresent().descriptor());
                      } catch (FindException x) {
                          throw new IOException("error reading module path", x);
                      }
                  }
              }