diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java
index 2f4703bdc76..7ce41dcaf9a 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java
@@ -263,7 +263,7 @@ public String[] getArrayProperty(String key, final String delimiter, String[] de
       if (!m_arrayCache.containsKey(delimiter)) {
         synchronized (this) {
           if (!m_arrayCache.containsKey(delimiter)) {
-            m_arrayCache.put(delimiter, this.<String[]>newCache());
+            m_arrayCache.put(delimiter, this.newCache());
           }
         }
       }
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java
index df83a9c3552..92701e2981b 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java
@@ -88,7 +88,7 @@ private void processPropertyValues(BeanDefinitionRegistry beanRegistry) {
     }
 
     if (!beanName2SpringValueDefinitions.containsKey(beanRegistry)) {
-      beanName2SpringValueDefinitions.put(beanRegistry, LinkedListMultimap.<String, SpringValueDefinition>create());
+      beanName2SpringValueDefinitions.put(beanRegistry, LinkedListMultimap.create());
     }
 
     Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.get(beanRegistry);
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueRegistry.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueRegistry.java
index f224c9fda66..2600960ece1 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueRegistry.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueRegistry.java
@@ -45,7 +45,7 @@ public void register(BeanFactory beanFactory, String key, SpringValue springValu
     if (!registry.containsKey(beanFactory)) {
       synchronized (LOCK) {
         if (!registry.containsKey(beanFactory)) {
-          registry.put(beanFactory, Multimaps.synchronizedListMultimap(LinkedListMultimap.<String, SpringValue>create()));
+          registry.put(beanFactory, Multimaps.synchronizedListMultimap(LinkedListMultimap.create()));
         }
       }
     }
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpRequest.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpRequest.java
index aeac6326fab..39e666a2424 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpRequest.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpRequest.java
@@ -22,7 +22,7 @@
  * @author Jason Song(song_s@ctrip.com)
  */
 public class HttpRequest {
-  private String m_url;
+  private final String m_url;
   private Map<String, String> headers;
   private int m_connectTimeout;
   private int m_readTimeout;
diff --git a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigTest.java b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigTest.java
index e619f69db48..93792b41cb1 100644
--- a/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigTest.java
+++ b/apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigTest.java
@@ -902,7 +902,7 @@ public void testGetPropertyWithFunction() throws Exception {
       public List<String> apply(String s) {
         return Splitter.on(",").trimResults().omitEmptyStrings().splitToList(s);
       }
-    }, Lists.<String>newArrayList()), Lists.newArrayList("a", "b", "c"));
+    }, Lists.newArrayList()), Lists.newArrayList("a", "b", "c"));
     assertEquals(defaultConfig.getProperty(someNullKey, new Function<String, List<String>>() {
       @Override
       public List<String> apply(String s) {
diff --git a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java
index 3480b400dcc..8a446ffccb0 100644
--- a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java
+++ b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java
@@ -32,10 +32,7 @@ public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata)
     if (!StringUtils.isEmpty(context.getEnvironment().getProperty("uat.titan.url"))) {
       return true;
     }
-    if (!StringUtils.isEmpty(context.getEnvironment().getProperty("pro.titan.url"))) {
-      return true;
-    }
-    return false;
+    return !StringUtils.isEmpty(context.getEnvironment().getProperty("pro.titan.url"));
   }
 
 }
diff --git a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanEntityManager.java b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanEntityManager.java
index c98523c356d..fb25a3d3564 100644
--- a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanEntityManager.java
+++ b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanEntityManager.java
@@ -39,7 +39,7 @@ public TitanEntityManager(final TitanSettings settings) {
   public DataSource datasource() throws Exception {
     Class clazz = Class.forName("com.ctrip.datasource.configure.DalDataSourceFactory");
     Object obj = clazz.newInstance();
-    Method method = clazz.getMethod("createDataSource", new Class[] {String.class, String.class});
+    Method method = clazz.getMethod("createDataSource", String.class, String.class);
     DataSource ds = ((DataSource) method.invoke(obj,
         new Object[] {settings.getTitanDbname(), settings.getTitanUrl()}));
     Tracer.logEvent("Apollo.Datasource.Titan", settings.getTitanDbname());
diff --git a/apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ApolloNotificationMessages.java b/apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ApolloNotificationMessages.java
index afdf3fe2aa0..0e1967a5155 100644
--- a/apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ApolloNotificationMessages.java
+++ b/apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ApolloNotificationMessages.java
@@ -28,7 +28,7 @@ public class ApolloNotificationMessages {
   private Map<String, Long> details;
 
   public ApolloNotificationMessages() {
-    this(Maps.<String, Long>newTreeMap());
+    this(Maps.newTreeMap());
   }
 
   private ApolloNotificationMessages(Map<String, Long> details) {
diff --git a/apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ResourceUtils.java b/apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ResourceUtils.java
index 977196c69a8..2c1dca0abda 100644
--- a/apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ResourceUtils.java
+++ b/apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/ResourceUtils.java
@@ -65,7 +65,7 @@ public static Properties readConfigFile(String configPath, Properties defaults)
 
       }
       if (sb.length() > 0) {
-        logger.debug("Reading properties: \n" + sb.toString());
+        logger.debug("Reading properties: \n" + sb);
       } else {
         logger.warn("No available properties: {}", configPath);
       }
diff --git a/apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java b/apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java
index ce030cb74ea..cd31bcf3b00 100644
--- a/apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java
+++ b/apollo-core/src/main/java/com/ctrip/framework/foundation/internals/NetworkInterfaceManager.java
@@ -119,7 +119,7 @@ private void load() {
 
     try {
       Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
-      List<NetworkInterface> nis = interfaces == null ? Collections.<NetworkInterface>emptyList()
+      List<NetworkInterface> nis = interfaces == null ? Collections.emptyList()
           : Collections.list(interfaces);
       //sort the network interfaces according to the index asc
       Collections.sort(nis, new Comparator<NetworkInterface>() {
diff --git a/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/javaConfigDemo/AnnotationApplication.java b/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/javaConfigDemo/AnnotationApplication.java
index 0edf9d5e404..9624a3a816d 100644
--- a/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/javaConfigDemo/AnnotationApplication.java
+++ b/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/javaConfigDemo/AnnotationApplication.java
@@ -42,7 +42,7 @@ public static void main(String[] args) throws IOException {
         System.exit(0);
       }
 
-      System.out.println(annotatedBean.toString());
+      System.out.println(annotatedBean);
     }
   }
 }
diff --git a/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/refresh/SpringBootApolloRefreshConfig.java b/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/refresh/SpringBootApolloRefreshConfig.java
index 9b7c5cad0e2..a93b055a45d 100644
--- a/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/refresh/SpringBootApolloRefreshConfig.java
+++ b/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/springBootDemo/refresh/SpringBootApolloRefreshConfig.java
@@ -49,6 +49,6 @@ public SpringBootApolloRefreshConfig(
   public void onChange(ConfigChangeEvent changeEvent) {
     logger.info("before refresh {}", sampleRedisConfig.toString());
     refreshScope.refresh("sampleRedisConfig");
-    logger.info("after refresh {}", sampleRedisConfig.toString());
+    logger.info("after refresh {}", sampleRedisConfig);
   }
 }
diff --git a/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/XmlApplication.java b/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/XmlApplication.java
index ca7dbdc3925..eb4859b249d 100644
--- a/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/XmlApplication.java
+++ b/apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/XmlApplication.java
@@ -43,7 +43,7 @@ public static void main(String[] args) throws IOException {
         System.exit(0);
       }
 
-      System.out.println(xmlBean.toString());
+      System.out.println(xmlBean);
     }
   }
 }
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
index ef02a76cddb..b9b56d7306b 100644
--- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
+++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/txtresolver/PropertyResolver.java
@@ -54,7 +54,7 @@ public ItemChangeSets resolve(long namespaceId, String configText, List<ItemDTO>
     String[] newItems = configText.split(ITEM_SEPARATOR);
     Set<String> repeatKeys = new HashSet<>();
     if (isHasRepeatKey(newItems, repeatKeys)) {
-      throw new BadRequestException(String.format("Config text has repeated keys: %s, please check your input.", repeatKeys.toString()));
+      throw new BadRequestException(String.format("Config text has repeated keys: %s, please check your input.", repeatKeys));
     }
 
     ItemChangeSets changeSets = new ItemChangeSets();