Merge pull request #668 from pyhblacksky/master

fix thread-unsafe in NacosRefreshHistory

spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpoint.java

@@ -41,7 +41,12 @@ public class NacosConfigEndpoint {
 
 	private final NacosRefreshHistory refreshHistory;
 
-	private DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	private ThreadLocal<DateFormat> dateFormat = new ThreadLocal<DateFormat>() {
+		@Override
+		protected DateFormat initialValue() {
+			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		}
+	};
 
 	public NacosConfigEndpoint(NacosConfigProperties properties,
 			NacosRefreshHistory refreshHistory) {
@@ -60,7 +65,7 @@ public class NacosConfigEndpoint {
 		for (NacosPropertySource ps : all) {
 			Map<String, Object> source = new HashMap<>(16);
 			source.put("dataId", ps.getDataId());
-			source.put("lastSynced", dateFormat.format(ps.getTimestamp()));
+			source.put("lastSynced", dateFormat.get().format(ps.getTimestamp()));
 			sources.add(source);
 		}
 		result.put("Sources", sources);

spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshHistory.java

@@ -27,10 +27,15 @@ public class NacosRefreshHistory {
 
 	private LinkedList<Record> records = new LinkedList<>();
 
-	private DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	private ThreadLocal<DateFormat> dateFormat = new ThreadLocal<DateFormat>() {
+		@Override
+		protected DateFormat initialValue() {
+			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		}
+	};
 
 	public void add(String dataId, String md5) {
-		records.addFirst(new Record(dateFormat.format(new Date()), dataId, md5));
+		records.addFirst(new Record(dateFormat.get().format(new Date()), dataId, md5));
 		if (records.size() > MAX_SIZE) {
 			records.removeLast();
 		}

spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpoint.java

@@ -44,7 +44,12 @@ public class AcmEndpoint {
 
 	private final AcmPropertySourceRepository propertySourceRepository;
 
-	private DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	private ThreadLocal<DateFormat> dateFormat = new ThreadLocal<DateFormat>() {
+		@Override
+		protected DateFormat initialValue() {
+			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		}
+	};
 
 	public AcmEndpoint(AcmProperties properties, AcmRefreshHistory refreshHistory,
 			AcmPropertySourceRepository propertySourceRepository) {
@@ -65,7 +70,7 @@ public class AcmEndpoint {
 		for (AcmPropertySource ps : all) {
 			Map<String, Object> source = new HashMap<>();
 			source.put("dataId", ps.getDataId());
-			source.put("lastSynced", dateFormat.format(ps.getTimestamp()));
+			source.put("lastSynced", dateFormat.get().format(ps.getTimestamp()));
 			sources.add(source);
 		}
 		runtime.put("sources", sources);

spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmRefreshHistory.java

@@ -30,10 +30,15 @@ public class AcmRefreshHistory {
 
 	private LinkedList<Record> records = new LinkedList<>();
 
-	private DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	private ThreadLocal<DateFormat> dateFormat = new ThreadLocal<DateFormat>() {
+		@Override
+		protected DateFormat initialValue() {
+			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		}
+	};
 
 	public void add(String dataId, String md5) {
-		records.addFirst(new Record(dateFormat.format(new Date()), dataId, md5));
+		records.addFirst(new Record(dateFormat.get().format(new Date()), dataId, md5));
 		if (records.size() > MAX_SIZE) {
 			records.removeLast();
 		}