Log class name instead of requiring implementation from all children

oicr-gsi · Apr 23, 2024 · 9b93bfa · 9b93bfa
1 parent d739767
commit 9b93bfa
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 112 deletions.
diff --git a/plugin-jira/src/main/java/ca/on/oicr/gsi/shesmu/jira/JiraConnection.java b/plugin-jira/src/main/java/ca/on/oicr/gsi/shesmu/jira/JiraConnection.java
@@ -62,16 +62,6 @@ protected Stream<Issue> fetch(String jql, Instant lastUpdated)
         throws URISyntaxException, IOException, InterruptedException {
       return search(jql, FIELDS).stream();
     }
-
-    @Override
-    protected String getKType() {
-      return "String";
-    }
-
-    @Override
-    protected String getVType() {
-      return "Stream<Issue>";
-    }
   }
 
   static class JiraActionFilter {

diff --git a/plugin-mongo/src/main/java/ca/on/oicr/gsi/shesmu/mongo/MongoServer.java b/plugin-mongo/src/main/java/ca/on/oicr/gsi/shesmu/mongo/MongoServer.java
@@ -56,16 +56,6 @@ public synchronized Optional<Integer> update(Configuration configuration) {
                   protected Optional<Object> fetch(Tuple key, Instant lastUpdated) {
                     return Optional.of(function.apply(definer.get().connection.get(), key));
                   }
-
-                  @Override
-                  protected String getKType() {
-                    return "Tuple";
-                  }
-
-                  @Override
-                  protected String getVType() {
-                    return "Optional<Object>";
-                  }
                 };
 
             @Override

diff --git a/plugin-sftp/src/main/java/ca/on/oicr/gsi/shesmu/sftp/SftpServer.java b/plugin-sftp/src/main/java/ca/on/oicr/gsi/shesmu/sftp/SftpServer.java
@@ -95,16 +95,6 @@ protected Optional<AlgebraicValue> fetch(Pair<Path, Boolean> fileName, Instant l
         throw e;
       }
     }
-
-    @Override
-    protected String getKType() {
-      return "Pair<Path, Boolean>";
-    }
-
-    @Override
-    protected String getVType() {
-      return "Optional<AlgebraicValue>";
-    }
   }
 
   static final ObjectMapper MAPPER = new ObjectMapper();

diff --git a/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/VidarrPlugin.java b/plugin-vidarr/src/main/java/ca/on/oicr/gsi/shesmu/vidarr/VidarrPlugin.java
@@ -120,16 +120,6 @@ protected Optional<Tuple> fetch(String id, Instant lastUpdated) throws Exception
       }
       return Optional.empty();
     }
-
-    @Override
-    protected String getKType() {
-      return "String";
-    }
-
-    @Override
-    protected String getVType() {
-      return "Optional<Tuple>";
-    }
   }
 
   private static final Imyhat EXTERNAL_KEY_TYPE =

diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/cache/KeyValueCache.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/cache/KeyValueCache.java
@@ -173,10 +173,7 @@ public final void ttl(int ttl) {
   public String toString() {
     StringBuilder writeOut = new StringBuilder();
     writeOut
-        .append("KeyValueCache of types ")
-        .append(getKType())
-        .append(" and ")
-        .append(getVType())
+        .append(this.getClass())
         .append(" with CACHES = ")
         .append(CACHES.entrySet())
         .append(", maxCount = ")
@@ -191,8 +188,4 @@ public String toString() {
         .append(ttl);
     return writeOut.toString();
   }
-
-  protected abstract String getKType();
-
-  protected abstract String getVType();
 }
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/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterAnd.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterAnd.java
@@ -11,9 +11,4 @@ public <F> F convert(
       ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder, Stream<F> filters) {
     return filterBuilder.and(filters);
   }
-
-  @Override
-  protected String getOperation() {
-    return "AND";
-  }
 }
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/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterOr.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterOr.java
@@ -12,9 +12,4 @@ public <F> F convert(
       ActionFilterBuilder<F, ActionState, String, Instant, Long> filterBuilder, Stream<F> filters) {
     return filterBuilder.or(filters);
   }
-
-  @Override
-  protected String getOperation() {
-    return "OR";
-  }
 }
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/...uginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseCollectionActionFilter.java b/...uginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseCollectionActionFilter.java
@@ -52,11 +52,9 @@ public String toString() {
     StringBuilder writeOut = new StringBuilder();
     writeOut
         .append("Collection Action Filter (")
-        .append(getOperation())
+        .append(this.getClass())
         .append(" of: ")
         .append(Arrays.toString(filters));
     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 ")