#11 Get rid of reflection for Java8Process.

zeroturnaround · Dec 8, 2017 · a8a8230 · a8a8230
1 parent 9ce0c0d
commit a8a8230
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 57 deletions.
diff --git a/java8/src/main/java/org/zeroturnaround/process/Java8Process.java b/java8/src/main/java/org/zeroturnaround/process/Java8Process.java
@@ -1,6 +1,5 @@
 package org.zeroturnaround.process;
 
-import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
@@ -20,25 +19,6 @@ public class Java8Process extends JavaProcess {
 
   private static final Logger log = LoggerFactory.getLogger(Java8Process.class);
 
-  /**
-   * <code>public Process destroyForcibly()</code>
-   */
-  private static final Method METHOD_DESTROY_FORCIBLY = getMethod("destroyForcibly");
-
-  /**
-   * <code>public boolean isAlive()</code>
-   */
-  private static final Method METHOD_IS_ALIVE = getMethod("isAlive");
-
-  /**
-   * <code>public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException</code>
-   */
-  private static final Method METHOD_WAIT_FOR_TIMEOUT = getMethod("waitFor", long.class, TimeUnit.class);
-
-  public static boolean isSupported() {
-    return METHOD_DESTROY_FORCIBLY != null;
-  }
-
   public Java8Process(Process process) {
     super(process);
   }
@@ -69,19 +49,15 @@ protected void invokeDestroy(boolean forceful) {
   // Process methods in Java 8
 
   public Process invokeDestroyForcibly() {
-    return (Process) ReflectionUtil.invokeWithoutDeclaredExceptions(METHOD_DESTROY_FORCIBLY, process);
+    return process.destroyForcibly();
   }
 
   public boolean isAlive() {
-    return (Boolean) ReflectionUtil.invokeWithoutDeclaredExceptions(METHOD_IS_ALIVE, process);
+    return process.isAlive();
   }
 
   public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException {
-    return (Boolean) ReflectionUtil.invokeWithInterruptedException(METHOD_WAIT_FOR_TIMEOUT, process, timeout, unit);
-  }
-
-  private static Method getMethod(String name, Class<?>... parameterTypes) {
-    return ReflectionUtil.getMethodOrNull(Process.class, name, parameterTypes);
+    return process.waitFor(timeout, unit);
   }
 
 }
diff --git a/src/main/java/org/zeroturnaround/process/Processes.java b/src/main/java/org/zeroturnaround/process/Processes.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 
+import org.apache.commons.lang3.JavaVersion;
 import org.apache.commons.lang3.SystemUtils;
 
 /**
@@ -41,8 +42,9 @@ public static org.zeroturnaround.process.SystemProcess newStandardProcess(Proces
    * @return system process that represents the given input as described above.
    */
   public static JavaProcess newJavaProcess(Process process) {
-    if (Java8Process.isSupported())
+    if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)) {
       return new Java8Process(process);
+    }
     return new JavaProcess(process);
   }
 

diff --git a/...eroturnaround/process/ReflectionUtil.java → ...eroturnaround/process/ReflectionUtil.java b/...eroturnaround/process/ReflectionUtil.java → ...eroturnaround/process/ReflectionUtil.java
@@ -4,16 +4,11 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.UndeclaredThrowableException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Helper methods for Reflection API.
  */
 class ReflectionUtil {
 
-  private static final Logger log = LoggerFactory.getLogger(ReflectionUtil.class);
-
   public static Object invokeWithoutDeclaredExceptions(Method method, Object target, Object... args) {
     try {
       return doInvoke(method, target, args);
@@ -23,18 +18,6 @@ public static Object invokeWithoutDeclaredExceptions(Method method, Object targe
     }
   }
 
-  public static Object invokeWithInterruptedException(Method method, Object target, Object... args) throws InterruptedException {
-    try {
-      return doInvoke(method, target, args);
-    }
-    catch (InterruptedException e) {
-      throw e;
-    }
-    catch (Throwable t) {
-      throw uncheck(t);
-    }
-  }
-
   private static Object doInvoke(Method method, Object target, Object... args) throws Throwable {
     try {
       return method.invoke(target, args);
@@ -54,14 +37,4 @@ private static RuntimeException uncheck(Throwable t) {
     throw new UndeclaredThrowableException(t);
   }
 
-  public static Method getMethodOrNull(Class<?> klass, String name, Class<?>... parameterTypes) {
-    try {
-      return klass.getMethod(name, parameterTypes);
-    }
-    catch (Exception e) {
-      log.trace("Could not find {} method {}", klass, name);
-      return null;
-    }
-  }
-
 }
diff --git a/src/test/java/org/zeroturnaround/process/test/BaseKillerTest.java b/src/test/java/org/zeroturnaround/process/test/BaseKillerTest.java
@@ -6,11 +6,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.apache.commons.lang3.JavaVersion;
 import org.apache.commons.lang3.SystemUtils;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.rules.TestRule;
-import org.zeroturnaround.process.Java8Process;
 import org.zeroturnaround.process.JavaProcess;
 import org.zeroturnaround.process.SystemProcess;
 
@@ -28,7 +28,7 @@ protected static boolean isDestroyGracefullySupported(SystemProcess process) {
   }
 
   protected static boolean isDestroyForcefullySupported(SystemProcess process) {
-    return SystemUtils.IS_OS_WINDOWS || !(process instanceof JavaProcess) || Java8Process.isSupported();
+    return SystemUtils.IS_OS_WINDOWS || !(process instanceof JavaProcess) || SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8);
   }
 
   /**