Revert "Move ReflectionUtil to org.bouncycastle.tls"

This reverts commit bd28358.

Author: peterdettman

…org/bouncycastle/tls/ReflectionUtil.java …castle/jsse/provider/ReflectionUtil.javatls/src/main/java/org/bouncycastle/tls/ReflectionUtil.java renamed to tls/src/main/java/org/bouncycastle/jsse/provider/ReflectionUtil.java tls/src/main/java/org/bouncycastle/tls/ReflectionUtil.java renamed to tls/src/main/java/org/bouncycastle/jsse/provider/ReflectionUtil.java

@@ -1,4 +1,4 @@
-package org.bouncycastle.tls;
+package org.bouncycastle.jsse.provider;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -7,9 +7,9 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-public abstract class ReflectionUtil
+class ReflectionUtil
 {
-    public static Method findMethod(Method[] methods, String name)
+    static Method findMethod(Method[] methods, String name)
     {
         if (methods != null)
         {
@@ -24,12 +24,13 @@ public static Method findMethod(Method[] methods, String name)
         return null;
     }
 
-    public static boolean hasMethod(Method[] methods, String name)
+    static boolean hasMethod(Method[] methods, String name)
     {
         return null != findMethod(methods, name);
     }
 
-    public static Class<?> getClass(final String className)
+
+    static Class<?> getClass(final String className)
     {
         if (null == className)
         {
@@ -57,7 +58,7 @@ public Class<?> run()
         });
     }
 
-    public static <T> Constructor<T> getDeclaredConstructor(final String className, final Class<?>... parameterTypes)
+    static <T> Constructor<T> getDeclaredConstructor(final String className, final Class<?>... parameterTypes)
     {
         if (null == className)
         {
@@ -89,7 +90,7 @@ public Constructor<T> run()
         });
     }
 
-    public static Method getMethod(final String className, final String methodName, final Class<?>... parameterTypes)
+    static Method getMethod(final String className, final String methodName, final Class<?>... parameterTypes)
     {
         if (null == className || null == methodName)
         {
@@ -121,7 +122,7 @@ public Method run()
         });
     }
 
-    public static Method[] getMethods(final String className)
+    static Method[] getMethods(final String className)
     {
         if (null == className)
         {
@@ -153,7 +154,7 @@ public Method[] run()
         });
     }
 
-    public static Integer getStaticInt(final String className, final String fieldName)
+    static Integer getStaticInt(final String className, final String fieldName)
     {
         return AccessController.doPrivileged(new PrivilegedAction<Integer>()
         {
@@ -188,18 +189,18 @@ public Integer run()
         });
     }
 
-    public static Integer getStaticIntOrDefault(final String className, final String fieldName, int defaultValue)
+    static Integer getStaticIntOrDefault(final String className, final String fieldName, int defaultValue)
     {
         Integer value = getStaticInt(className, fieldName);
         return null == value ? defaultValue : value.intValue();
     }
 
-    public static Object invokeGetter(final Object obj, final Method method)
+    static Object invokeGetter(final Object obj, final Method method)
     {
         return invokeMethod(obj, method);
     }
 
-    public static Object invokeMethod(final Object obj, final Method method, final Object... args)
+    static Object invokeMethod(final Object obj, final Method method, final Object... args)
     {
         return AccessController.doPrivileged(new PrivilegedAction<Object>()
         {
@@ -221,7 +222,7 @@ public Object run()
         });
     }
 
-    public static void invokeSetter(final Object obj, final Method method, final Object arg)
+    static void invokeSetter(final Object obj, final Method method, final Object arg)
     {
         invokeMethod(obj, method, arg);
     }

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/IDNUtil.java

@@ -2,8 +2,6 @@
 
 import java.lang.reflect.Method;
 
-import org.bouncycastle.tls.ReflectionUtil;
-
 public class IDNUtil
 {
     public static final int ALLOW_UNASSIGNED;

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/KeyStoreUtil.java

@@ -7,8 +7,6 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 
-import org.bouncycastle.tls.ReflectionUtil;
-
 abstract class KeyStoreUtil
 {
     private static final Method getProtectionAlgorithm;

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/PKIXUtil.java

@@ -5,8 +5,6 @@
 import java.security.cert.X509Certificate;
 import java.util.Map;
 
-import org.bouncycastle.tls.ReflectionUtil;
-
 abstract class PKIXUtil
 {
     private static final Class<?> pkixRevocationCheckerClass;

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLEngineUtil.java

@@ -9,7 +9,6 @@
 import org.bouncycastle.jsse.BCExtendedSSLSession;
 import org.bouncycastle.jsse.BCSSLEngine;
 import org.bouncycastle.jsse.BCSSLParameters;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLEngineUtil
 {

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLParametersUtil.java

@@ -10,7 +10,6 @@
 import org.bouncycastle.jsse.BCSNIServerName;
 import org.bouncycastle.jsse.BCSSLParameters;
 import org.bouncycastle.jsse.java.security.BCAlgorithmConstraints;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLParametersUtil
 {

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLSessionUtil.java

@@ -6,7 +6,6 @@
 import javax.net.ssl.SSLSession;
 
 import org.bouncycastle.jsse.BCExtendedSSLSession;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLSessionUtil
 {

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLSocketUtil.java

@@ -15,7 +15,6 @@
 import org.bouncycastle.jsse.BCExtendedSSLSession;
 import org.bouncycastle.jsse.BCSSLParameters;
 import org.bouncycastle.jsse.BCSSLSocket;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLSocketUtil
 {

tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/X509TrustManagerUtil.java

@@ -8,7 +8,6 @@
 
 import org.bouncycastle.jcajce.util.JcaJceHelper;
 import org.bouncycastle.jsse.BCX509ExtendedTrustManager;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class X509TrustManagerUtil
 {

tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/SSLParametersUtil.java

@@ -13,7 +13,6 @@
 import org.bouncycastle.jsse.BCSNIServerName;
 import org.bouncycastle.jsse.BCSSLParameters;
 import org.bouncycastle.jsse.java.security.BCAlgorithmConstraints;
-import org.bouncycastle.tls.ReflectionUtil;
 
 abstract class SSLParametersUtil
 {