Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ protected static void initConfiguration(CommandLineArgument commandLineArgument)
System.setProperty(Configuration.CONFIG_PATH_PROPERTY, commandLineArgument.getProxyConfigPath());
}
ConfigurationManager.initEnv();
ConfigurationManager.intConfig();
ConfigurationManager.initConfig();
setConfigFromCommandLineArgument(commandLineArgument);
log.info("Current configuration: " + ConfigurationManager.formatProxyConfig());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static void initEnv() {
}
}

public static void intConfig() throws Exception {
public static void initConfig() throws Exception {
configuration = new Configuration();
configuration.init();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
public class ConfigurationManagerTest extends InitConfigTest {

@Test
public void testIntConfig() {
public void testInitConfig() {
assertThat(ConfigurationManager.getProxyConfig()).isNotNull();
assertThat(ConfigurationManager.getProxyConfig().getProxyMode()).isEqualToIgnoringCase(ProxyMode.CLUSTER.toString());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void before() throws Throwable {
}

ConfigurationManager.initEnv();
ConfigurationManager.intConfig();
ConfigurationManager.initConfig();
}

@After
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class ProxyAndTlsProtocolNegotiatorTest {

@Before
public void setUp() throws Exception {
ConfigurationManager.intConfig();
ConfigurationManager.initConfig();
ConfigurationManager.getProxyConfig().setTlsTestModeEnable(true);
negotiator = new ProxyAndTlsProtocolNegotiator();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void setup() throws Exception {
getTopicRouteActivity = new GetTopicRouteActivity(requestPipeline, messagingProcessor);

ConfigurationManager.initEnv();
ConfigurationManager.intConfig();
ConfigurationManager.initConfig();

Channel channel = new SimpleChannel(null, "0.0.0.0:0", "1.1.1.1:1");
ctx = new SimpleChannelHandlerContext(channel);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class TlsCertificateManagerTest {
@Before
public void setUp() throws Exception {
ConfigurationManager.initEnv();
ConfigurationManager.intConfig();
ConfigurationManager.initConfig();
// Create temporary certificate and key files
certFile = tempDir.newFile("server.crt");
keyFile = tempDir.newFile("server.key");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void setUp() throws Exception {
}

ConfigurationManager.initEnv();
ConfigurationManager.intConfig();
ConfigurationManager.initConfig();
ConfigurationManager.getProxyConfig().setNamesrvAddr(NAMESRV_ADDR);
// Set LongPollingReserveTimeInMillis to 500ms to reserve more time for IT
ConfigurationManager.getProxyConfig().setLongPollingReserveTimeInMillis(500);
Expand Down
Loading