#15: On the way to a more functional design

levigo · Sep 15, 2015 · 048c64b · 048c64b
1 parent 56a7056
commit 048c64b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 5 deletions.
diff --git a/...levigo/jadice/server/converterclient/gui/clusterhealth/rule/AverageExecutionTimeRule.java b/...levigo/jadice/server/converterclient/gui/clusterhealth/rule/AverageExecutionTimeRule.java
@@ -11,7 +11,7 @@
 import javafx.beans.property.SimpleLongProperty;
 
 public class AverageExecutionTimeRule extends NumericRule<Long> {
-
+  
   private final LongProperty limit;
 
   public AverageExecutionTimeRule(long limit) {
@@ -31,7 +31,7 @@ public Property<Number> limitProperty() {
   @Override
   public EvaluationResult<Long> evaluate(MBeanServerConnection mbsc) {
     try {
-      final long execTime = JmxHelper.getAverageExecutionTime(mbsc);
+      final long execTime = jmxFunction().apply(mbsc);
       if (execTime <= limit.get()) {
         return new EvaluationResult<Long>(HealthStatus.GOOD, execTime);
       } else {
@@ -56,4 +56,9 @@ public boolean equals(Object other) {
   public String toString() {
     return String.format("Average Excecution Time of %d ms", getLimit());
   }
+
+  @Override
+  protected ExceptionalFunction<MBeanServerConnection, Long, JMException> jmxFunction() {
+    return JmxHelper::getAverageExecutionTime;
+  }
 }
diff --git a/...ain/java/org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/NumericRule.java b/...ain/java/org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/NumericRule.java
@@ -1,13 +1,22 @@
 package org.levigo.jadice.server.converterclient.gui.clusterhealth.rule;
 
+import javax.management.JMException;
+import javax.management.MBeanServerConnection;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.Property;
 import javafx.beans.property.SimpleBooleanProperty;
 
 public abstract class NumericRule<T extends Number> implements Rule<T>  {
 
+  interface ExceptionalFunction<T, R, E extends Exception>  {
+    R apply(T t) throws E;
+  }
+
   private BooleanProperty enabledProperty = new SimpleBooleanProperty(true);
 
+  abstract public EvaluationResult<T> evaluate(MBeanServerConnection mbsc);
+
   abstract Property<Number> limitProperty();
 
   @Override
@@ -23,4 +32,6 @@ public void setLimit(Number value) {
     limitProperty().setValue(value);
   }
 
+  abstract protected ExceptionalFunction<MBeanServerConnection, T, JMException> jmxFunction();
+
 }
diff --git a/.../jadice/server/converterclient/gui/clusterhealth/rule/RecentAverageExecutionTimeRule.java b/.../jadice/server/converterclient/gui/clusterhealth/rule/RecentAverageExecutionTimeRule.java
@@ -31,7 +31,7 @@ public Property<Number> limitProperty() {
   @Override
   public EvaluationResult<Long> evaluate(MBeanServerConnection mbsc) {
     try {
-      final long execTime = JmxHelper.getRecentAverageExecutionTime(mbsc);
+      final long execTime = jmxFunction().apply(mbsc);
       if (execTime <= limit.get()) {
         return new EvaluationResult<Long>(HealthStatus.GOOD, execTime);
       } else {
@@ -57,4 +57,9 @@ public boolean equals(Object other) {
   public String toString() {
     return String.format("Recent Average Excecution Time of %d ms", getLimit());
   }
+
+  @Override
+  protected ExceptionalFunction<MBeanServerConnection, Long, JMException> jmxFunction() {
+    return JmxHelper::getRecentAverageExecutionTime;
+  }
 }
diff --git a/...org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/RecentEfficiencyRule.java b/...org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/RecentEfficiencyRule.java
@@ -31,7 +31,7 @@ public Property<Number> limitProperty() {
   @Override
   public EvaluationResult<Float> evaluate(MBeanServerConnection mbsc) {
     try {
-      final float eff = JmxHelper.getEfficiency10Min(mbsc);
+      final float eff = jmxFunction().apply(mbsc);
       if (eff <= limit.get()) {
         return new EvaluationResult<Float>(HealthStatus.GOOD, eff);
       } else {
@@ -56,4 +56,9 @@ public boolean equals(Object other) {
   public String toString() {
     return String.format("Recent Efficiency of %f", getLimit());
   }
+
+  @Override
+  protected ExceptionalFunction<MBeanServerConnection, Float, JMException> jmxFunction() {
+    return JmxHelper::getEfficiency10Min;
+  }
 }
diff --git a/...rg/levigo/jadice/server/converterclient/gui/clusterhealth/rule/RecentFailureRateRule.java b/...rg/levigo/jadice/server/converterclient/gui/clusterhealth/rule/RecentFailureRateRule.java
@@ -31,7 +31,7 @@ public Property<Number> limitProperty() {
   @Override
   public EvaluationResult<Float> evaluate(MBeanServerConnection mbsc) {
     try {
-      final float rate = JmxHelper.getRecentFailureRate(mbsc);
+      final float rate = jmxFunction().apply(mbsc);
       if (rate <= limit.get()) {
         return new EvaluationResult<Float>(HealthStatus.GOOD, rate);
       } else {
@@ -56,4 +56,9 @@ public boolean equals(Object other) {
   public String toString() {
     return String.format("Recent Failure Rate of %f", getLimit());
   }
+
+  @Override
+  protected ExceptionalFunction<MBeanServerConnection, Float, JMException> jmxFunction() {
+    return JmxHelper::getRecentFailureRate;
+  }
 }
diff --git a/...org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/TotalFailureRateRule.java b/...org/levigo/jadice/server/converterclient/gui/clusterhealth/rule/TotalFailureRateRule.java
@@ -56,4 +56,10 @@ public boolean equals(Object other) {
   public String toString() {
     return String.format("Failure Rate of %f", getLimit());
   }
+
+  @Override
+  protected ExceptionalFunction<MBeanServerConnection, Float, JMException> jmxFunction() {
+    return JmxHelper::getTotalFailureRate;
+  }
+
 }