svn commit: r1596193 - in /incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor: MonitorUtils.java ProbeFailedException.java ProbeInterruptedException.java

[st...@apache.org]

Author: stevel
Date: Tue May 20 11:05:14 2014
New Revision: 1596193

URL: http://svn.apache.org/r1596193
Log:
quick cleanup of probe code (not currently live)

Modified:
    incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java
    incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java
    incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java

Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java?rev=1596193&r1=1596192&r2=1596193&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java Tue May 20 11:05:14 2014
@@ -50,7 +50,7 @@ public final class MonitorUtils {
    * @return a list view with no empty strings
    */
   public static List<String> prepareArgs(String[] args) {
-    List<String> argsList = new ArrayList<String>(args.length);
+    List<String> argsList = new ArrayList<>(args.length);
     StringBuilder argsStr = new StringBuilder("Arguments: [");
     for (String arg : args) {
       argsStr.append('"').append(arg).append("\" ");
@@ -64,49 +64,6 @@ public final class MonitorUtils {
   }
 
   /**
-   * convert the system properties to a buffer for printing
-   * @return a multi-line list of key-value pairs
-   */
-  public static String dumpSystemProperties() {
-    TreeSet<String> keys = new TreeSet<String>();
-    for (Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
-      keys.add(entry.getKey().toString());
-    }
-    StringBuilder builder = new StringBuilder();
-    for (String key : keys) {
-      builder
-        .append("  ")
-        .append(key)
-        .append('=')
-        .append(System.getProperty(key))
-        .append('\n');
-    }
-    return builder.toString();
-  }
-
-  /**
-   * Dump the system environment
-   * @return the environment
-   */
-  public static String dumpEnv() {
-    Map<String, String> env = System.getenv();
-    TreeSet<String> keys = new TreeSet<String>();
-    for (Map.Entry<String, String> entry : env.entrySet()) {
-      keys.add(entry.getKey());
-    }
-    StringBuilder builder = new StringBuilder();
-    for (String key : keys) {
-      builder
-        .append("  ")
-        .append(key)
-        .append('=')
-        .append(env.get(key))
-        .append('\n');
-    }
-    return builder.toString();
-  }
-
-  /**
    * Convert milliseconds to human time -the exact format is unspecified
    * @param milliseconds a time in milliseconds
    * @return a time that is converted to human intervals

Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java?rev=1596193&r1=1596192&r2=1596193&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeFailedException.java Tue May 20 11:05:14 2014
@@ -25,7 +25,7 @@ public class ProbeFailedException extend
   public final ProbeStatus status;
 
   public ProbeFailedException(String text, ProbeStatus status) {
-    super((text == null ? "" : (text + ": ")) + status, status.getThrown());
+    super((text == null ? "Probe Failed" : (text + ": ")) + status, status.getThrown());
     this.status = status;
   }
 

Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java?rev=1596193&r1=1596192&r2=1596193&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/servicemonitor/ProbeInterruptedException.java Tue May 20 11:05:14 2014
@@ -22,4 +22,8 @@ package org.apache.slider.server.service
  *
  */
 public class ProbeInterruptedException extends Exception {
+
+  public ProbeInterruptedException() {
+    super("Probe Interrupted");
+  }
 }