You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/01/11 07:03:08 UTC
[incubator-servicecomb-java-chassis] 02/02: resolve compile warnings
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 06f42c52adb7e6848229bf5cfb3d36fa5f7667af
Author: wujimin <wu...@huawei.com>
AuthorDate: Thu Jan 11 10:54:27 2018 +0800
resolve compile warnings
---
.../definition/loader/TestDynamicSchemaLoader.java | 2 ++
.../demo/crossapp/CrossappBootListener.java | 1 +
.../demo/crossapp/CrossappBootListener.java | 1 +
.../demo/springmvc/client/SpringmvcClient.java | 18 +++++++++--------
.../io/servicecomb/config/client/ApolloClient.java | 1 +
.../config/client/ApolloClientTest.java | 5 +----
.../tests/tracing/TraceContextConfig.java | 1 +
.../core/publish/DefaultHealthCheckerManager.java | 6 ------
.../metrics/prometheus/MetricsPublisher.java | 23 ++++++++++++++++++++--
.../samples/mwf/Log4J2MetricsFileWriter.java | 1 +
.../springmvc/provider/SpringmvcHelloImpl.java | 10 ----------
.../discovery/CseRibbonClientConfiguration.java | 5 -----
.../generator/core/TestOperationGenerator.java | 1 +
13 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/core/src/test/java/io/servicecomb/core/definition/loader/TestDynamicSchemaLoader.java b/core/src/test/java/io/servicecomb/core/definition/loader/TestDynamicSchemaLoader.java
index c23fd59..9825a20 100644
--- a/core/src/test/java/io/servicecomb/core/definition/loader/TestDynamicSchemaLoader.java
+++ b/core/src/test/java/io/servicecomb/core/definition/loader/TestDynamicSchemaLoader.java
@@ -67,6 +67,7 @@ public class TestDynamicSchemaLoader {
RegistryUtils.setServiceRegistry(null);
}
+ @SuppressWarnings("deprecation")
@Test
public void testRegisterSchemas() {
DynamicSchemaLoader.INSTANCE.registerSchemas("classpath*:test/test/schema.yaml");
@@ -74,6 +75,7 @@ public class TestDynamicSchemaLoader {
Assert.assertEquals("cse.gen.pojotest.perfClient.schema", schemaMeta.getPackageName());
}
+ @SuppressWarnings("deprecation")
@Test
public void testRegisterShemasAcrossApp() {
DynamicSchemaLoader.INSTANCE.registerSchemas("CSE:as", "classpath*:test/test/schema.yaml");
diff --git a/demo/demo-crossapp/crossapp-client/src/main/java/io/servicecomb/demo/crossapp/CrossappBootListener.java b/demo/demo-crossapp/crossapp-client/src/main/java/io/servicecomb/demo/crossapp/CrossappBootListener.java
index e00e317..7148cef 100644
--- a/demo/demo-crossapp/crossapp-client/src/main/java/io/servicecomb/demo/crossapp/CrossappBootListener.java
+++ b/demo/demo-crossapp/crossapp-client/src/main/java/io/servicecomb/demo/crossapp/CrossappBootListener.java
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Component;
import io.servicecomb.core.BootListener;
import io.servicecomb.core.definition.loader.DynamicSchemaLoader;
+@SuppressWarnings("deprecation")
@Component
public class CrossappBootListener implements BootListener {
@Override
diff --git a/demo/demo-crossapp/crossapp-server/src/main/java/io/servicecomb/demo/crossapp/CrossappBootListener.java b/demo/demo-crossapp/crossapp-server/src/main/java/io/servicecomb/demo/crossapp/CrossappBootListener.java
index 614b5f8..b99e619 100644
--- a/demo/demo-crossapp/crossapp-server/src/main/java/io/servicecomb/demo/crossapp/CrossappBootListener.java
+++ b/demo/demo-crossapp/crossapp-server/src/main/java/io/servicecomb/demo/crossapp/CrossappBootListener.java
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Component;
import io.servicecomb.core.BootListener;
import io.servicecomb.core.definition.loader.DynamicSchemaLoader;
+@SuppressWarnings("deprecation")
@Component
public class CrossappBootListener implements BootListener {
@Override
diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java b/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
index f03b9b4..03b91ff 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
+++ b/demo/demo-springmvc/springmvc-client/src/main/java/io/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -93,13 +93,15 @@ public class SpringmvcClient {
try {
// this test class is intended for retry hanging issue JAV-127
String content = restTemplate.getForObject("cse://springmvc/codeFirstSpringmvc/metricsForTest", String.class);
+ @SuppressWarnings("unchecked")
Map<String, String> resultMap = JsonUtils.OBJ_MAPPER.readValue(content, HashMap.class);
TestMgr.check(true, resultMap.get("CPU and Memory").contains("heapUsed="));
String[] requestProviders = resultMap.get("totalRequestProvider OPERATIONAL_LEVEL")
.replace("{", "")
- .replace("}", "").split(",");
+ .replace("}", "")
+ .split(",");
Map<String, Integer> requests = new HashMap<>();
for (String requestProvider : requestProviders) {
String[] requestKeyAndValues = requestProvider.split("=");
@@ -133,13 +135,13 @@ public class SpringmvcClient {
try {
String content = restTemplate.getForObject("cse://springmvc/codeFirstSpringmvc/prometheusForTest", String.class);
- TestMgr.check(true,content.contains("servicecomb_springmvc_codeFirst_addDate"));
- TestMgr.check(true,content.contains("servicecomb_springmvc_codeFirst_sayHello"));
- TestMgr.check(true,content.contains("servicecomb_springmvc_codeFirst_fallbackFromCache"));
- TestMgr.check(true,content.contains("servicecomb_springmvc_codeFirst_isTrue_producer"));
- TestMgr.check(true,content.contains("servicecomb_springmvc_codeFirst_add"));
- TestMgr.check(true,content.contains("servicecomb_springmvc_codeFirst_sayHi2"));
- TestMgr.check(true,content.contains("servicecomb_springmvc_codeFirst_saySomething"));
+ TestMgr.check(true, content.contains("servicecomb_springmvc_codeFirst_addDate"));
+ TestMgr.check(true, content.contains("servicecomb_springmvc_codeFirst_sayHello"));
+ TestMgr.check(true, content.contains("servicecomb_springmvc_codeFirst_fallbackFromCache"));
+ TestMgr.check(true, content.contains("servicecomb_springmvc_codeFirst_isTrue_producer"));
+ TestMgr.check(true, content.contains("servicecomb_springmvc_codeFirst_add"));
+ TestMgr.check(true, content.contains("servicecomb_springmvc_codeFirst_sayHi2"));
+ TestMgr.check(true, content.contains("servicecomb_springmvc_codeFirst_saySomething"));
String[] metricLines = content.split("\n");
if (metricLines.length > 0) {
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
index fcf70df..d88f963 100644
--- a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
@@ -99,6 +99,7 @@ public class ApolloClient {
}
}
+ @SuppressWarnings("unchecked")
void refreshConfig() {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json;charset=UTF-8");
diff --git a/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloClientTest.java b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloClientTest.java
index 74a250d..445ff9b 100644
--- a/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloClientTest.java
+++ b/dynamic-config/config-apollo/src/test/java/io/servicecomb/config/client/ApolloClientTest.java
@@ -55,9 +55,7 @@ public class ApolloClientTest {
Matchers.anyString(),
Matchers.any(HttpMethod.class),
Matchers.<HttpEntity<String>>any(),
- Matchers.<Class<String>>any()
- )
- ).thenReturn(responseEntity);
+ Matchers.<Class<String>>any())).thenReturn(responseEntity);
ApolloConfigurationSourceImpl impl = new ApolloConfigurationSourceImpl();
UpdateHandler updateHandler = impl.new UpdateHandler();
ApolloClient apolloClient = new ApolloClient(updateHandler);
@@ -81,7 +79,6 @@ public class ApolloClientTest {
ConfigRefresh cr = apolloClient.new ConfigRefresh("");
- ApolloConfig instance = ApolloConfig.INSTANCE;
try {
Deencapsulation.invoke(cr, "compareChangedConfig", before, after);
} catch (Exception e) {
diff --git a/integration-tests/test-common/src/test/java/io/servicecomb/tests/tracing/TraceContextConfig.java b/integration-tests/test-common/src/test/java/io/servicecomb/tests/tracing/TraceContextConfig.java
index 81133c8..03004cf 100644
--- a/integration-tests/test-common/src/test/java/io/servicecomb/tests/tracing/TraceContextConfig.java
+++ b/integration-tests/test-common/src/test/java/io/servicecomb/tests/tracing/TraceContextConfig.java
@@ -36,6 +36,7 @@ class TraceContextConfig {
}
private static class ParentAwareMDCCurrentTraceContext extends CurrentTraceContext {
+ @SuppressWarnings("deprecation")
static ParentAwareMDCCurrentTraceContext create() {
return new ParentAwareMDCCurrentTraceContext(new Default());
}
diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java
index f83d209..331bd0d 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultHealthCheckerManager.java
@@ -25,21 +25,15 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import io.servicecomb.metrics.common.HealthCheckResult;
import io.servicecomb.metrics.common.HealthChecker;
-import io.servicecomb.metrics.core.health.DefaultMicroserviceHealthChecker;
import io.servicecomb.swagger.invocation.exception.InvocationException;
@Component
public class DefaultHealthCheckerManager implements HealthCheckerManager {
-
- private static Logger logger = LoggerFactory.getLogger(DefaultHealthCheckerManager.class);
-
private final Map<String, HealthChecker> healthCheckers;
@Autowired(required = false)
diff --git a/metrics/metrics-integration/metrics-prometheus/src/main/java/io/servicecomb/metrics/prometheus/MetricsPublisher.java b/metrics/metrics-integration/metrics-prometheus/src/main/java/io/servicecomb/metrics/prometheus/MetricsPublisher.java
index dc83a56..30ef254 100644
--- a/metrics/metrics-integration/metrics-prometheus/src/main/java/io/servicecomb/metrics/prometheus/MetricsPublisher.java
+++ b/metrics/metrics-integration/metrics-prometheus/src/main/java/io/servicecomb/metrics/prometheus/MetricsPublisher.java
@@ -20,7 +20,12 @@ package io.servicecomb.metrics.prometheus;
import java.io.IOException;
import java.net.InetSocketAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextClosedEvent;
import org.springframework.stereotype.Component;
import com.netflix.config.DynamicPropertyFactory;
@@ -30,12 +35,14 @@ import io.prometheus.client.exporter.HTTPServer;
import io.servicecomb.foundation.common.exceptions.ServiceCombException;
@Component
-public class MetricsPublisher {
+public class MetricsPublisher implements ApplicationListener<ApplicationEvent> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MetricsPublisher.class);
+
private static final String METRICS_PROMETHEUS_PORT = "servicecomb.metrics.prometheus.port";
private final MetricsCollector metricsCollector;
- private final HTTPServer httpServer;
+ private HTTPServer httpServer;
@Autowired
public MetricsPublisher(MetricsCollector metricsCollector) {
@@ -45,8 +52,20 @@ public class MetricsPublisher {
this.metricsCollector.register();
try {
this.httpServer = new HTTPServer(new InetSocketAddress(publishPort), CollectorRegistry.defaultRegistry, true);
+ LOGGER.info("Prometheus httpServer listened {}.", publishPort);
} catch (IOException e) {
throw new ServiceCombException("create http publish server failed", e);
}
}
+
+ @Override
+ public void onApplicationEvent(ApplicationEvent event) {
+ if (!ContextClosedEvent.class.isInstance(event) || httpServer == null) {
+ return;
+ }
+
+ httpServer.stop();
+ httpServer = null;
+ LOGGER.info("Prometheus httpServer stopped.");
+ }
}
diff --git a/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java
index c49ac72..2837476 100644
--- a/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java
+++ b/samples/metrics-write-file-sample/metrics-write-file-log4j2-springboot/src/main/java/io/servicecomb/samples/mwf/Log4J2MetricsFileWriter.java
@@ -69,6 +69,7 @@ public class Log4J2MetricsFileWriter implements MetricsFileWriter {
logger.append(Log4jLogEvent.newBuilder().setMessage(new SimpleMessage(content)).build());
}
+ @SuppressWarnings("deprecation")
private RollingFileAppender initLogger(String loggerName, String filePrefix) {
String fileName = Paths.get(rootPath, filePrefix + "." + loggerName + ".dat").toString();
String filePattern = Paths.get(rootPath, filePrefix + "." + loggerName + "-%i.dat").toString();
diff --git a/samples/springmvc-sample/springmvc-provider/src/main/java/io/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java b/samples/springmvc-sample/springmvc-provider/src/main/java/io/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java
index 328fd94..2031799 100644
--- a/samples/springmvc-sample/springmvc-provider/src/main/java/io/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java
+++ b/samples/springmvc-sample/springmvc-provider/src/main/java/io/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java
@@ -20,13 +20,11 @@ package io.servicecomb.samples.springmvc.provider;
import javax.ws.rs.core.MediaType;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import io.servicecomb.foundation.metrics.MetricsServoRegistry;
import io.servicecomb.provider.rest.common.RestSchema;
import io.servicecomb.samples.common.schema.Hello;
import io.servicecomb.samples.common.schema.models.Person;
@@ -34,14 +32,6 @@ import io.servicecomb.samples.common.schema.models.Person;
@RestSchema(schemaId = "springmvcHello")
@RequestMapping(path = "/springmvchello", produces = MediaType.APPLICATION_JSON)
public class SpringmvcHelloImpl implements Hello {
-
- private MetricsServoRegistry registry;
-
- @Autowired
- public SpringmvcHelloImpl(MetricsServoRegistry registry) {
- this.registry = registry;
- }
-
@Override
@RequestMapping(path = "/sayhi", method = RequestMethod.POST)
public String sayHi(@RequestParam(name = "name") String name) {
diff --git a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/io/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/io/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java
index fabb086..1572ca4 100644
--- a/spring-boot-starter/spring-boot-starter-discovery/src/main/java/io/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java
+++ b/spring-boot-starter/spring-boot-starter-discovery/src/main/java/io/servicecomb/springboot/starter/discovery/CseRibbonClientConfiguration.java
@@ -16,12 +16,7 @@
*/
package io.servicecomb.springboot.starter.discovery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
-import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.Server;
diff --git a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestOperationGenerator.java b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestOperationGenerator.java
index fd1c364..8e9aa1f 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestOperationGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestOperationGenerator.java
@@ -97,6 +97,7 @@ public class TestOperationGenerator {
public void functionWithNoTag() {
}
+ @SuppressWarnings("unused")
public void functionWithNoAnnotation() {
}
}
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.