Skip to content

refactor: rename C++-style m_/s_ field prefixes to Java camelCase #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
shalk wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: rename C++-style m_/s_ field prefixes to Java camelCase #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...test/java/com/ctrip/framework/apollo/config/data/importer/ApolloConfigDataLoaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@ private void resetConfigService() throws Exception {
}

private void clearApolloClientCaches() throws Exception {
clearField(ApolloInjector.getInstance(ConfigManager.class), "m_configs");
clearField(ApolloInjector.getInstance(ConfigManager.class), "m_configLocks");
clearField(ApolloInjector.getInstance(ConfigManager.class), "m_configFiles");
clearField(ApolloInjector.getInstance(ConfigManager.class), "m_configFileLocks");
clearField(ApolloInjector.getInstance(ConfigFactoryManager.class), "m_factories");
clearField(ApolloInjector.getInstance(ConfigRegistry.class), "m_instances");
clearField(ApolloInjector.getInstance(ConfigManager.class), "configs");
clearField(ApolloInjector.getInstance(ConfigManager.class), "configLocks");
clearField(ApolloInjector.getInstance(ConfigManager.class), "configFiles");
clearField(ApolloInjector.getInstance(ConfigManager.class), "configFileLocks");
clearField(ApolloInjector.getInstance(ConfigFactoryManager.class), "factories");
clearField(ApolloInjector.getInstance(ConfigRegistry.class), "instances");
}

@SuppressWarnings("unchecked")
Expand Down
12 changes: 6 additions & 6 deletions ...st/java/com/ctrip/framework/apollo/config/data/integration/ConfigDataIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,12 @@ private static void resetApolloStaticState() throws Exception {
}

private static void clearApolloClientCaches() throws Exception {
clearField(ApolloInjector.getInstance(ConfigManager.class), "m_configs");
clearField(ApolloInjector.getInstance(ConfigManager.class), "m_configLocks");
clearField(ApolloInjector.getInstance(ConfigManager.class), "m_configFiles");
clearField(ApolloInjector.getInstance(ConfigManager.class), "m_configFileLocks");
clearField(ApolloInjector.getInstance(ConfigFactoryManager.class), "m_factories");
clearField(ApolloInjector.getInstance(ConfigRegistry.class), "m_instances");
clearField(ApolloInjector.getInstance(ConfigManager.class), "configs");
clearField(ApolloInjector.getInstance(ConfigManager.class), "configLocks");
clearField(ApolloInjector.getInstance(ConfigManager.class), "configFiles");
clearField(ApolloInjector.getInstance(ConfigManager.class), "configFileLocks");
clearField(ApolloInjector.getInstance(ConfigFactoryManager.class), "factories");
clearField(ApolloInjector.getInstance(ConfigRegistry.class), "instances");
}

@SuppressWarnings("unchecked")
Expand Down
58 changes: 29 additions & 29 deletions apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,45 +33,45 @@
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigService {
private static final ConfigService s_instance = new ConfigService();
private volatile ConfigMonitor m_configMonitor;
private volatile ConfigManager m_configManager;
private volatile ConfigRegistry m_configRegistry;
private static final ConfigService instance = new ConfigService();
private volatile ConfigMonitor configMonitor;
private volatile ConfigManager configManager;
private volatile ConfigRegistry configRegistry;

private ConfigMonitor getMonitor() {
getManager();
if (m_configMonitor == null) {
if (configMonitor == null) {
synchronized (this) {
if (m_configMonitor == null) {
m_configMonitor = ApolloInjector.getInstance(ConfigMonitor.class);
if (configMonitor == null) {
configMonitor = ApolloInjector.getInstance(ConfigMonitor.class);
}
}
}
return m_configMonitor;
return configMonitor;
}

private ConfigManager getManager() {
if (m_configManager == null) {
if (configManager == null) {
synchronized (this) {
if (m_configManager == null) {
m_configManager = ApolloInjector.getInstance(ConfigManager.class);
if (configManager == null) {
configManager = ApolloInjector.getInstance(ConfigManager.class);
ConfigMonitorInitializer.initialize();
}
}
}
return m_configManager;
return configManager;
}

private ConfigRegistry getRegistry() {
if (m_configRegistry == null) {
if (configRegistry == null) {
synchronized (this) {
if (m_configRegistry == null) {
m_configRegistry = ApolloInjector.getInstance(ConfigRegistry.class);
if (configRegistry == null) {
configRegistry = ApolloInjector.getInstance(ConfigRegistry.class);
}
}
}

return m_configRegistry;
return configRegistry;
}

/**
Expand All @@ -90,15 +90,15 @@ public static Config getAppConfig() {
* @return config instance
*/
public static Config getConfig(String namespace) {
return s_instance.getManager().getConfig(namespace);
return instance.getManager().getConfig(namespace);
}

public static Config getConfig(String appId, String namespace) {
return s_instance.getManager().getConfig(appId, namespace);
return instance.getManager().getConfig(appId, namespace);
}

public static ConfigFile getConfigFile(String namespace, ConfigFileFormat configFileFormat) {
return s_instance.getManager().getConfigFile(namespace, configFileFormat);
return instance.getManager().getConfigFile(namespace, configFileFormat);
}

/**
Expand All @@ -111,11 +111,11 @@ public static ConfigFile getConfigFile(String namespace, ConfigFileFormat config
*/
public static ConfigFile getConfigFile(String appId, String namespace,
ConfigFileFormat configFileFormat) {
return s_instance.getManager().getConfigFile(appId, namespace, configFileFormat);
return instance.getManager().getConfigFile(appId, namespace, configFileFormat);
}

public static ConfigMonitor getConfigMonitor(){
return s_instance.getMonitor();
return instance.getMonitor();
}

static void setConfig(Config config) {
Expand All @@ -129,9 +129,9 @@ static void setConfig(Config config) {
* @param config the config instance
*/
static void setConfig(String namespace, final Config config) {
s_instance.getRegistry().register(namespace, new ConfigFactory() {
instance.getRegistry().register(namespace, new ConfigFactory() {

private final ConfigUtil m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
private final ConfigUtil configUtil = ApolloInjector.getInstance(ConfigUtil.class);

@Override
public Config create(String namespace) {
Expand All @@ -140,8 +140,8 @@ public Config create(String namespace) {

@Override
public Config create(String appId, String namespace) {
if(!StringUtils.equals(appId, m_configUtil.getAppId())){
throw new IllegalArgumentException("Provided appId '" + appId + "' does not match the default appId '" + m_configUtil.getAppId() + "'");
if(!StringUtils.equals(appId, configUtil.getAppId())){
throw new IllegalArgumentException("Provided appId '" + appId + "' does not match the default appId '" + configUtil.getAppId() + "'");
}
return config;
}
Expand Down Expand Up @@ -170,14 +170,14 @@ static void setConfigFactory(ConfigFactory factory) {
* @param factory the factory instance
*/
static void setConfigFactory(String namespace, ConfigFactory factory) {
s_instance.getRegistry().register(namespace, factory);
instance.getRegistry().register(namespace, factory);
}

// for test only
static void reset() {
synchronized (s_instance) {
s_instance.m_configManager = null;
s_instance.m_configRegistry = null;
synchronized (instance) {
instance.configManager = null;
instance.configRegistry = null;
}
}
}
10 changes: 5 additions & 5 deletions apollo-client/src/main/java/com/ctrip/framework/apollo/build/ApolloInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
* @author Jason Song(song_s@ctrip.com)
*/
public class ApolloInjector {
private static volatile Injector s_injector;
private static volatile Injector injector;
private static final Object lock = new Object();

private static Injector getInjector() {
if (s_injector == null) {
if (injector == null) {
synchronized (lock) {
if (s_injector == null) {
if (injector == null) {
try {
s_injector = ServiceBootstrap.loadPrimary(Injector.class);
injector = ServiceBootstrap.loadPrimary(Injector.class);
} catch (Throwable ex) {
ApolloConfigException exception = new ApolloConfigException("Unable to initialize Apollo Injector!", ex);
Tracer.logError(exception);
Expand All @@ -43,7 +43,7 @@ private static Injector getInjector() {
}
}

return s_injector;
return injector;
}

public static <T> T getInstance(Class<T> clazz) {
Expand Down
8 changes: 4 additions & 4 deletions .../src/main/java/com/ctrip/framework/apollo/exceptions/ApolloConfigStatusCodeException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
* @author Jason Song(song_s@ctrip.com)
*/
public class ApolloConfigStatusCodeException extends RuntimeException{
private final int m_statusCode;
private final int statusCode;

public ApolloConfigStatusCodeException(int statusCode, String message) {
super(String.format("[status code: %d] %s", statusCode, message));
this.m_statusCode = statusCode;
this.statusCode = statusCode;
}

public ApolloConfigStatusCodeException(int statusCode, Throwable cause) {
super(cause);
this.m_statusCode = statusCode;
this.statusCode = statusCode;
}

public int getStatusCode() {
return m_statusCode;
return statusCode;
}
}
Loading
Loading