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 index e60e9d45e..9f24f324d 100644 --- 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 convert( ActionFilterBuilder 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 index 4f5c7dc1e..159bbb64e 100644 --- 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 convert( long offset, ActionFilterBuilder 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/ActionFilterCheckedAgo.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCheckedAgo.java index 81efea2ce..6d13fd77a 100644 --- a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCheckedAgo.java +++ b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCheckedAgo.java @@ -10,9 +10,4 @@ public F convert( long offset, ActionFilterBuilder 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 index e6967a148..7130782d1 100644 --- 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 convert( ActionFilterBuilder filterBuilder) { return filterBuilder.checked(start, end); } - - @Override - protected String getName() { - return "created"; - } } diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCreatedAgo.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCreatedAgo.java index dde9aca5f..d6aafe0dc 100644 --- a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCreatedAgo.java +++ b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterCreatedAgo.java @@ -10,9 +10,4 @@ public F convert( long offset, ActionFilterBuilder 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 index b5c7e9593..98a7f56b4 100644 --- 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 convert( ActionFilterBuilder filterBuilder) { return filterBuilder.external(start, end); } - - @Override - protected String getName() { - return "External Modification"; - } } diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterExternalAgo.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterExternalAgo.java index 39a5d76b6..33869eff5 100644 --- a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterExternalAgo.java +++ b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterExternalAgo.java @@ -11,9 +11,4 @@ public F convert( long offset, ActionFilterBuilder 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/ActionFilterStatusChanged.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChanged.java index af69fb570..f1110aa2a 100644 --- a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChanged.java +++ b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChanged.java @@ -13,9 +13,4 @@ public F convert( ActionFilterBuilder filterBuilder) { return filterBuilder.statusChanged(start, end); } - - @Override - protected String getName() { - return "last state change"; - } } diff --git a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChangedAgo.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChangedAgo.java index ba54f418a..dde341f05 100644 --- a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChangedAgo.java +++ b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/ActionFilterStatusChangedAgo.java @@ -10,9 +10,4 @@ public F convert( long offset, ActionFilterBuilder 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 index 875d48c76..0b58db3bd 100644 --- 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/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseRangeActionFilter.java b/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseRangeActionFilter.java index 2b27edfff..25f80247e 100644 --- a/shesmu-pluginapi/src/main/java/ca/on/oicr/gsi/shesmu/plugin/filter/BaseRangeActionFilter.java +++ b/shesmu-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 ")