This is an automated email from the ASF dual-hosted git repository.
zhyee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 24edbf4 polish metrics codes (#6419)
24edbf4 is described below
commit 24edbf46fc8fd0b1b6f6c956f560d718fb6fa063
Author: kimmking <[email protected]>
AuthorDate: Thu Jul 23 17:57:44 2020 +0800
polish metrics codes (#6419)
* polish metrics codes
* fix test
---
.../metrics/configuration/config/MetricsConfiguration.java | 6 +++---
.../configuration/swapper/MetricsConfigurationYamlSwapper.java | 4 ++--
.../metrics/configuration/yaml/YamlMetricsConfiguration.java | 4 ++--
.../metrics/facade/MetricsTrackerHandlerFacadeTest.java | 2 +-
.../metrics/facade/MetricsTrackerManagerFacadeTest.java | 4 ++--
.../orchestration/core/facade/ShardingOrchestrationFacadeTest.java | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/config/MetricsConfiguration.java
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/config/MetricsConfiguration.java
index 9f5c522..14538c3 100644
---
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/config/MetricsConfiguration.java
+++
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/config/MetricsConfiguration.java
@@ -32,19 +32,19 @@ import
org.apache.shardingsphere.control.panel.spi.FacadeConfiguration;
@AllArgsConstructor
public final class MetricsConfiguration implements FacadeConfiguration {
- public static final Integer DEFAULT_PORT = 9190;
+ public static final int DEFAULT_PORT = 9190;
private String metricsName;
private String host;
- private Integer port;
+ private int port;
private Boolean async;
private Boolean enable;
- private Integer threadCount;
+ private int threadCount;
private Properties props;
}
diff --git
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/swapper/MetricsConfigurationYamlSwapper.java
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/swapper/MetricsConfigurationYamlSwapper.java
index d4e3f7d..23fb8a1 100644
---
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/swapper/MetricsConfigurationYamlSwapper.java
+++
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/swapper/MetricsConfigurationYamlSwapper.java
@@ -42,10 +42,10 @@ public final class MetricsConfigurationYamlSwapper
implements YamlSwapper<YamlMe
@Override
public MetricsConfiguration swapToObject(final YamlMetricsConfiguration
metricsConfiguration) {
return new MetricsConfiguration(metricsConfiguration.getName(),
metricsConfiguration.getHost(),
- null == metricsConfiguration.getPort() ?
MetricsConfiguration.DEFAULT_PORT : metricsConfiguration.getPort(),
+ 0 == metricsConfiguration.getPort() ?
MetricsConfiguration.DEFAULT_PORT : metricsConfiguration.getPort(),
null == metricsConfiguration.getAsync() ? true :
metricsConfiguration.getAsync(),
null == metricsConfiguration.getEnable() ? true :
metricsConfiguration.getEnable(),
- null == metricsConfiguration.getThreadCount() ?
Runtime.getRuntime().availableProcessors() << 1 :
metricsConfiguration.getThreadCount(),
+ 0 == metricsConfiguration.getThreadCount() ?
Runtime.getRuntime().availableProcessors() << 1 :
metricsConfiguration.getThreadCount(),
metricsConfiguration.getProps());
}
}
diff --git
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/yaml/YamlMetricsConfiguration.java
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/yaml/YamlMetricsConfiguration.java
index 3eba83d2..b073f42 100644
---
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/yaml/YamlMetricsConfiguration.java
+++
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-configuration/src/main/java/org/apache/shardingsphere/metrics/configuration/yaml/YamlMetricsConfiguration.java
@@ -33,13 +33,13 @@ public final class YamlMetricsConfiguration implements
YamlConfiguration {
private String host;
- private Integer port;
+ private int port;
private Boolean async;
private Boolean enable;
- private Integer threadCount;
+ private int threadCount;
private Properties props = new Properties();
}
diff --git
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacadeTest.java
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacadeTest.java
index b1401ac..6090217 100644
---
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacadeTest.java
+++
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerHandlerFacadeTest.java
@@ -64,7 +64,7 @@ public final class MetricsTrackerHandlerFacadeTest {
}
private void init() {
- MetricsConfiguration metricsConfiguration = new
MetricsConfiguration("fixture", null, null, false, true, 8, null);
+ MetricsConfiguration metricsConfiguration = new
MetricsConfiguration("fixture", null, 0, false, true, 8, null);
List<FacadeConfiguration> facadeConfigurations = new LinkedList<>();
facadeConfigurations.add(metricsConfiguration);
new ControlPanelFacadeEngine().init(facadeConfigurations);
diff --git
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerManagerFacadeTest.java
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerManagerFacadeTest.java
index c2b7eb3..c82e1ae 100644
---
a/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerManagerFacadeTest.java
+++
b/shardingsphere-control-panel/shardingsphere-metrics/shardingsphere-metrics-facade/src/test/java/org/apache/shardingsphere/metrics/facade/MetricsTrackerManagerFacadeTest.java
@@ -38,7 +38,7 @@ public final class MetricsTrackerManagerFacadeTest {
@Before
public void setUp() {
- MetricsConfiguration metricsConfiguration = new
MetricsConfiguration("fixture", null, null, false, true, 8, null);
+ MetricsConfiguration metricsConfiguration = new
MetricsConfiguration("fixture", null, 0, false, true, 8, null);
List<FacadeConfiguration> facadeConfigurations = new LinkedList<>();
facadeConfigurations.add(metricsConfiguration);
new ControlPanelFacadeEngine().init(facadeConfigurations);
@@ -63,7 +63,7 @@ public final class MetricsTrackerManagerFacadeTest {
@Test
public void restart() {
- MetricsConfiguration metricsConfiguration = new
MetricsConfiguration("fixture", null, null, false, true, 8, null);
+ MetricsConfiguration metricsConfiguration = new
MetricsConfiguration("fixture", null, 0, false, true, 8, null);
MetricsTrackerManagerFacade.restart(metricsConfiguration);
assertThat(MetricsTrackerManagerFacade.getEnabled(), is(true));
}
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacadeTest.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacadeTest.java
index 5a1545d..18f0822 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacadeTest.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/ShardingOrchestrationFacadeTest.java
@@ -109,7 +109,7 @@ public final class ShardingOrchestrationFacadeTest {
@Test
public void assertInitMetricsConfiguration() {
- MetricsConfiguration metricsConfiguration = new
MetricsConfiguration("fixture", null, null, false, true, 8, null);
+ MetricsConfiguration metricsConfiguration = new
MetricsConfiguration("fixture", null, 0, false, true, 8, null);
shardingOrchestrationFacade.initMetricsConfiguration(metricsConfiguration);
verify(configCenter).persistMetricsConfiguration(metricsConfiguration,
false);
}
