8274394: Use Optional.isEmpty instead of !Optional.isPresent in jdk.jlink

turbanoff · Mandy Chung · commit 6f4cefbcbaad · 2021-09-28T17:22:27.000Z
Reviewed-by: alanb, mchung
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java
@@ -281,7 +281,7 @@ protected void prepareApplicationFiles(ResourcePool imageContent) throws IOExcep
             if (mainClassName == null) {
                 String path = "/" + module + "/module-info.class";
                 Optional<ResourcePoolEntry> res = imageContent.findEntry(path);
-                if (!res.isPresent()) {
+                if (res.isEmpty()) {
                     throw new IOException("module-info.class not found for " + module + " module");
                 }
                 ByteArrayInputStream stream = new ByteArrayInputStream(res.get().contentBytes());
@@ -293,8 +293,8 @@ protected void prepareApplicationFiles(ResourcePool imageContent) throws IOExcep
 
             if (mainClassName != null) {
                 // make sure main class exists!
-                if (!imageContent.findEntry("/" + module + "/" +
-                        mainClassName.replace('.', '/') + ".class").isPresent()) {
+                if (imageContent.findEntry("/" + module + "/" +
+                        mainClassName.replace('.', '/') + ".class").isEmpty()) {
                     throw new IllegalArgumentException(module + " does not have main class: " + mainClassName);
                 }
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
@@ -397,7 +397,7 @@ private JlinkConfiguration initJlinkConfig() throws BadArgs {
         }
 
         ModuleFinder finder = newModuleFinder(options.modulePath, options.limitMods, roots);
-        if (!finder.find("java.base").isPresent()) {
+        if (finder.find("java.base").isEmpty()) {
             Path defModPath = getDefaultModulePath();
             if (defModPath != null) {
                 options.modulePath.add(defModPath);
@@ -517,7 +517,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e)
 
     private static Path toPathLocation(ResolvedModule m) {
         Optional<URI> ouri = m.reference().location();
-        if (!ouri.isPresent())
+        if (ouri.isEmpty())
             throw new InternalError(m + " does not have a location");
         URI uri = ouri.get();
         return Paths.get(uri);
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java
@@ -54,7 +54,7 @@ public class ResourcePoolManager {
     static Attributes readModuleAttributes(ResourcePoolModule mod) {
         String p = "/" + mod.name() + "/module-info.class";
         Optional<ResourcePoolEntry> content = mod.findEntry(p);
-        if (!content.isPresent()) {
+        if (content.isEmpty()) {
               throw new PluginException("module-info.class not found for " +
                   mod.name() + " module");
         }
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/LegalNoticeFilePlugin.java
@@ -111,7 +111,7 @@ private void dedupLegalNoticeEntry(ResourcePoolEntry entry) {
             .filter(e -> e.linkedTarget() == null)
             .filter(e -> Arrays.equals(e.contentBytes(), entry.contentBytes()))
             .findFirst();
-        if (!otarget.isPresent()) {
+        if (otarget.isEmpty()) {
             if (errorIfNotSameContent) {
                 // all legal notices of the same file name are expected
                 // to contain the same content
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
@@ -890,7 +890,7 @@ private class Hasher {
             // filter modules resolved from the system module finder
             this.modules = config.modules().stream()
                 .map(ResolvedModule::name)
-                .filter(mn -> roots.contains(mn) && !system.find(mn).isPresent())
+                .filter(mn -> roots.contains(mn) && system.find(mn).isEmpty())
                 .collect(Collectors.toSet());
 
             this.hashesBuilder = new ModuleHashesBuilder(config, modules);

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public class ResourcePoolManager {`
`54`	`54`	`static Attributes readModuleAttributes(ResourcePoolModule mod) {`
`55`	`55`	`String p = "/" + mod.name() + "/module-info.class";`
`56`	`56`	`Optional<ResourcePoolEntry> content = mod.findEntry(p);`
`57`		`- if (!content.isPresent()) {`
	`57`	`+ if (content.isEmpty()) {`
`58`	`58`	`throw new PluginException("module-info.class not found for " +`
`59`	`59`	`mod.name() + " module");`
`60`	`60`	`}`