Merge pull request #164 from chuntaojun/feat_issue_160

refactor: Correct part code implementation
nacos-group · Oct 21, 2019 · 6719039 · 6719039
2 parents d005aca + d75bdb3
commit 6719039
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...t/src/main/java/com/alibaba/nacos/spring/core/env/AbstractNacosPropertySourceBuilder.java b/...t/src/main/java/com/alibaba/nacos/spring/core/env/AbstractNacosPropertySourceBuilder.java
@@ -57,7 +57,6 @@
 import static com.alibaba.nacos.spring.util.NacosUtils.resolveProperties;
 import static com.alibaba.spring.util.ClassUtils.resolveGenericType;
 import static java.lang.String.format;
-import static java.lang.String.valueOf;
 import static org.springframework.util.ClassUtils.resolveClassName;
 
 /**
@@ -185,7 +184,7 @@ protected NacosPropertySource doBuild(String beanName, T beanDefinition,
 			if (logger.isWarnEnabled()) {
 				logger.warn(format(
 						"There is no content for NacosPropertySource from dataId[%s] , groupId[%s] , properties[%s].",
-						dataId, groupId, valueOf(nacosPropertiesAttributes)));
+						dataId, groupId, nacosPropertiesAttributes));
 			}
 		}
 

diff --git a/...in/java/com/alibaba/nacos/spring/factory/CacheableEventPublishingNacosServiceFactory.java b/...in/java/com/alibaba/nacos/spring/factory/CacheableEventPublishingNacosServiceFactory.java
@@ -48,7 +48,7 @@
 @SuppressWarnings("unchecked")
 public class CacheableEventPublishingNacosServiceFactory implements NacosServiceFactory {
 
-	private static final CacheableEventPublishingNacosServiceFactory SINGLETON = new CacheableEventPublishingNacosServiceFactory();
+	private static volatile CacheableEventPublishingNacosServiceFactory SINGLETON = new CacheableEventPublishingNacosServiceFactory();
 
 	private final Map<String, ConfigService> configServicesCache = new LinkedHashMap<String, ConfigService>(
 			2);
@@ -61,9 +61,9 @@ public class CacheableEventPublishingNacosServiceFactory implements NacosService
 
 	private final LinkedList<DeferServiceHolder> deferServiceCache = new LinkedList<DeferServiceHolder>();
 
-	private volatile ConfigurableApplicationContext context;
+	private ConfigurableApplicationContext context;
 
-	private volatile ExecutorService nacosConfigListenerExecutor;
+	private ExecutorService nacosConfigListenerExecutor;
 
 	private Map<ServiceType, AbstractCreateWorker> createWorkerManager = new HashMap<ServiceType, AbstractCreateWorker>(
 			3);

diff --git a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/ObjectUtils.java b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/ObjectUtils.java
@@ -32,7 +32,10 @@
  * @author <a href="mailto:liaochunyhm@live.com">liaochuntao</a>
  * @since 0.3.0
  */
-public abstract class ObjectUtils {
+public final class ObjectUtils {
+
+	private ObjectUtils() {
+	}
 
 	public static void cleanMapOrCollectionField(final Object bean) {
 		ReflectionUtils.doWithFields(bean.getClass(),