From 216a15c3d8eb8be86909f238d5fd9a4047ef2797 Mon Sep 17 00:00:00 2001
From: wentch <22250530@qq.com>
Date: Tue, 15 Dec 2015 16:24:32 +0800
Subject: [PATCH]

---
 src/org/redkale/util/ResourceFactory.java | 32 +++++++++++++----------
 src/org/redkale/util/Sheet.java           |  8 +++---
 src/org/redkale/util/Utility.java         |  6 ++++-
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/org/redkale/util/ResourceFactory.java b/src/org/redkale/util/ResourceFactory.java
index b22f997ae..d3af21809 100644
--- a/src/org/redkale/util/ResourceFactory.java
+++ b/src/org/redkale/util/ResourceFactory.java
@@ -29,11 +29,11 @@ public final class ResourceFactory {
 
     private static final ResourceFactory instance = new ResourceFactory(null);
 
-    private final ConcurrentHashMap<Type, Intercepter> interceptmap = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Type, Intercepter> interceptmap = new ConcurrentHashMap();
 
-    private final ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, ?>> store = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Class<?>, ConcurrentHashMap<String, ?>> store = new ConcurrentHashMap();
 
-    private final ConcurrentHashMap<Type, ConcurrentHashMap<String, ?>> gencstore = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Type, ConcurrentHashMap<String, ?>> gencstore = new ConcurrentHashMap();
 
     private ResourceFactory(ResourceFactory parent) {
         this.parent = parent;
@@ -71,7 +71,7 @@ public final class ResourceFactory {
     public <A> void register(final String name, final Class<? extends A> clazz, final A rs) {
         ConcurrentHashMap map = this.store.get(clazz);
         if (map == null) {
-            ConcurrentHashMap<String, A> sub = new ConcurrentHashMap<>();
+            ConcurrentHashMap<String, A> sub = new ConcurrentHashMap();
             sub.put(name, rs);
             store.put(clazz, sub);
         } else {
@@ -86,7 +86,7 @@ public final class ResourceFactory {
         }
         ConcurrentHashMap map = this.gencstore.get(clazz);
         if (map == null) {
-            ConcurrentHashMap<String, A> sub = new ConcurrentHashMap<>();
+            ConcurrentHashMap<String, A> sub = new ConcurrentHashMap();
             sub.put(name, rs);
             gencstore.put(clazz, sub);
         } else {
@@ -118,17 +118,19 @@ public final class ResourceFactory {
         return null;
     }
 
-    public <A> A findChild(String name, Class<? extends A> clazz) {
+    public <A> A findChild(final String name, final Class<? extends A> clazz) {
         A rs = find(name, clazz);
         if (rs != null) return rs;
-        Optional<Map.Entry<Class<?>, ConcurrentHashMap<String, ?>>> opt = this.store.entrySet().stream()
-                .filter(x -> clazz.isAssignableFrom(x.getKey()) && x.getValue().containsKey(name))
-                .findFirst();
-        return opt.isPresent() ? (A) opt.get().getValue().get(name) : null;
+        for (Map.Entry<Class<?>, ConcurrentHashMap<String, ?>> en : this.store.entrySet()) {  //不用forEach为兼容JDK 6
+            if (!clazz.isAssignableFrom(en.getKey())) continue;
+            Object v = en.getValue().get(name);
+            if (v != null) return (A) v;
+        }
+        return null;
     }
 
     public <A> Map<String, A> find(final Pattern reg, Class<? extends A> clazz, A exclude) {
-        Map<String, A> result = new LinkedHashMap<>();
+        Map<String, A> result = new LinkedHashMap();
         load(reg, clazz, exclude, result);
         return result;
     }
@@ -136,9 +138,11 @@ public final class ResourceFactory {
     private <A> void load(final Pattern reg, Class<? extends A> clazz, final A exclude, final Map<String, A> result) {
         ConcurrentHashMap<String, ?> map = this.store.get(clazz);
         if (map != null) {
-            map.forEach((x, y) -> {
+            for (Map.Entry<String, ?> en : map.entrySet()) {  // 不用forEach为兼容JDK 6
+                String x = en.getKey();
+                Object y = en.getValue();
                 if (y != exclude && reg.matcher(x).find() && result.get(x) == null) result.put(x, (A) y);
-            });
+            }
         }
         if (parent != null) parent.load(reg, clazz, exclude, result);
     }
@@ -148,7 +152,7 @@ public final class ResourceFactory {
     }
 
     public <T> boolean inject(final Object src, final T attachment) {
-        return inject(src, attachment, new ArrayList<>());
+        return inject(src, attachment, new ArrayList());
     }
 
     private <T> boolean inject(final Object src, final T attachment, final List<Object> list) {
diff --git a/src/org/redkale/util/Sheet.java b/src/org/redkale/util/Sheet.java
index bb906fa30..cd456cfd9 100644
--- a/src/org/redkale/util/Sheet.java
+++ b/src/org/redkale/util/Sheet.java
@@ -35,14 +35,14 @@ public class Sheet<T> implements java.io.Serializable {
     }
 
     public static <E> Sheet<E> asSheet(Collection<E> data) {
-        return data == null ? new Sheet<>() : new Sheet<>(data.size(), data);
+        return data == null ? new Sheet() : new Sheet(data.size(), data);
     }
 
     public Sheet<T> copyTo(Sheet<T> copy) {
         if (copy == null) return copy;
         copy.total = this.total;
         if (this.getRows() != null) {
-            copy.setRows(new ArrayList<>(this.getRows()));
+            copy.setRows(new ArrayList(this.getRows()));
         } else {
             copy.rows = null;
         }
@@ -80,8 +80,8 @@ public class Sheet<T> implements java.io.Serializable {
     }
 
     public List<T> list(boolean created) {
-        if (this.rows == null) return created ? new ArrayList<>() : null;
-        return (this.rows instanceof List) ? (List<T>) this.rows : new ArrayList<>(this.rows);
+        if (this.rows == null) return created ? new ArrayList() : null;
+        return (this.rows instanceof List) ? (List<T>) this.rows : new ArrayList(this.rows);
     }
 
     public void setRows(Collection<? extends T> data) {
diff --git a/src/org/redkale/util/Utility.java b/src/org/redkale/util/Utility.java
index 2ae1b6fbf..e5410b31a 100644
--- a/src/org/redkale/util/Utility.java
+++ b/src/org/redkale/util/Utility.java
@@ -523,7 +523,11 @@ public final class Utility {
         conn.setReadTimeout(3000);
         if (conn instanceof HttpsURLConnection) ((HttpsURLConnection) conn).setSSLSocketFactory((ctx == null ? DEFAULTSSL_CONTEXT : ctx).getSocketFactory());
         conn.setRequestMethod(method);
-        if (headers != null) headers.forEach((x, y) -> conn.setRequestProperty(x, y));
+        if (headers != null) {
+            for (Map.Entry<String, String> en : headers.entrySet()) { //不用forEach是为了兼容JDK 6
+                conn.setRequestProperty(en.getKey(), en.getValue());
+            }
+        }
         if (body != null) {
             conn.setDoInput(true);
             conn.setDoOutput(true);