diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java index 145425b1632..d59e8e633bc 100755 --- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java +++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java @@ -179,8 +179,8 @@ public ApolloConfig queryConfig(@PathVariable String appId, @PathVariable String Map historyConfigurations = mergeReleaseConfigurations (historyReleasesWithOrder); - List configurationChanges = configService.calcConfigurationChanges - (latestConfigurations, historyConfigurations); + List configurationChanges = configService.calcConfigurationChanges( + latestConfigurations, historyConfigurations); apolloConfig.setConfigurationChanges(configurationChanges); diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/AbstractConfigService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/AbstractConfigService.java index 8db6756aca5..9d239ac60bc 100644 --- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/AbstractConfigService.java +++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/AbstractConfigService.java @@ -136,7 +136,7 @@ public List calcConfigurationChanges( continue; } changes.add( - new ConfigurationChange(commonKey, currentValue,"MODIFIED")); + new ConfigurationChange(commonKey, currentValue, "MODIFIED")); } return changes; diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/ConfigServiceWithChangeCache.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/ConfigServiceWithChangeCache.java index 961b08f3b59..aec6ec1d510 100644 --- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/ConfigServiceWithChangeCache.java +++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/ConfigServiceWithChangeCache.java @@ -51,7 +51,7 @@ */ public class ConfigServiceWithChangeCache extends ConfigServiceWithCache { - private static final Logger logger = LoggerFactory.getLogger(ConfigServiceWithChangeCache.class); + private static final Logger logger = LoggerFactory.getLogger(ConfigServiceWithChangeCache.class); private static final long DEFAULT_EXPIRED_AFTER_ACCESS_IN_SENCONDS = 10; @@ -70,7 +70,7 @@ public ConfigServiceWithChangeCache(final ReleaseService releaseService, final BizConfig bizConfig, final MeterRegistry meterRegistry) { - super(releaseService, releaseMessageService, grayReleaseRulesHolder, bizConfig, meterRegistry); + super(releaseService, releaseMessageService, grayReleaseRulesHolder, bizConfig, meterRegistry); } @@ -82,10 +82,10 @@ public void initialize() { private void buildReleaseCache() { - CacheBuilder releasesCacheBuilder = CacheBuilder.newBuilder() + CacheBuilder releasesCacheBuilder = CacheBuilder.newBuilder() .expireAfterAccess(DEFAULT_EXPIRED_AFTER_ACCESS_IN_SENCONDS, TimeUnit.SECONDS); - releasesCache = releasesCacheBuilder.build(new CacheLoader>() { + releasesCache = releasesCacheBuilder.build(new CacheLoader>() { @Override public Optional load(String key) { Transaction transaction = Tracer.newTransaction(TRACER_EVENT_CHANGE_CACHE_LOAD_KEY, key); diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/IncrementalSyncConfigService.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/IncrementalSyncConfigService.java index 834e4b5b6a6..2ca37c0d614 100644 --- a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/IncrementalSyncConfigService.java +++ b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/config/IncrementalSyncConfigService.java @@ -32,7 +32,8 @@ public interface IncrementalSyncConfigService { * @param historyConfigurations * @return the ConfigurationChanges */ - List calcConfigurationChanges(Map latestReleaseConfigurations, Map historyConfigurations); + List calcConfigurationChanges( + Map latestReleaseConfigurations, Map historyConfigurations); /** * @param releaseKeys