Merge remote-tracking branch 'origin/document-cleanup' into document-…

…cleanup
cryostatio · May 15, 2024 · fcf0e94 · fcf0e94
2 parents d102e9d + 3d87129
commit fcf0e94
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java b/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java
@@ -61,8 +61,7 @@ public Optional<String> getXml(String templateName, TemplateType type)
             return Optional.empty();
         }
         try {
-            Optional<Document> document =
-                    conn.getService().getServerTemplates().stream()
+                    return conn.getService().getServerTemplates().stream()
                             .map(xmlText -> Jsoup.parse(xmlText, "", Parser.xmlParser()))
                             .filter(
                                     doc -> {
@@ -85,12 +84,8 @@ public Optional<String> getXml(String templateName, TemplateType type)
                                         }
                                         return configuration.attr("label").equals(templateName);
                                     })
+                             .map(doc -> document.toString())
                             .findFirst();
-            if (document.isPresent()) {
-                return Optional.of(document.get().toString());
-            } else {
-                return Optional.empty();
-            }
         } catch (org.openjdk.jmc.flightrecorder.configuration.FlightRecorderException
                 | IOException
                 | ServiceNotAvailableException e) {