Log class name rather than requiring implementation from each class

oicr-gsi · Apr 22, 2024 · f0dc1c1 · f0dc1c1
1 parent e49c21d
commit f0dc1c1
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 51 deletions.
diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterAdded.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterAdded.java
@@ -13,9 +13,4 @@ protected <F> F convert(
       ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.added(start, end);
   }
-
-  @Override
-  protected String getName() {
-    return "Last generated by olive";
-  }
 }
diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterAddedAgo.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterAddedAgo.java
@@ -10,9 +10,4 @@ protected <F> F convert(
       long offset, ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.addedAgo(offset);
   }
-
-  @Override
-  protected String getOperation() {
-    return "Last generated by olive (ago)";
-  }
 }
diff --git a/...u-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCheckedAgo.java b/...u-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCheckedAgo.java
@@ -10,9 +10,4 @@ public <F> F convert(
       long offset, ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.checkedAgo(offset);
   }
-
-  @Override
-  protected String getOperation() {
-    return "Last run by scheduler (ago)";
-  }
 }
diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCreated.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCreated.java
@@ -13,9 +13,4 @@ public <F> F convert(
       ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.checked(start, end);
   }
-
-  @Override
-  protected String getName() {
-    return "created";
-  }
 }
diff --git a/...u-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCreatedAgo.java b/...u-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCreatedAgo.java
@@ -10,9 +10,4 @@ public <F> F convert(
       long offset, ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.createdAgo(offset);
   }
-
-  @Override
-  protected String getOperation() {
-    return "created (ago)";
-  }
 }
diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterExternal.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterExternal.java
@@ -13,9 +13,4 @@ public <F> F convert(
       ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.external(start, end);
   }
-
-  @Override
-  protected String getName() {
-    return "External Modification";
-  }
 }
diff --git a/...-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterExternalAgo.java b/...-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterExternalAgo.java
@@ -11,9 +11,4 @@ public <F> F convert(
       long offset, ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.externalAgo(offset);
   }
-
-  @Override
-  protected String getOperation() {
-    return "External Modification (ago)";
-  }
 }
diff --git a/...luginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChanged.java b/...luginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChanged.java
@@ -13,9 +13,4 @@ public <F> F convert(
       ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.statusChanged(start, end);
   }
-
-  @Override
-  protected String getName() {
-    return "last state change";
-  }
 }
diff --git a/...inapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChangedAgo.java b/...inapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChangedAgo.java
@@ -10,9 +10,4 @@ public <F> F convert(
       long offset, ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder) {
     return filterBuilder.statusChangedAgo(offset);
   }
-
-  @Override
-  protected String getOperation() {
-    return "Last status change";
-  }
 }
diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseAgoActionFilter.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseAgoActionFilter.java
@@ -46,9 +46,7 @@ public final void setOffset(long offset) {
   @Override
   public String toString() {
     StringBuilder writeOut = new StringBuilder();
-    writeOut.append(getOperation()).append(" filter of offset: ").append(offset);
+    writeOut.append(this.getClass()).append(" type filter of offset: ").append(offset);
     return writeOut.toString();
   }
-
-  protected abstract String getOperation();
 }
diff --git a/...mu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseRangeActionFilter.java b/...mu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseRangeActionFilter.java
@@ -70,14 +70,12 @@ public final void setStart(Long start) {
     this.start = start;
   }
 
-  protected abstract String getName();
-
   @Override
   public String toString() {
     StringBuilder writeOut = new StringBuilder();
     writeOut
         .append("Range filter of type: ")
-        .append(getName())
+        .append(this.getClass())
         .append(" between ")
         .append(start)
         .append(" and ")