Remove Java 8 usage to fix Android build

Author: mythz

src/AndroidClient/android/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

@@ -18,7 +18,6 @@
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.Parameter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -221,9 +220,9 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) {
                         if ("equals".equals(mi.getName()))
                             continue;
 
-                        Parameter[] args = mi.getParameters();
+                        Class[] args = mi.getParameterTypes();
 
-                        Class requestType = args[0].getType();
+                        Class requestType = args[0];
 
                         if (target.equals(requestType.getSimpleName())) {
                             Object request = !Utils.isNullOrEmpty(msg.getJson())
@@ -706,7 +705,7 @@ public ServerEventUser apply(HashMap<String, String> map) {
                         continue;
 
                     if (to.getMeta() == null)
-                        to.setMeta(new HashMap<>());
+                        to.setMeta(new HashMap<String,String>());
 
                     to.getMeta().put(entry.getKey(), entry.getValue());
                 }

src/AndroidClient/android/src/main/java/net/servicestack/client/sse/SingletonInstanceResolver.java

@@ -4,7 +4,6 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
 
 /**
  * Created by mythz on 2/12/2017.
@@ -16,15 +15,18 @@ public class SingletonInstanceResolver implements IResolver {
 
     @Override
     public Object TryResolve(Class cls) {
-        return cache.computeIfAbsent(cls, new Function<Class, Object>() {
-            @Override
-            public Object apply(Class aClass) {
-                try {
-                    return aClass.newInstance();
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
+        Object instance = cache.get(cls);
+
+        if (instance == null){
+            try {
+                Object newInstance = cls.newInstance();
+                instance = (instance = cache.putIfAbsent(cls, newInstance)) == null
+                        ? newInstance
+                        : instance;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
-        });
+        }
+        return instance;
     }
 }

src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

@@ -18,7 +18,6 @@
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.Parameter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -221,9 +220,9 @@ public void execute(ServerEventsClient client, ServerEventMessage msg) {
                         if ("equals".equals(mi.getName()))
                             continue;
 
-                        Parameter[] args = mi.getParameters();
+                        Class[] args = mi.getParameterTypes();
 
-                        Class requestType = args[0].getType();
+                        Class requestType = args[0];
 
                         if (target.equals(requestType.getSimpleName())) {
                             Object request = !Utils.isNullOrEmpty(msg.getJson())
@@ -706,7 +705,7 @@ public ServerEventUser apply(HashMap<String, String> map) {
                         continue;
 
                     if (to.getMeta() == null)
-                        to.setMeta(new HashMap<>());
+                        to.setMeta(new HashMap<String,String>());
 
                     to.getMeta().put(entry.getKey(), entry.getValue());
                 }

src/AndroidClient/client/src/main/java/net/servicestack/client/sse/SingletonInstanceResolver.java

@@ -4,7 +4,6 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
 
 /**
  * Created by mythz on 2/12/2017.
@@ -16,15 +15,18 @@ public class SingletonInstanceResolver implements IResolver {
 
     @Override
     public Object TryResolve(Class cls) {
-        return cache.computeIfAbsent(cls, new Function<Class, Object>() {
-            @Override
-            public Object apply(Class aClass) {
-                try {
-                    return aClass.newInstance();
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
+        Object instance = cache.get(cls);
+
+        if (instance == null){
+            try {
+                Object newInstance = cls.newInstance();
+                instance = (instance = cache.putIfAbsent(cls, newInstance)) == null
+                        ? newInstance
+                        : instance;
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
-        });
+        }
+        return instance;
     }
 }