remove default implementations from interface

cryostatio · Apr 23, 2024 · 299c2a5 · 299c2a5
1 parent dd34820
commit 299c2a5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/src/main/java/io/cryostat/reports/MemoryCachingReportsService.java b/src/main/java/io/cryostat/reports/MemoryCachingReportsService.java
@@ -98,4 +98,14 @@ public Uni<Map<String, AnalysisResult>> reportFor(
                     return delegate.reportFor(jvmId, filename);
                 });
     }
+
+    @Override
+    public Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording) {
+        return reportFor(recording, r -> true);
+    }
+
+    @Override
+    public Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename) {
+        return reportFor(jvmId, filename, r -> true);
+    }
 }
diff --git a/src/main/java/io/cryostat/reports/ReportsService.java b/src/main/java/io/cryostat/reports/ReportsService.java
@@ -29,16 +29,12 @@ public interface ReportsService {
     Uni<Map<String, AnalysisResult>> reportFor(
             ActiveRecording recording, Predicate<IRule> predicate);
 
-    default Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording) {
-        return reportFor(recording, r -> true);
-    }
+    Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording);
 
     Uni<Map<String, AnalysisResult>> reportFor(
             String jvmId, String filename, Predicate<IRule> predicate);
 
-    default Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename) {
-        return reportFor(jvmId, filename, r -> true);
-    }
+    Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename);
 
     static String key(ActiveRecording recording) {
         return String.format("%s/%d", recording.target.jvmId, recording.id);

diff --git a/src/main/java/io/cryostat/reports/ReportsServiceImpl.java b/src/main/java/io/cryostat/reports/ReportsServiceImpl.java
@@ -115,6 +115,16 @@ public Uni<Map<String, AnalysisResult>> reportFor(
         return Uni.createFrom().future(future);
     }
 
+    @Override
+    public Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording) {
+        return reportFor(recording, r -> true);
+    }
+
+    @Override
+    public Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename) {
+        return reportFor(jvmId, filename, r -> true);
+    }
+
     private Future<Map<String, AnalysisResult>> process(
             InputStream stream, Predicate<IRule> predicate) {
         return reportGenerator.generateEvalMapInterruptibly(

diff --git a/src/main/java/io/cryostat/reports/StorageCachingReportsService.java b/src/main/java/io/cryostat/reports/StorageCachingReportsService.java
@@ -157,4 +157,14 @@ private Uni<Map<String, AnalysisResult>> getStorage(String key) {
                             }
                         });
     }
+
+    @Override
+    public Uni<Map<String, AnalysisResult>> reportFor(ActiveRecording recording) {
+        return reportFor(recording, r -> true);
+    }
+
+    @Override
+    public Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename) {
+        return reportFor(jvmId, filename, r -> true);
+    }
 }