You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by me...@apache.org on 2018/03/28 03:04:39 UTC
[incubator-dubbo-spring-boot-project] branch 0.2.0 updated: Bug fix
This is an automated email from the ASF dual-hosted git repository.
mercyblitz pushed a commit to branch 0.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git
The following commit(s) were added to refs/heads/0.2.0 by this push:
new 7652f4b Bug fix
7652f4b is described below
commit 7652f4b1cf03b36279c0926db3360585f6e801ff
Author: taogu.mxx <ta...@taobao.com>
AuthorDate: Wed Mar 28 11:04:21 2018 +0800
Bug fix
---
.../actuate/endpoint/DubboShutdownEndpoint.java | 2 +-
.../dubbo/actuate/endpoint/DubboEndpointTest.java | 13 +-
.../DubboEndpointsAutoConfigurationTest.java | 18 +-
.../actuate/endpoint/mvc/DubboMvcEndpointTest.java | 190 ---------------------
4 files changed, 15 insertions(+), 208 deletions(-)
diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboShutdownEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboShutdownEndpoint.java
index e2af718..9ad9e83 100644
--- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboShutdownEndpoint.java
+++ b/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboShutdownEndpoint.java
@@ -76,7 +76,7 @@ public class DubboShutdownEndpoint extends AbstractDubboEndpoint {
shutdownData.put("shutdown.count", shutdownCountData);
- return shutdownCountData;
+ return shutdownData;
}
}
diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
index 998f5d0..3083af3 100644
--- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
+++ b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java
@@ -23,6 +23,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
import java.util.Map;
@@ -35,7 +36,7 @@ import static com.alibaba.dubbo.common.Version.getVersion;
* @see DubboEndpoint
* @since 1.0.0
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
@SpringBootTest(
classes = {
DubboEndpoint.class
@@ -56,11 +57,9 @@ public class DubboEndpointTest {
Map<String, String> versions = (Map<String, String>) metadata.get("versions");
Map<String, String> urls = (Map<String, String>) metadata.get("urls");
- Map<String, String> endpoints = (Map<String, String>) metadata.get("endpoints");
Assert.assertFalse(versions.isEmpty());
Assert.assertFalse(urls.isEmpty());
- Assert.assertFalse(endpoints.isEmpty());
Assert.assertEquals(getVersion(DubboUtils.class, "1.0.0"), versions.get("dubbo-spring-boot"));
Assert.assertEquals(getVersion(), versions.get("dubbo"));
@@ -71,15 +70,7 @@ public class DubboEndpointTest {
Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project/issues", urls.get("issues"));
Assert.assertEquals("https://github.com/dubbo/dubbo-spring-boot-project.git", urls.get("git"));
- Assert.assertEquals("/shutdown", endpoints.get("shutdown"));
- Assert.assertEquals("/configs", endpoints.get("configs"));
- Assert.assertEquals("/services", endpoints.get("services"));
- Assert.assertEquals("/references", endpoints.get("references"));
- Assert.assertEquals("/properties", endpoints.get("properties"));
-
}
-
-
}
diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java
index 65e60e3..ad1cd0f 100644
--- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java
+++ b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java
@@ -39,11 +39,11 @@ import java.util.SortedMap;
@SpringBootTest(
classes = {
DubboEndpointsAutoConfiguration.class,
- DubboEndpointsAutoConfigurationTest.class,
- DubboEndpointsAutoConfigurationTest.DefaultDemoService.class
+ DubboEndpointsAutoConfigurationTest.class
},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {
+ "dubbo.service.version = 1.0.0",
"dubbo.application.id = my-application",
"dubbo.application.name = dubbo-demo-application",
"dubbo.module.id = my-module",
@@ -55,7 +55,13 @@ import java.util.SortedMap;
"dubbo.protocol.port=20880",
"dubbo.provider.id=my-provider",
"dubbo.provider.host=127.0.0.1",
- "dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint.mvc"
+ "dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint",
+ "management.endpoint.dubbo.enabled = true",
+ "management.endpoint.dubbo-shutdown.enabled = true",
+ "management.endpoint.dubbo-configs.enabled = true",
+ "management.endpoint.dubbo-services.enabled = true",
+ "management.endpoint.dubbo-references.enabled = true",
+ "management.endpoint.dubbo-properties.enabled = true",
})
@EnableAutoConfiguration
public class DubboEndpointsAutoConfigurationTest {
@@ -137,7 +143,7 @@ public class DubboEndpointsAutoConfigurationTest {
Assert.assertEquals(1, services.size());
- Map<String, Object> demoServiceMeta = services.get("ServiceBean@com.alibaba.boot.dubbo.actuate.endpoint.mvc.DubboMvcEndpointTest$DemoService#dubboMvcEndpointTest.DefaultDemoService");
+ Map<String, Object> demoServiceMeta = services.get("ServiceBean@com.alibaba.boot.dubbo.actuate.endpoint.DubboEndpointsAutoConfigurationTest$DemoService#dubboEndpointsAutoConfigurationTest.DefaultDemoService");
Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
@@ -168,12 +174,12 @@ public class DubboEndpointsAutoConfigurationTest {
Assert.assertEquals("20880", properties.get("dubbo.protocol.port"));
Assert.assertEquals("my-provider", properties.get("dubbo.provider.id"));
Assert.assertEquals("127.0.0.1", properties.get("dubbo.provider.host"));
- Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint.mvc", properties.get("dubbo.scan.basePackages"));
+ Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint", properties.get("dubbo.scan.basePackages"));
}
@Service(
- version = "1.0.0",
+ version = "${dubbo.service.version}",
application = "${dubbo.application.id}",
protocol = "${dubbo.protocol.id}",
registry = "${dubbo.registry.id}"
diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java b/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java
deleted file mode 100644
index dadd5a3..0000000
--- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/mvc/DubboMvcEndpointTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements. See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License. You may obtain a copy of the License at
-// *
-// * http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package com.alibaba.boot.dubbo.actuate.endpoint.mvc;
-//
-//import com.alibaba.boot.dubbo.actuate.endpoint.DubboEndpoint;
-//import com.alibaba.boot.dubbo.autoconfigure.DubboAutoConfiguration;
-//import com.alibaba.dubbo.config.annotation.Service;
-//import org.junit.Assert;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.test.context.TestPropertySource;
-//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-//import org.springframework.web.context.request.async.DeferredResult;
-//
-//import java.util.Map;
-//import java.util.SortedMap;
-//
-///**
-// * {@link DubboMvcEndpoint} Test
-// *
-// * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
-// * @see DubboMvcEndpoint
-// * @since 1.0.0
-// */
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@TestPropertySource(
-// properties = {
-// "dubbo.application.id = my-application",
-// "dubbo.application.name = dubbo-demo-application",
-// "dubbo.module.id = my-module",
-// "dubbo.module.name = dubbo-demo-module",
-// "dubbo.registry.id = my-registry",
-// "dubbo.registry.address = N/A",
-// "dubbo.protocol.id=my-protocol",
-// "dubbo.protocol.name=dubbo",
-// "dubbo.protocol.port=20880",
-// "dubbo.provider.id=my-provider",
-// "dubbo.provider.host=127.0.0.1",
-// "dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint.mvc"
-// }
-//)
-//@SpringBootTest(
-// classes = {
-// DubboAutoConfiguration.class,
-// DubboEndpoint.class,
-// DubboMvcEndpointTest.class
-// }
-//)
-//public class DubboMvcEndpointTest {
-//
-// @Bean
-// public DubboMvcEndpoint dubboMvcEndpoint(DubboEndpoint dubboEndpoint) {
-// return new DubboMvcEndpoint(dubboEndpoint);
-// }
-//
-// @Autowired
-// private DubboMvcEndpoint dubboMvcEndpoint;
-//
-//
-// @Test
-// public void testShutdown() throws Exception {
-//
-// DeferredResult result = dubboMvcEndpoint.shutdown();
-//
-// Map<String, Object> value = (Map<String, Object>) result.getResult();
-//
-// Map<String, Object> shutdownCounts = (Map<String, Object>) value.get("shutdown.count");
-//
-// Assert.assertEquals(0, shutdownCounts.get("registries"));
-// Assert.assertEquals(1, shutdownCounts.get("protocols"));
-// Assert.assertEquals(1, shutdownCounts.get("services"));
-// Assert.assertEquals(0, shutdownCounts.get("references"));
-//
-// }
-//
-// @Test
-// public void testConfigs() {
-//
-// Map<String, Map<String, Map<String, Object>>> configsMap = dubboMvcEndpoint.configs();
-//
-// Map<String, Map<String, Object>> beansMetadata = configsMap.get("ApplicationConfig");
-// Assert.assertEquals("dubbo-demo-application", beansMetadata.get("my-application").get("name"));
-//
-// beansMetadata = configsMap.get("ConsumerConfig");
-// Assert.assertTrue(beansMetadata.isEmpty());
-//
-// beansMetadata = configsMap.get("MethodConfig");
-// Assert.assertTrue(beansMetadata.isEmpty());
-//
-// beansMetadata = configsMap.get("ModuleConfig");
-// Assert.assertEquals("dubbo-demo-module", beansMetadata.get("my-module").get("name"));
-//
-// beansMetadata = configsMap.get("MonitorConfig");
-// Assert.assertTrue(beansMetadata.isEmpty());
-//
-// beansMetadata = configsMap.get("ProtocolConfig");
-// Assert.assertEquals("dubbo", beansMetadata.get("my-protocol").get("name"));
-//
-// beansMetadata = configsMap.get("ProviderConfig");
-// Assert.assertEquals("127.0.0.1", beansMetadata.get("my-provider").get("host"));
-//
-// beansMetadata = configsMap.get("ReferenceConfig");
-// Assert.assertTrue(beansMetadata.isEmpty());
-//
-// beansMetadata = configsMap.get("RegistryConfig");
-// Assert.assertEquals("N/A", beansMetadata.get("my-registry").get("address"));
-//
-// beansMetadata = configsMap.get("ServiceConfig");
-// Assert.assertFalse(beansMetadata.isEmpty());
-//
-// }
-//
-// @Test
-// public void testServices() {
-//
-// Map<String, Map<String, Object>> services = dubboMvcEndpoint.services();
-//
-// Assert.assertEquals(1, services.size());
-//
-// Map<String, Object> demoServiceMeta = services.get("ServiceBean@com.alibaba.boot.dubbo.actuate.endpoint.mvc.DubboMvcEndpointTest$DemoService#dubboMvcEndpointTest.DefaultDemoService");
-//
-// Assert.assertEquals("1.0.0", demoServiceMeta.get("version"));
-//
-// }
-//
-// @Test
-// public void testReferences() {
-//
-// Map<String, Map<String, Object>> references = dubboMvcEndpoint.references();
-//
-// Assert.assertTrue(references.isEmpty());
-//
-// }
-//
-// @Test
-// public void testProperties() {
-//
-// SortedMap<String, Object> properties = dubboMvcEndpoint.properties();
-//
-// Assert.assertEquals("my-application", properties.get("dubbo.application.id"));
-// Assert.assertEquals("dubbo-demo-application", properties.get("dubbo.application.name"));
-// Assert.assertEquals("my-module", properties.get("dubbo.module.id"));
-// Assert.assertEquals("dubbo-demo-module", properties.get("dubbo.module.name"));
-// Assert.assertEquals("my-registry", properties.get("dubbo.registry.id"));
-// Assert.assertEquals("N/A", properties.get("dubbo.registry.address"));
-// Assert.assertEquals("my-protocol", properties.get("dubbo.protocol.id"));
-// Assert.assertEquals("dubbo", properties.get("dubbo.protocol.name"));
-// Assert.assertEquals("20880", properties.get("dubbo.protocol.port"));
-// Assert.assertEquals("my-provider", properties.get("dubbo.provider.id"));
-// Assert.assertEquals("127.0.0.1", properties.get("dubbo.provider.host"));
-// Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint.mvc", properties.get("dubbo.scan.basePackages"));
-// }
-//
-//
-// @Service(
-// version = "1.0.0",
-// application = "${dubbo.application.id}",
-// protocol = "${dubbo.protocol.id}",
-// registry = "${dubbo.registry.id}"
-// )
-// static class DefaultDemoService implements DemoService {
-//
-// public String sayHello(String name) {
-// return "Hello, " + name + " (from Spring Boot)";
-// }
-//
-// }
-//
-// interface DemoService {
-// String sayHello(String name);
-// }
-//
-//}
--
To stop receiving notification emails like this one, please contact
mercyblitz@apache.org.