Skip to content

Commit 9842289

Browse files
committed
add Unknown sync mode
1 parent 6859fe1 commit 9842289

5 files changed

Lines changed: 6 additions & 10 deletions

File tree

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ private ApolloConfig loadApolloConfig() {
260260

261261
ConfigSyncType configSyncType=ConfigSyncType.fromString(result.getConfigSyncType());
262262

263-
if (configSyncType == ConfigSyncType.INCREMENTALSYNC) {
263+
if (configSyncType == ConfigSyncType.INCREMENTAL_SYNC) {
264264

265265
ApolloConfig previousConfig = m_configCache.get();
266266

apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.ctrip.framework.apollo.build.MockInjector;
3434
import com.ctrip.framework.apollo.core.dto.*;
3535
import com.ctrip.framework.apollo.core.enums.ConfigSyncType;
36-
import com.ctrip.framework.apollo.core.enums.ConfigurationChangeType;
3736
import com.ctrip.framework.apollo.core.signature.Signature;
3837
import com.ctrip.framework.apollo.enums.ConfigSourceType;
3938
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
@@ -487,7 +486,7 @@ private ApolloConfig assembleApolloConfigWithIncrementalSync(List<ConfigurationC
487486
ApolloConfig apolloConfig =
488487
new ApolloConfig(someAppId, someClusterName, someNamespace, someReleaseKey);
489488

490-
apolloConfig.setConfigSyncType(ConfigSyncType.INCREMENTALSYNC.getValue());
489+
apolloConfig.setConfigSyncType(ConfigSyncType.INCREMENTAL_SYNC.getValue());
491490
apolloConfig.setConfigurationChanges(configurationChanges);
492491
return apolloConfig;
493492
}

apollo-core/src/main/java/com/ctrip/framework/apollo/core/dto/ConfigurationChange.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.ctrip.framework.apollo.core.dto;
1818

1919

20-
import com.ctrip.framework.apollo.core.enums.ConfigurationChangeType;
2120

2221
/**
2322
* Holds the information for a Configuration change.

apollo-core/src/main/java/com/ctrip/framework/apollo/core/enums/ConfigSyncType.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818

1919
import com.ctrip.framework.apollo.core.utils.StringUtils;
2020

21-
import java.util.stream.Stream;
22-
2321
/**
2422
* This enum represents all the possible Configuration sync from apollo-config
2523
*
2624
* @author jason
2725
*/
2826
public enum ConfigSyncType {
29-
FULLSYNC("FullSync"), INCREMENTALSYNC("IncrementalSync");
27+
FULL_SYNC("FullSync"), INCREMENTAL_SYNC("IncrementalSync"), UNKNOWN("UnKnown");
3028

3129
private final String value;
3230

@@ -46,14 +44,14 @@ public enum ConfigSyncType {
4644
*/
4745
public static ConfigSyncType fromString(String value) {
4846
if (StringUtils.isEmpty(value)) {
49-
return FULLSYNC;
47+
return FULL_SYNC;
5048
}
5149
for (ConfigSyncType type : values()) {
5250
if (type.value.equals(value)) {
5351
return type;
5452
}
5553
}
56-
throw new IllegalArgumentException("Invalid ConfigSyncType: " + value);
54+
return UNKNOWN;
5755

5856
}
5957

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</developers>
6161

6262
<properties>
63-
<revision>2.5.0-SNAPSHOT</revision>
63+
<revision>2.4.0-SNAPSHOT</revision>
6464
<java.version>1.8</java.version>
6565
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6666
<spring-boot.version>2.7.18</spring-boot.version>

0 commit comments

Comments
 (0)