fix some format issue

Author: nobodyiam

apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/ConfigServiceWithCache.java

@@ -68,7 +68,6 @@ public class ConfigServiceWithCache extends AbstractConfigService {
   private static final String TRACER_EVENT_CACHE_GET_ID = "ConfigCache.GetById";
   private static final String TRACER_EVENT_CACHE_LOAD_RELEASE_KEY = "ConfigCache.LoadFromDBByReleaseKey";
 
-
   private final ReleaseService releaseService;
   private final ReleaseMessageService releaseMessageService;
   private final BizConfig bizConfig;
@@ -160,41 +159,41 @@ public void handleMessage(ReleaseMessage message, String channel) {
   }
 
   @Override
-  public Map<String, Release> findReleasesByReleaseKeys(Set<String> releaseKeys)
-      {
-        try {
-          ImmutableMap<String, Optional<Long>> releaseKeyMap = releaseKeyCache.getAll(releaseKeys);
-          if (CollectionUtils.isEmpty(releaseKeyMap)) {
-            return Collections.emptyMap();
-          }
-
-          Map<String, Long> validReleaseKeyIdMap = new HashMap<>();
-          for (Map.Entry<String, Optional<Long>> entry : releaseKeyMap.entrySet()) {
-            entry.getValue().ifPresent(id -> validReleaseKeyIdMap.put(entry.getKey(), id));
-          }
-          if (validReleaseKeyIdMap.isEmpty()) {
-            return Collections.emptyMap();
-          }
+  public Map<String, Release> findReleasesByReleaseKeys(Set<String> releaseKeys) {
+    try {
+      ImmutableMap<String, Optional<Long>> releaseKeyMap = releaseKeyCache.getAll(releaseKeys);
+      if (CollectionUtils.isEmpty(releaseKeyMap)) {
+        return Collections.emptyMap();
+      }
 
-          Map<Long, Optional<Release>> releasesMap = configIdCache.getAll(validReleaseKeyIdMap.values());
-          if (CollectionUtils.isEmpty(releasesMap)) {
-            return Collections.emptyMap();
-          }
+      Map<String, Long> validReleaseKeyIdMap = new HashMap<>();
+      for (Map.Entry<String, Optional<Long>> entry : releaseKeyMap.entrySet()) {
+        entry.getValue().ifPresent(id -> validReleaseKeyIdMap.put(entry.getKey(), id));
+      }
+      if (validReleaseKeyIdMap.isEmpty()) {
+        return Collections.emptyMap();
+      }
 
-          Map<String, Release> releases = new HashMap<>();
-          for (Map.Entry<String, Long> entry : validReleaseKeyIdMap.entrySet()) {
-            Optional<Release> releaseOpt = releasesMap.get(entry.getValue());
-            releaseOpt.ifPresent(release -> releases.put(entry.getKey(), release));
-          }
+      Map<Long, Optional<Release>> releasesMap = configIdCache.getAll(
+          validReleaseKeyIdMap.values());
+      if (CollectionUtils.isEmpty(releasesMap)) {
+        return Collections.emptyMap();
+      }
 
-          return releases.isEmpty() ? Collections.emptyMap() : ImmutableMap.copyOf(releases);
-        } catch (Exception e) {
-          Tracer.logError(e);
-          logger.error("Failed to invoke findReleasesByReleaseKeys {}", releaseKeys, e);
-        }
-        return null;
+      Map<String, Release> releases = new HashMap<>();
+      for (Map.Entry<String, Long> entry : validReleaseKeyIdMap.entrySet()) {
+        Optional<Release> releaseOpt = releasesMap.get(entry.getValue());
+        releaseOpt.ifPresent(release -> releases.put(entry.getKey(), release));
       }
 
+      return releases.isEmpty() ? Collections.emptyMap() : ImmutableMap.copyOf(releases);
+    } catch (Exception e) {
+      Tracer.logError(e);
+      logger.error("Failed to invoke findReleasesByReleaseKeys {}", releaseKeys, e);
+    }
+    return null;
+  }
+
   private void buildConfigCache() {
     CacheBuilder configCacheBuilder = CacheBuilder.newBuilder()
         .expireAfterAccess(DEFAULT_EXPIRED_AFTER_ACCESS_IN_MINUTES, TimeUnit.MINUTES);
@@ -275,8 +274,8 @@ public Optional<Long> load(String key) throws Exception {
     if (bizConfig.isConfigServiceCacheStatsEnabled()) {
       GuavaCacheMetrics.monitor(meterRegistry, releaseKeyCache, "releaseKey_cache");
     }
-
   }
+
   private void buildConfigIdCache() {
     CacheBuilder configIdCacheBuilder = CacheBuilder.newBuilder()
         .expireAfterAccess(DEFAULT_EXPIRED_AFTER_ACCESS_IN_MINUTES, TimeUnit.MINUTES);
@@ -286,7 +285,8 @@ private void buildConfigIdCache() {
     configIdCache = configIdCacheBuilder.build(new CacheLoader<Long, Optional<Release>>() {
       @Override
       public Optional<Release> load(Long key) throws Exception {
-        Transaction transaction = Tracer.newTransaction(TRACER_EVENT_CACHE_LOAD_ID, String.valueOf(key));
+        Transaction transaction = Tracer.newTransaction(TRACER_EVENT_CACHE_LOAD_ID,
+            String.valueOf(key));
         try {
           Release release = releaseService.findActiveOne(key);
 
@@ -305,7 +305,6 @@ public Optional<Release> load(Long key) throws Exception {
     if (bizConfig.isConfigServiceCacheStatsEnabled()) {
       GuavaCacheMetrics.monitor(meterRegistry, configIdCache, "config_id_cache");
     }
-
   }
 
   private static class ConfigCacheEntry {

apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/DefaultIncrementalSyncService.java

@@ -28,9 +28,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-/**
- *
- */
 public class DefaultIncrementalSyncService implements IncrementalSyncService {
 
   private final Cache<ReleaseKeyPair, List<ConfigurationChange>> configurationChangeCache;
@@ -42,7 +39,6 @@ public DefaultIncrementalSyncService() {
         .build();
   }
 
-
   @Override
   public List<ConfigurationChange> getConfigurationChanges(String latestMergedReleaseKey,
       Map<String, String> latestReleaseConfigurations, String clientSideReleaseKey,
@@ -134,5 +130,4 @@ public int hashCode() {
     }
   }
 
-
 }

apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/IncrementalSyncService.java

@@ -20,12 +20,10 @@
 import java.util.List;
 import java.util.Map;
 
-
-/**
- * @author jason
- */
 public interface IncrementalSyncService {
 
-  List<ConfigurationChange> getConfigurationChanges(String latestMergedReleaseKey, Map<String, String> latestReleaseConfigurations, String clientSideReleaseKey, Map<String, String> clientSideConfigurations) ;
+  List<ConfigurationChange> getConfigurationChanges(String latestMergedReleaseKey,
+      Map<String, String> latestReleaseConfigurations, String clientSideReleaseKey,
+      Map<String, String> clientSideConfigurations);
 
-  }
+}