This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 56b2193 Add 'forks' config into xml config (#2568)
56b2193 is described below
commit 56b219316205a12b4ce95a82b10b527798df9e34
Author: 时无两丶 <[email protected]>
AuthorDate: Tue Nov 6 17:16:21 2018 +0800
Add 'forks' config into xml config (#2568)
* Add forks into xml config.
* Add forks into xml config.
* Add forks into xml config.
---
.../java/org/apache/dubbo/config/AbstractMethodConfig.java | 13 +++++++++++++
.../org/apache/dubbo/config/AbstractMethodConfigTest.java | 7 +++++++
.../src/main/resources/META-INF/compat/dubbo.xsd | 10 ++++++++++
.../src/main/resources/META-INF/dubbo.xsd | 10 ++++++++++
.../java/org/apache/dubbo/config/spring/ConfigTest.java | 14 ++++++++++++++
5 files changed, 54 insertions(+)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
index a4acce8..a2c3de6 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java
@@ -64,6 +64,19 @@ public abstract class AbstractMethodConfig extends
AbstractConfig {
// customized parameters
protected Map<String, String> parameters;
+ /**
+ * forks for forking cluster
+ */
+ protected Integer forks;
+
+ public Integer getForks() {
+ return forks;
+ }
+
+ public void setForks(Integer forks) {
+ this.forks = forks;
+ }
+
public Integer getTimeout() {
return timeout;
}
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractMethodConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractMethodConfigTest.java
index 41549e3..063a2e3 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractMethodConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractMethodConfigTest.java
@@ -36,6 +36,13 @@ public class AbstractMethodConfigTest {
}
@Test
+ public void testForks() throws Exception {
+ MethodConfig methodConfig = new MethodConfig();
+ methodConfig.setForks(10);
+ assertThat(methodConfig.getForks(), equalTo(10));
+ }
+
+ @Test
public void testRetries() throws Exception {
MethodConfig methodConfig = new MethodConfig();
methodConfig.setRetries(3);
diff --git
a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd
b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd
index 92d7bd2..902bae8 100644
---
a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd
+++
b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd
@@ -101,6 +101,11 @@
<xsd:documentation><![CDATA[ Use cluster strategy.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="forks" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ ForkingCluster forks.
]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="filter" type="xsd:string">
<xsd:annotation>
<xsd:documentation><![CDATA[ The filter.
]]></xsd:documentation>
@@ -492,6 +497,11 @@
<xsd:documentation><![CDATA[ The registry cluster type.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="forks" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ ForkingCluster forks.
]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="group" type="xsd:string">
<xsd:annotation>
<xsd:documentation><![CDATA[ The registry group.
]]></xsd:documentation>
diff --git
a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
index 88fe25f..9b21ba2 100644
--- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
+++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
@@ -101,6 +101,11 @@
<xsd:documentation><![CDATA[ Use cluster strategy.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="forks" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ ForkingCluster forks.
]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="filter" type="xsd:string">
<xsd:annotation>
<xsd:documentation><![CDATA[ The filter.
]]></xsd:documentation>
@@ -486,6 +491,11 @@
<xsd:documentation><![CDATA[ The registry cluster type.
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="forks" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[ ForkingCluster forks.
]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
<xsd:attribute name="group" type="xsd:string">
<xsd:annotation>
<xsd:documentation><![CDATA[ The registry group.
]]></xsd:documentation>
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
index ca9cc94..d36fedc 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ConfigTest.java
@@ -148,6 +148,20 @@ public class ConfigTest {
}
@Test
+ public void testForks() {
+ ReferenceConfig<DemoService> reference = new
ReferenceConfig<DemoService>();
+ reference.setApplication(new ApplicationConfig("consumer"));
+ reference.setRegistry(new RegistryConfig(RegistryConfig.NO_AVAILABLE));
+ reference.setInterface(DemoService.class);
+ reference.setUrl("dubbo://127.0.0.1:20881");
+
+ int forks = 10;
+ reference.setForks(forks);
+ String str = reference.toString();
+ assertTrue(str.contains("forks=\"" + forks + "\""));
+ }
+
+ @Test
public void testMultiProtocol() {
ClassPathXmlApplicationContext ctx = new
ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.',
'/') + "/multi-protocol.xml");
ctx.start();
