chore(templates): Remove Local and Merged template services (#376)

cryostatio · Apr 30, 2024 · 7211daa · 7211daa
1 parent ade9b4b
commit 7211daa
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 618 deletions.
diff --git a/src/main/java/io/cryostat/core/net/JFRJMXConnection.java b/src/main/java/io/cryostat/core/net/JFRJMXConnection.java
@@ -55,7 +55,7 @@
 import io.cryostat.core.sys.Clock;
 import io.cryostat.core.sys.Environment;
 import io.cryostat.core.sys.FileSystem;
-import io.cryostat.core.templates.MergedTemplateService;
+import io.cryostat.core.templates.RemoteTemplateService;
 import io.cryostat.core.templates.TemplateService;
 import io.cryostat.core.tui.ClientWriter;
 
@@ -110,7 +110,7 @@ public synchronized CryostatFlightRecorderService getService()
     }
 
     public TemplateService getTemplateService() {
-        return new MergedTemplateService(this, fs, env);
+        return new RemoteTemplateService(this);
     }
 
     public synchronized long getApproximateServerTime(Clock clock) {

diff --git a/src/main/java/io/cryostat/core/templates/LocalStorageTemplateService.java b/src/main/java/io/cryostat/core/templates/LocalStorageTemplateService.java
diff --git a/src/main/java/io/cryostat/core/templates/MergedTemplateService.java b/src/main/java/io/cryostat/core/templates/MergedTemplateService.java