#15: Rename class to reflect that class is abstract

levigo · Sep 16, 2015 · 297531d · 297531d
1 parent 6d77324
commit 297531d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/...erver/converterclient/gui/clusterhealth/ConfigureClusterHealthWarningsPaneController.java b/...erver/converterclient/gui/clusterhealth/ConfigureClusterHealthWarningsPaneController.java
@@ -8,7 +8,7 @@
 import org.controlsfx.validation.ValidationSupport;
 import org.levigo.jadice.server.converterclient.Preferences;
 import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.AverageExecutionTimeRule;
-import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.NumericRule;
+import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.AbstractNumericRule;
 import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.RecentAverageExecutionTimeRule;
 import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.RecentEfficiencyRule;
 import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.RecentFailureRateRule;
@@ -192,19 +192,19 @@ public ObjectProperty<ServerRunningRule> ruleProperty() {
     }
   }
 
-  private static class FloatRuleHandler<R extends NumericRule<Float>> extends SimpleRuleHandler<Float, R> {
+  private static class FloatRuleHandler<R extends AbstractNumericRule<Float>> extends SimpleRuleHandler<Float, R> {
     public FloatRuleHandler(Optional<R> existingRule, CheckBox checkbox, TextField valueField, Constructor<Float, R> constr) {
       super(existingRule, checkbox, valueField, Float::parseFloat, constr, new FloatValidator());
     }
   }
 
-  private static class LongRuleHandler<R extends NumericRule<Long>> extends SimpleRuleHandler<Long, R> {
+  private static class LongRuleHandler<R extends AbstractNumericRule<Long>> extends SimpleRuleHandler<Long, R> {
     public LongRuleHandler(Optional<R> existingRule, CheckBox checkbox, TextField valueField, Constructor<Long, R> constr) {
       super(existingRule, checkbox, valueField, Long::parseLong, constr, new LongValidator());
     }
   }
 
-  private static class SimpleRuleHandler<N extends Number & Comparable<N>, R extends NumericRule<N>> {
+  private static class SimpleRuleHandler<N extends Number & Comparable<N>, R extends AbstractNumericRule<N>> {
     private final ValidationSupport validationSupport = new ValidationSupport();
 
     private final CheckBox checkbox;
@@ -270,7 +270,7 @@ private static void registerValidator(TextField field, CheckBox cb, ValidationSu
   }
 
   @FunctionalInterface
-  private static interface Constructor<N extends Number & Comparable<N>, L extends NumericRule<N>> {
+  private static interface Constructor<N extends Number & Comparable<N>, L extends AbstractNumericRule<N>> {
     L create(N v);
   }
 

diff --git a/...t/gui/clusterhealth/rule/NumericRule.java → ...usterhealth/rule/AbstractNumericRule.java b/...t/gui/clusterhealth/rule/NumericRule.java → ...usterhealth/rule/AbstractNumericRule.java
@@ -9,7 +9,7 @@
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleBooleanProperty;
 
-public abstract class NumericRule<T extends Number & Comparable<T>> implements Rule<T>  {
+public abstract class AbstractNumericRule<T extends Number & Comparable<T>> implements Rule<T>  {
 
   interface ExceptionalFunction<T, R, E extends Exception>  {
     R apply(T t) throws E;

diff --git a/...levigo/jadice/server/converterclient/gui/clusterhealth/rule/AverageExecutionTimeRule.java b/...levigo/jadice/server/converterclient/gui/clusterhealth/rule/AverageExecutionTimeRule.java
@@ -8,7 +8,7 @@
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 
-public class AverageExecutionTimeRule extends NumericRule<Long> {
+public class AverageExecutionTimeRule extends AbstractNumericRule<Long> {
 
   private final Property<Long> limit;
 

diff --git a/.../jadice/server/converterclient/gui/clusterhealth/rule/RecentAverageExecutionTimeRule.java b/.../jadice/server/converterclient/gui/clusterhealth/rule/RecentAverageExecutionTimeRule.java
@@ -8,7 +8,7 @@
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 
-public class RecentAverageExecutionTimeRule extends NumericRule<Long> {
+public class RecentAverageExecutionTimeRule extends AbstractNumericRule<Long> {
 
   private final Property<Long> limit;
 

diff --git a/...org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/RecentEfficiencyRule.java b/...org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/RecentEfficiencyRule.java
@@ -8,7 +8,7 @@
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 
-public class RecentEfficiencyRule extends NumericRule<Float> {
+public class RecentEfficiencyRule extends AbstractNumericRule<Float> {
 
   private final Property<Float> limit;
 

diff --git a/...rg/levigo/jadice/server/converterclient/gui/clusterhealth/rule/RecentFailureRateRule.java b/...rg/levigo/jadice/server/converterclient/gui/clusterhealth/rule/RecentFailureRateRule.java
@@ -8,7 +8,7 @@
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 
-public class RecentFailureRateRule extends NumericRule<Float> {
+public class RecentFailureRateRule extends AbstractNumericRule<Float> {
 
   private final Property<Float> limit;
 

diff --git a/...org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/TotalFailureRateRule.java b/...org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/TotalFailureRateRule.java
@@ -8,7 +8,7 @@
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleObjectProperty;
 
-public class TotalFailureRateRule extends NumericRule<Float> {
+public class TotalFailureRateRule extends AbstractNumericRule<Float> {
 
   private final Property<Float> limit;
 

diff --git a/...jadice/server/converterclient/gui/clusterhealth/serialization/v1/ClusterHealthMapper.java b/...jadice/server/converterclient/gui/clusterhealth/serialization/v1/ClusterHealthMapper.java
@@ -3,7 +3,7 @@
 import java.lang.reflect.Constructor;
 
 import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.ImmutableBooleanRule;
-import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.NumericRule;
+import org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.AbstractNumericRule;
 import org.levigo.jadice.server.converterclient.gui.clusterhealth.serialization.Marshaller.ClusterHealthDTO;
 import org.levigo.jadice.server.converterclient.gui.clusterhealth.serialization.MarshallingException;
 
@@ -18,9 +18,9 @@ public ClusterHealth map(ClusterHealthDTO dto) throws MarshallingException {
     result.autoUpdateIntervall = dto.autoUpdateIntervall.get();
 
     for (org.levigo.jadice.server.converterclient.gui.clusterhealth.rule.Rule<?> rule : dto.rules) {
-      if (rule instanceof NumericRule<?>) {
+      if (rule instanceof AbstractNumericRule<?>) {
         Rule<Number> r = new Rule<>();
-        r.limit = ((NumericRule<?>) rule).getLimit();
+        r.limit = ((AbstractNumericRule<?>) rule).getLimit();
         r.implementation = rule.getClass().getName();
         result.rules.add(r);
       } else if (rule instanceof ImmutableBooleanRule) {
@@ -43,8 +43,8 @@ public ClusterHealthDTO unmap(ClusterHealth ch) throws MarshallingException {
     for (Rule<?> rule : ch.rules) {
       try {
         final Class<?> clazz = Class.forName(rule.implementation);
-        if (NumericRule.class.isAssignableFrom(clazz)) {
-          final NumericRule<?> r = unmarshallNumericRule(rule, clazz);
+        if (AbstractNumericRule.class.isAssignableFrom(clazz)) {
+          final AbstractNumericRule<?> r = unmarshallNumericRule(rule, clazz);
           result.rules.add(r);
         } else if (ImmutableBooleanRule.class.isAssignableFrom(clazz)) {
           final ImmutableBooleanRule r = unmarshallImmutableBooleanRule(clazz);
@@ -64,7 +64,7 @@ private ImmutableBooleanRule unmarshallImmutableBooleanRule(final Class<?> clazz
     return (ImmutableBooleanRule) clazz.newInstance();
   }
 
-  private NumericRule<?> unmarshallNumericRule(Rule<?> rule, final Class<?> clazz) throws ReflectiveOperationException, MarshallingException {
+  private AbstractNumericRule<?> unmarshallNumericRule(Rule<?> rule, final Class<?> clazz) throws ReflectiveOperationException, MarshallingException {
     Constructor<?> constr = null;
     for (Constructor<?> c : clazz.getConstructors()) {
       if (c.getParameterCount() != 1) {
@@ -76,7 +76,7 @@ private NumericRule<?> unmarshallNumericRule(Rule<?> rule, final Class<?> clazz)
     if (constr == null) {
       throw new MarshallingException("No matching constructor found for type " + rule.implementation);
     }
-    final NumericRule<?> r = (NumericRule<?>) constr.newInstance(castValue(constr.getParameterTypes()[0], rule.limit));
+    final AbstractNumericRule<?> r = (AbstractNumericRule<?>) constr.newInstance(castValue(constr.getParameterTypes()[0], rule.limit));
     return r;
   }