map使用entrySet方式

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpClient.java

@@ -7,7 +7,6 @@ import java.net.HttpURLConnection;
 import java.net.Proxy;
 import java.net.URI;
 import java.net.URLConnection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -119,9 +118,8 @@ public class SimpleHttpClient extends AbstractHttpClient implements HttpClient {
 			}
 			logger.debug("request >> " + request.getMethod() + " "
 					+ request.getURI().toString());
-			for (Iterator<Entry<String, List<String>>> headerIterator = headers
+			for (Entry<String, List<String>> header : headers
-					.entrySet().iterator(); headerIterator.hasNext();) {
+					.entrySet()) {
-				Entry<String, List<String>> header = headerIterator.next();
 				if (HttpHeaders.COOKIE.equalsIgnoreCase(header.getKey())) {
 					connection.setRequestProperty(header.getKey(),
 							StringUtil.join(header.getValue(), ';'));
@@ -173,10 +171,8 @@ public class SimpleHttpClient extends AbstractHttpClient implements HttpClient {
 			response = new SimpleHttpResponse(connection, content);
 			logger.debug("response << " + response.getProtocol()
 					+ response.getStatus().toString());
-			for (Iterator<Entry<String, List<String>>> headerIterator = response
+			for (Entry<String, List<String>> header : response
-					.getHeaders().entrySet().iterator(); headerIterator
+					.getHeaders().entrySet()) {
-					.hasNext();) {
-				Entry<String, List<String>> header = headerIterator.next();
 				logger.debug("headers << " + header.getKey() + ":"
 						+ StringUtil.join(header.getValue(), ';'));
 			}

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpResponse.java

@@ -2,7 +2,6 @@ package com.foxinmy.weixin4j.http;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -55,9 +54,8 @@ public class SimpleHttpResponse extends AbstractHttpResponse {
 			headers = new HttpHeaders();
 			Map<String, List<String>> headerFields = connection
 					.getHeaderFields();
-			for (Iterator<Entry<String, List<String>>> headerIterator = headerFields
+			for (Entry<String, List<String>> headerEntry : headerFields
-					.entrySet().iterator(); headerIterator.hasNext();) {
+					.entrySet()) {
-				Entry<String, List<String>> headerEntry = headerIterator.next();
 				headers.put(headerEntry.getKey(), headerEntry.getValue());
 			}
 		}

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3.java

@@ -7,7 +7,6 @@ import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.Socket;
 import java.net.UnknownHostException;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -144,9 +143,8 @@ public class HttpComponent3 extends AbstractHttpClient {
 			if (!headers.containsKey(HttpHeaders.USER_AGENT)) {
 				headers.set(HttpHeaders.USER_AGENT, "apache/httpclient3");
 			}
-			for (Iterator<Entry<String, List<String>>> headerIterator = headers
+			for (Entry<String, List<String>> header : headers
-					.entrySet().iterator(); headerIterator.hasNext();) {
+					.entrySet()) {
-				Entry<String, List<String>> header = headerIterator.next();
 				if (HttpHeaders.COOKIE.equalsIgnoreCase(header.getKey())) {
 					httpMethod.setRequestHeader(header.getKey(),
 							StringUtil.join(header.getValue(), ';'));

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4.java

@@ -3,7 +3,6 @@ package com.foxinmy.weixin4j.http.factory;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -78,9 +77,8 @@ public abstract class HttpComponent4 extends AbstractHttpClient {
 		if (!headers.containsKey(HttpHeaders.USER_AGENT)) {
 			headers.set(HttpHeaders.USER_AGENT, "apache/httpclient4");
 		}
-		for (Iterator<Entry<String, List<String>>> headerIterator = headers
+		for (Entry<String, List<String>> header : headers
-				.entrySet().iterator(); headerIterator.hasNext();) {
+				.entrySet()) {
-			Entry<String, List<String>> header = headerIterator.next();
 			if (HttpHeaders.COOKIE.equalsIgnoreCase(header.getKey())) {
 				uriRequest.setHeader(header.getKey(),
 						StringUtil.join(header.getValue(), ';'));

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClient.java

@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
@@ -184,9 +183,8 @@ public class Netty4HttpClient extends AbstractHttpClient {
 		if (!headers.containsKey(HttpHeaders.USER_AGENT)) {
 			headers.set(HttpHeaders.USER_AGENT, "netty/httpclient");
 		}
-		for (Iterator<Entry<String, List<String>>> headerIterator = headers
+		for (Entry<String, List<String>> header : headers
-				.entrySet().iterator(); headerIterator.hasNext();) {
+				.entrySet()) {
-			Entry<String, List<String>> header = headerIterator.next();
 			uriRequest.headers().set(header.getKey(), header.getValue());
 		}
 		uriRequest.headers().set(HttpHeaders.ACCEPT_CHARSET, "utf-8");

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/WeixinRequestExecutor.java

@@ -104,7 +104,7 @@ public class WeixinRequestExecutor {
 			HttpHeaders headers = httpResponse.getHeaders();
 			WeixinResponse response = new WeixinResponse(httpResponse);
 			logger.info("weixin response << " + httpResponse.getProtocol()
-					+ httpResponse.getStatus().toString() + " "
+					+ httpResponse.getStatus().toString() + ":"
 					+ response.getAsString());
 			String contentType = headers.getFirst(HttpHeaders.CONTENT_TYPE);
 			String disposition = headers

weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/Sort.java

@@ -3,11 +3,9 @@ package com.foxinmy.weixin4j.model;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 public class Sort implements Serializable {
 
@@ -15,8 +13,10 @@ public class Sort implements Serializable {
 
 	public static final Direction DEFAULT_DIRECTION = Direction.ASC;
 	private Map<Direction, List<String>> orders;
+
 	public Sort() {
 	}
+
 	public Sort(String... properties) {
 		this(DEFAULT_DIRECTION, properties);
 	}
@@ -39,17 +39,7 @@ public class Sort implements Serializable {
 	public Map<Direction, List<String>> getOrders() {
 		return orders;
 	}
-	public Map.Entry<String, String> getFirst() {
+
-		if (hasSort()) {
-			Entry<Direction, List<String>> firstEntry = orders.entrySet()
-					.iterator().next();
-			Map<String, String> firstMap = new HashMap<String, String>();
-			firstMap.put(firstEntry.getKey().name().toLowerCase(), firstEntry
-					.getValue().get(0));
-			return firstMap.entrySet().iterator().next();
-		}
-		return null;
-	}
 	public boolean hasSort() {
 		return orders != null && !orders.isEmpty();
 	}

weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/FileUtil.java

@@ -6,8 +6,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLConnection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * 文件工具类
@@ -112,12 +112,11 @@ public class FileUtil {
 			int t = is.read(b, 0, b.length);
 			if (t > 0) {
 				String fileCode = bytesToHexString(b).toLowerCase();
-				Iterator<String> keyIter = FILE_TYPE_MAP.keySet().iterator();
+				for (Entry<String, String> entry : FILE_TYPE_MAP.entrySet()) {
-				while (keyIter.hasNext()) {
+					String key = entry.getKey().toLowerCase();
-					String key = keyIter.next().toLowerCase();
 					if (key.startsWith(fileCode) || fileCode.startsWith(key)
 							|| key.endsWith(fileCode) || fileCode.endsWith(key)) {
-						fileType = FILE_TYPE_MAP.get(key);
+						fileType = entry.getValue();
 						break;
 					}
 				}

weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultDeserializer.java

@@ -7,7 +7,6 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -74,10 +73,7 @@ public class ListsuffixResultDeserializer {
 		T t = XmlStream.fromXML(content, clazz);
 		Map<Field, String[]> listsuffixFields = getListsuffixFields(clazz);
 		if (!listsuffixFields.isEmpty()) {
-			Iterator<Entry<Field, String[]>> it = listsuffixFields.entrySet()
+			for (Entry<Field, String[]> entry : listsuffixFields.entrySet()) {
-					.iterator();
-			while (it.hasNext()) {
-				Entry<Field, String[]> entry = it.next();
 				Field field = entry.getKey();
 				Type type = field.getGenericType();
 				Class<?> wrapperClazz = null;
@@ -173,15 +169,13 @@ public class ListsuffixResultDeserializer {
 						;
 					}
 				}
-				for (Iterator<Entry<String, Map<String, String>>> outIt = outMap
+				for (Entry<String, Map<String, String>> outE : outMap
-						.entrySet().iterator(); outIt.hasNext();) {
+						.entrySet()) {
 					xw.writeStartElement(itemName);
-					for (Iterator<Entry<String, String>> innerIt = outIt.next()
+					for (Entry<String, String> innerE : outE
-							.getValue().entrySet().iterator(); innerIt
+							.getValue().entrySet()) {
-							.hasNext();) {
+						xw.writeStartElement(innerE.getKey());
-						Entry<String, String> entry = innerIt.next();
+						xw.writeCharacters(innerE.getValue());
-						xw.writeStartElement(entry.getKey());
-						xw.writeCharacters(entry.getValue());
 						xw.writeEndElement();
 					}
 					xw.writeEndElement();

weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java

@@ -8,7 +8,6 @@ import java.io.OutputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
@@ -122,8 +121,7 @@ public final class XmlStream {
 			XMLStreamWriter xw = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);
 			xw.writeStartDocument(Consts.UTF_8.name(), XML_VERSION);
 			xw.writeStartElement(ROOT_ELEMENT_XML);
-			for (Iterator<Entry<String, String>> it = map.entrySet().iterator(); it.hasNext();) {
+			for (Entry<String, String> entry : map.entrySet()) {
-				Entry<String, String> entry = it.next();
 				if (StringUtil.isBlank(entry.getValue())) {
 					continue;
 				}
@@ -159,8 +157,7 @@ public final class XmlStream {
 			XMLStreamWriter xw = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);
 			xw.writeStartDocument(Consts.UTF_8.name(), XML_VERSION);
 			xw.writeStartElement(ROOT_ELEMENT_XML);
-			for (Iterator<Entry<String, Object>> it = json.entrySet().iterator(); it.hasNext();) {
+			for (Entry<String, Object> entry : json.entrySet()) {
-				Entry<String, Object> entry = it.next();
 				if (StringUtil.isBlank(json.getString(entry.getKey()))) {
 					continue;
 				}