From b7646e2a242f70072d3b789fcc5cad3eb505d1f9 Mon Sep 17 00:00:00 2001
From: jmatsuok <jmatsuok@redhat.com>
Date: Thu, 9 May 2024 19:21:03 -0400
Subject: [PATCH 1/3] Abstract away document type

---
 .../core/templates/RemoteTemplateService.java | 55 +++++++++++--------
 .../core/templates/TemplateService.java       |  7 +--
 .../templates/RemoteTemplateServiceTest.java  |  6 +-
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java b/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java
index 30371cd7..5e93e0be 100644
--- a/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java
+++ b/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java
@@ -55,35 +55,42 @@ protected TemplateType providedTemplateType() {
     }
 
     @Override
-    public Optional<Document> getXml(String templateName, TemplateType type)
+    public Optional<String> getXml(String templateName, TemplateType type)
             throws FlightRecorderException {
         if (!providedTemplateType().equals(type)) {
             return Optional.empty();
         }
         try {
-            return conn.getService().getServerTemplates().stream()
-                    .map(xmlText -> Jsoup.parse(xmlText, "", Parser.xmlParser()))
-                    .filter(
-                            doc -> {
-                                Elements els = doc.getElementsByTag("configuration");
-                                if (els.isEmpty()) {
-                                    throw new MalformedXMLException(
-                                            "Document did not contain \"configuration\" element");
-                                }
-                                if (els.size() > 1) {
-                                    throw new MalformedXMLException(
-                                            "Document contains multiple \"configuration\""
-                                                    + " elements");
-                                }
-                                Element configuration = els.first();
-                                if (!configuration.hasAttr("label")) {
-                                    throw new MalformedXMLException(
-                                            "Configuration element did not have \"label\""
-                                                    + " attribute");
-                                }
-                                return configuration.attr("label").equals(templateName);
-                            })
-                    .findFirst();
+            Optional<Document> document =
+                    conn.getService().getServerTemplates().stream()
+                            .map(xmlText -> Jsoup.parse(xmlText, "", Parser.xmlParser()))
+                            .filter(
+                                    doc -> {
+                                        Elements els = doc.getElementsByTag("configuration");
+                                        if (els.isEmpty()) {
+                                            throw new MalformedXMLException(
+                                                    "Document did not contain \"configuration\""
+                                                            + " element");
+                                        }
+                                        if (els.size() > 1) {
+                                            throw new MalformedXMLException(
+                                                    "Document contains multiple \"configuration\""
+                                                            + " elements");
+                                        }
+                                        Element configuration = els.first();
+                                        if (!configuration.hasAttr("label")) {
+                                            throw new MalformedXMLException(
+                                                    "Configuration element did not have \"label\""
+                                                            + " attribute");
+                                        }
+                                        return configuration.attr("label").equals(templateName);
+                                    })
+                            .findFirst();
+            if (document.isPresent()) {
+                return Optional.of(document.get().toString());
+            } else {
+                return Optional.empty();
+            }
         } catch (org.openjdk.jmc.flightrecorder.configuration.FlightRecorderException
                 | IOException
                 | ServiceNotAvailableException e) {
diff --git a/src/main/java/io/cryostat/core/templates/TemplateService.java b/src/main/java/io/cryostat/core/templates/TemplateService.java
index ad039a14..b36d8285 100644
--- a/src/main/java/io/cryostat/core/templates/TemplateService.java
+++ b/src/main/java/io/cryostat/core/templates/TemplateService.java
@@ -23,18 +23,15 @@
 
 import io.cryostat.core.FlightRecorderException;
 
-import org.jsoup.nodes.Document;
-
 public interface TemplateService {
 
     List<Template> getTemplates() throws FlightRecorderException;
 
-    default Optional<Document> getXml(Template template) throws FlightRecorderException {
+    default Optional<String> getXml(Template template) throws FlightRecorderException {
         return getXml(template.getName(), template.getType());
     }
 
-    Optional<Document> getXml(String templateName, TemplateType type)
-            throws FlightRecorderException;
+    Optional<String> getXml(String templateName, TemplateType type) throws FlightRecorderException;
 
     default Optional<IConstrainedMap<EventOptionID>> getEvents(Template template)
             throws FlightRecorderException {
diff --git a/src/test/java/io/cryostat/core/templates/RemoteTemplateServiceTest.java b/src/test/java/io/cryostat/core/templates/RemoteTemplateServiceTest.java
index 8d544e6b..8c4e1f2b 100644
--- a/src/test/java/io/cryostat/core/templates/RemoteTemplateServiceTest.java
+++ b/src/test/java/io/cryostat/core/templates/RemoteTemplateServiceTest.java
@@ -29,7 +29,6 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 import org.jsoup.parser.Parser;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -100,9 +99,10 @@ void getEventsShouldReturnEmptyForUnknownType() throws Exception {
     void getXmlShouldReturnModelFromRemote() throws Exception {
         Mockito.when(conn.getService()).thenReturn(svc);
         Mockito.when(svc.getServerTemplates()).thenReturn(Collections.singletonList(xmlText));
-        Optional<Document> doc = templateSvc.getXml("Profiling", TemplateType.TARGET);
+        Optional<String> doc = templateSvc.getXml("Profiling", TemplateType.TARGET);
         Assertions.assertTrue(doc.isPresent());
-        Assertions.assertTrue(doc.get().hasSameValue(Jsoup.parse(xmlText, "", Parser.xmlParser())));
+        Assertions.assertTrue(
+                doc.get().equals(Jsoup.parse(xmlText, "", Parser.xmlParser()).outerHtml()));
     }
 
     @Test

From 4863dd656bde395e0ffb9f7119576569d6511e1f Mon Sep 17 00:00:00 2001
From: Joshua Matsuoka <Josh.matsuoka@gmail.com>
Date: Wed, 15 May 2024 13:29:25 -0400
Subject: [PATCH 2/3] Update
 src/main/java/io/cryostat/core/templates/RemoteTemplateService.java

Co-authored-by: Andrew Azores <me@andrewazor.es>
Signed-off-by: Joshua Matsuoka <Josh.matsuoka@gmail.com>
---
 .../cryostat/core/templates/RemoteTemplateService.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java b/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java
index 5e93e0be..69618178 100644
--- 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) {

From 1179619003c1ba282534f95b33b8508080303a3a Mon Sep 17 00:00:00 2001
From: jmatsuok <jmatsuok@redhat.com>
Date: Tue, 21 May 2024 12:27:13 -0400
Subject: [PATCH 3/3] Fix Typo

---
 .../core/templates/RemoteTemplateService.java | 51 +++++++++----------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java b/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java
index 69618178..958a9a82 100644
--- a/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java
+++ b/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java
@@ -33,7 +33,6 @@
 import io.cryostat.core.net.JFRConnection;
 
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.parser.Parser;
 import org.jsoup.select.Elements;
@@ -61,31 +60,31 @@ public Optional<String> getXml(String templateName, TemplateType type)
             return Optional.empty();
         }
         try {
-                    return conn.getService().getServerTemplates().stream()
-                            .map(xmlText -> Jsoup.parse(xmlText, "", Parser.xmlParser()))
-                            .filter(
-                                    doc -> {
-                                        Elements els = doc.getElementsByTag("configuration");
-                                        if (els.isEmpty()) {
-                                            throw new MalformedXMLException(
-                                                    "Document did not contain \"configuration\""
-                                                            + " element");
-                                        }
-                                        if (els.size() > 1) {
-                                            throw new MalformedXMLException(
-                                                    "Document contains multiple \"configuration\""
-                                                            + " elements");
-                                        }
-                                        Element configuration = els.first();
-                                        if (!configuration.hasAttr("label")) {
-                                            throw new MalformedXMLException(
-                                                    "Configuration element did not have \"label\""
-                                                            + " attribute");
-                                        }
-                                        return configuration.attr("label").equals(templateName);
-                                    })
-                             .map(doc -> document.toString())
-                            .findFirst();
+            return conn.getService().getServerTemplates().stream()
+                    .map(xmlText -> Jsoup.parse(xmlText, "", Parser.xmlParser()))
+                    .filter(
+                            doc -> {
+                                Elements els = doc.getElementsByTag("configuration");
+                                if (els.isEmpty()) {
+                                    throw new MalformedXMLException(
+                                            "Document did not contain \"configuration\""
+                                                    + " element");
+                                }
+                                if (els.size() > 1) {
+                                    throw new MalformedXMLException(
+                                            "Document contains multiple \"configuration\""
+                                                    + " elements");
+                                }
+                                Element configuration = els.first();
+                                if (!configuration.hasAttr("label")) {
+                                    throw new MalformedXMLException(
+                                            "Configuration element did not have \"label\""
+                                                    + " attribute");
+                                }
+                                return configuration.attr("label").equals(templateName);
+                            })
+                    .map(doc -> doc.toString())
+                    .findFirst();
         } catch (org.openjdk.jmc.flightrecorder.configuration.FlightRecorderException
                 | IOException
                 | ServiceNotAvailableException e) {