date:20190808

[dubbo] branch cloud-native updated: Remove ConfigManager operations in sub Configs, leave it to DubboBootstrap

2019-08-08 Thread liujun

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/cloud-native by this push:
 new 48c1cc4  Remove ConfigManager operations in sub Configs, leave it to 
DubboBootstrap
48c1cc4 is described below

commit 48c1cc4bfebcf3a66e4143862e87581ab6615d43
Author: ken.lj 
AuthorDate: Fri Aug 9 12:47:03 2019 +0800

Remove ConfigManager operations in sub Configs, leave it to DubboBootstrap
---
 .../dubbo/config/AbstractInterfaceConfig.java  |  14 +-
 .../dubbo/config/AbstractReferenceConfig.java  |   4 +-
 .../apache/dubbo/config/AbstractServiceConfig.java |   2 -
 .../org/apache/dubbo/config/ReferenceConfig.java   |  11 +-
 .../org/apache/dubbo/config/ServiceConfig.java |  19 ++
 .../apache/dubbo/config/spring/ReferenceBean.java  | 160 
 .../apache/dubbo/config/spring/ServiceBean.java| 206 -
 7 files changed, 40 insertions(+), 376 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 874e38b..5819a50 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -462,6 +462,7 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 }
 
 private void convertRegistryIdsToRegistries() {
+computeValidRegistryIds();
 if (StringUtils.isEmpty(registryIds)) {
 if (CollectionUtils.isEmpty(registries)) {
 List registryConfigs = 
ConfigManager.getInstance().getDefaultRegistries();
@@ -492,6 +493,14 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 
 }
 
+protected void computeValidRegistryIds() {
+if (StringUtils.isEmpty(getRegistryIds())) {
+if (getApplication() != null && 
StringUtils.isNotEmpty(getApplication().getRegistryIds())) {
+setRegistryIds(getApplication().getRegistryIds());
+}
+}
+}
+
 private void loadRegistriesFromBackwardConfig() {
 // for backward compatibility
 // -Ddubbo.registry.address is now deprecated.
@@ -620,7 +629,6 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 }
 
 public void setApplication(ApplicationConfig application) {
-ConfigManager.getInstance().setApplication(application);
 this.application = application;
 }
 
@@ -645,7 +653,6 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 }
 
 public void setModule(ModuleConfig module) {
-ConfigManager.getInstance().setModule(module);
 this.module = module;
 }
 
@@ -665,7 +672,6 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 
 @SuppressWarnings({"unchecked"})
 public void setRegistries(List registries) {
-ConfigManager.getInstance().addRegistries((List) 
registries);
 this.registries = (List) registries;
 }
 
@@ -687,7 +693,6 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 }
 
 public void setMonitor(MonitorConfig monitor) {
-ConfigManager.getInstance().setMonitor(monitor);
 this.monitor = monitor;
 }
 
@@ -705,7 +710,6 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 }
 
 public void setConfigCenter(ConfigCenterConfig configCenter) {
-ConfigManager.getInstance().addConfigCenter(configCenter);
 this.configCenter = configCenter;
 }
 
diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
index 545c2bc..7dcb70f 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java
@@ -21,13 +21,13 @@ import org.apache.dubbo.remoting.Constants;
 import org.apache.dubbo.rpc.InvokerListener;
 import org.apache.dubbo.rpc.support.ProtocolUtils;
 
-import static org.apache.dubbo.rpc.cluster.Constants.CLUSTER_STICKY_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY;
-import static org.apache.dubbo.rpc.Constants.LAZY_CONNECT_KEY;
 import static org.apache.dubbo.rpc.Constants.INVOKER_LISTENER_KEY;
+import static org.apache.dubbo.rpc.Constants.LAZY_CONNECT_KEY;
 import static

[dubbo] branch cloud-native updated (4a3f8ab -> 05ce087)

2019-08-08 Thread liujun

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a change to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git.


from 4a3f8ab  modify metadata
 new 550b404  Change how service instance is created.
 new b7b34b6  Merge branch 'cloud-native' of 
https://github.com/apache/dubbo into cloud-native
 new 2245cf7  Introduce ProtocolServer to distinguish from RemotingServer
 new 05ce087  Merge remote-tracking branch 'origin/cloud-native' into 
cloud-native

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dubbo-bootstrap/pom.xml|   7 +
 .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 153 +
 .../bootstrap/DubboServiceProviderBootstrap.java   |   4 +-
 .../DefaultGovernanceRuleRepositoryImpl.java   |  52 +--
 .../governance/GovernanceRuleRepository.java   |  94 +
 .../dubbo/rpc/cluster/router/AbstractRouter.java   |  13 +-
 .../cluster/router/condition/config/AppRouter.java |   5 +-
 .../router/condition/config/AppRouterFactory.java  |   3 +-
 .../router/condition/config/ListenableRouter.java  |   8 +-
 .../router/condition/config/ServiceRouter.java |   4 +-
 .../condition/config/ServiceRouterFactory.java |   3 +-
 .../dubbo/rpc/cluster/router/tag/TagRouter.java|  10 +-
 .../rpc/cluster/router/tag/TagRouterFactory.java   |   3 +-
 ...rpc.cluster.governance.GovernanceRuleRepository |   1 +
 .../apache/dubbo/common/config/Configuration.java  |  49 +++
 .../configcenter/AbstractDynamicConfiguration.java |   5 -
 .../config/configcenter/DynamicConfiguration.java  |  26 
 .../file/FileSystemDynamicConfiguration.java   |   5 -
 .../configcenter/nop/NopDynamicConfiguration.java  |   6 -
 .../wrapper/CompositeDynamicConfiguration.java |   7 +-
 .../file/FileSystemDynamicConfigurationTest.java   |   2 +-
 .../apache/dubbo/config/AbstractServiceConfig.java |   2 +-
 .../org/apache/dubbo/config/RegistryConfig.java|  32 -
 .../dubbo/config/builders/ConfigCenterBuilder.java |   1 -
 .../apache/dubbo/config/context/ConfigManager.java |   2 +-
 .../ConfigurableMetadataServiceExporter.java   |   1 +
 .../dubbo/config/DubboProviderBootstrap.java   |   5 +-
 .../org/apache/dubbo/config/mock/MockProtocol.java |   8 ++
 .../apache/dubbo/config/mock/MockProtocol2.java|   8 ++
 .../apache/dubbo/config/mock/MockTransporter.java  |   6 +-
 .../src/main/resources/META-INF/compat/dubbo.xsd   |  10 ++
 .../src/main/resources/META-INF/dubbo.xsd  |  10 ++
 .../support/apollo/ApolloDynamicConfiguration.java |   2 +-
 .../consul/ConsulDynamicConfiguration.java |  15 +-
 .../support/etcd/EtcdDynamicConfiguration.java |  12 +-
 .../support/nacos/NacosDynamicConfiguration.java   |   5 -
 .../zookeeper/ZookeeperDynamicConfiguration.java   |  10 --
 .../dubbo/metadata/WritableMetadataService.java|   1 +
 .../dubbo/qos/protocol/QosProtocolWrapper.java |   7 +
 .../client/AbstractServiceDiscoveryFactory.java|  71 ++
 .../EventPublishingServiceDiscoveryFactory.java|  47 ---
 .../registry/client/ServiceDiscoveryFactory.java   |  17 +--
 ...ExportedServicesRevisionMetadataCustomizer.java |   5 +-
 ...MetadataServiceURLParamsMetadataCustomizer.java |   5 +-
 .../integration/AbstractConfiguratorListener.java  |   8 +-
 .../registry/integration/RegistryDirectory.java|   3 +-
 .../registry/integration/RegistryProtocol.java |  11 +-
 .../registry/support/AbstractRegistryFactory.java  |   1 -
 .../registry/support/ServiceOrientedRegistry.java  |   5 +-
 ...e.dubbo.registry.client.ServiceDiscoveryFactory |   1 -
 .../client/InMemoryServiceDiscoveryFactory.java|   4 +-
 .../client/ServiceDiscoveryFactoryTest.java|  55 
 .../registry/etcd/EtcdServiceDiscoveryFactory.java |   6 +-
 .../nacos/NacosServiceDiscoveryFactory.java|   5 +-
 .../ZookeeperServiceDiscoveryFactory.java  |   5 +-
 .../java/org/apache/dubbo/remoting/Channel.java|   4 +-
 .../java/org/apache/dubbo/remoting/Endpoint.java   |   2 +-
 .../remoting/{Server.java => RemotingServer.java}  | 116 
 .../org/apache/dubbo/remoting/Transporter.java |   2 +-
 .../org/apache/dubbo/remoting/Transporters.java|   4 +-
 .../dubbo/remoting/exchange/ExchangeServer.java|   4 +-
 .../support/header/HeaderExchangeServer.java   |   8 +-
 .../dubbo/remoting/transport/AbstractServer.java   |   8 +-
 .../dubbo/remoting/transport/ServerDelegate.java   |  12 +-
 .../transport/grizzly/GrizzlyTransporter.java  |   4 +-
 .../org/apache/dubbo/remoting/http/HttpServer.java |   3 +-
 .../remoting/http/support/AbstractHttpServer.java  |  48 +++
 .../remoting/transport/mina/MinaTransporter.java

[dubbo] 03/04: Introduce ProtocolServer to distinguish from RemotingServer

2019-08-08 Thread liujun

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 2245cf70bc89c229a387fd9aa59339bdb947f8d6
Author: ken.lj 
AuthorDate: Fri Aug 9 10:36:28 2019 +0800

Introduce ProtocolServer to distinguish from RemotingServer
---
 .../org/apache/dubbo/bootstrap/DubboBootstrap.java |  1 +
 .../DefaultGovernanceRuleRepositoryImpl.java   | 52 ++--
 .../governance/GovernanceRuleRepository.java   | 94 ++
 .../dubbo/rpc/cluster/router/AbstractRouter.java   | 13 ++-
 .../cluster/router/condition/config/AppRouter.java |  5 +-
 .../router/condition/config/AppRouterFactory.java  |  3 +-
 .../router/condition/config/ListenableRouter.java  |  8 +-
 .../router/condition/config/ServiceRouter.java |  4 +-
 .../condition/config/ServiceRouterFactory.java |  3 +-
 .../dubbo/rpc/cluster/router/tag/TagRouter.java| 10 +--
 .../rpc/cluster/router/tag/TagRouterFactory.java   |  3 +-
 ...rpc.cluster.governance.GovernanceRuleRepository |  1 +
 .../apache/dubbo/common/config/Configuration.java  | 49 +++
 .../configcenter/AbstractDynamicConfiguration.java |  5 --
 .../config/configcenter/DynamicConfiguration.java  | 26 --
 .../file/FileSystemDynamicConfiguration.java   |  5 --
 .../configcenter/nop/NopDynamicConfiguration.java  |  6 --
 .../wrapper/CompositeDynamicConfiguration.java |  5 --
 .../file/FileSystemDynamicConfigurationTest.java   |  2 +-
 .../support/apollo/ApolloDynamicConfiguration.java |  2 +-
 .../consul/ConsulDynamicConfiguration.java | 15 ++--
 .../support/etcd/EtcdDynamicConfiguration.java | 12 +--
 .../support/nacos/NacosDynamicConfiguration.java   |  5 --
 .../zookeeper/ZookeeperDynamicConfiguration.java   | 10 ---
 .../dubbo/qos/protocol/QosProtocolWrapper.java |  7 ++
 .../integration/AbstractConfiguratorListener.java  |  8 +-
 .../registry/integration/RegistryDirectory.java|  3 +-
 .../registry/integration/RegistryProtocol.java |  5 +-
 .../java/org/apache/dubbo/rpc/ProtocolServer.java  |  5 +-
 .../dubbo/rpc/protocol/AbstractProxyProtocol.java  |  2 +-
 .../rpc/protocol/dubbo/DubboProtocolServer.java|  2 +-
 .../rpc/protocol/rest/BaseRestProtocolServer.java  | 12 +++
 ...ttpServer.java => DubboHttpProtocolServer.java} |  4 +-
 .../dubbo/rpc/protocol/rest/RestProtocol.java  |  1 +
 .../dubbo/rpc/protocol/rest/RestServerFactory.java |  2 +-
 .../dubbo/rpc/protocol/thrift/ThriftProtocol.java  |  2 +-
 36 files changed, 224 insertions(+), 168 deletions(-)

diff --git 
a/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java 
b/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
index fbc523a..005f11d 100644
--- 
a/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
+++ 
b/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
@@ -59,6 +59,7 @@ import org.apache.dubbo.rpc.ProtocolServer;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
similarity index 53%
copy from 
dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java
copy to 
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
index 7940101..64ddb02 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java
@@ -14,67 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.common.config.configcenter.nop;
+package org.apache.dubbo.rpc.cluster.governance;
 
-import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.ConfigurationListener;
 import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
 
-import java.util.SortedSet;
+public class DefaultGovernanceRuleRepositoryImpl implements 
GovernanceRuleRepository {
 
-import static java.util.Collections.emptySortedSet;
-
-/**
- * The default extension of {@link DynamicConfiguration}. If user does not 
specify a config centre, or specifies one
- * that is not a valid extension, it will default to this one.
- */
-@Deprecated
-public class NopDynamicConfiguration implements DynamicConfiguration {
-
-public NopDynamicConfiguration(URL url) {
-// no-op
-}
-
-@Override
-public Object getInternalProperty(String key) {

[dubbo] 04/04: Merge remote-tracking branch 'origin/cloud-native' into cloud-native

2019-08-08 Thread liujun

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 05ce0879067ff6010362049aed81b5f3def89c4f
Merge: 2245cf7 4a3f8ab
Author: ken.lj 
AuthorDate: Fri Aug 9 10:40:02 2019 +0800

Merge remote-tracking branch 'origin/cloud-native' into cloud-native

 dubbo-all/pom.xml  |  2 +-
 .../ConfigurableMetadataServiceExporter.java   |  4 ++
 .../dubbo/metadata/MetadataServiceExporter.java|  1 +
 .../dubbo/metadata/WritableMetadataService.java|  9 
 .../store/InMemoryWritableMetadataService.java | 57 +-
 .../store/RemoteWritableMetadataService.java   | 18 ++-
 .../DefaultMetadataServiceProxyFactory.java| 42 
 .../metadata/MetadataServiceProxyFactory.java  | 51 ---
 .../metadata/RefreshServiceMetadataCustomizer.java | 24 +
 ...dubbo.registry.client.ServiceInstanceCustomizer |  3 +-
 10 files changed, 103 insertions(+), 108 deletions(-)

[dubbo] 02/04: Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native

2019-08-08 Thread liujun

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit b7b34b6c475912c4c805b389954fd897bdd9f769
Merge: 550b404 03173f8
Author: ken.lj 
AuthorDate: Thu Aug 8 16:22:48 2019 +0800

Merge branch 'cloud-native' of https://github.com/apache/dubbo into 
cloud-native

 .travis.yml|   2 +-
 dubbo-bom/pom.xml  |   1 +
 dubbo-bootstrap/pom.xml|  40 +--
 .../org/apache/dubbo/bootstrap/DubboBootstrap.java |  25 +-
 .../bootstrap/DubboServiceConsumerBootstrap.java   |   3 +-
 ...ap.java => DubboServiceProvider2Bootstrap.java} |  34 +--
 dubbo-cluster/pom.xml  |   1 +
 .../router/condition/config/ListenableRouter.java  |   2 +-
 .../dubbo/rpc/cluster/router/tag/TagRouter.java|   2 +-
 .../support/wrapper/MockClusterInvoker.java|   2 +-
 .../dubbo/rpc/cluster/router/TagRouterTest.java|   5 +-
 .../support/AbstractClusterInvokerTest.java|   2 +-
 dubbo-common/pom.xml   |   1 +
 .../apache/dubbo/common/config/Configuration.java  |   2 -
 .../configcenter/AbstractDynamicConfiguration.java | 182 
 .../config/configcenter/DynamicConfiguration.java  |  86 --
 .../file/FileSystemDynamicConfiguration.java   |  23 +-
 .../configcenter/nop/NopDynamicConfiguration.java  |   6 +-
 .../wrapper/CompositeDynamicConfiguration.java |   5 +
 .../dubbo/common/constants/CommonConstants.java|   2 +-
 .../extension/AdaptiveClassCodeGenerator.java  |  10 +-
 .../apache/dubbo/common/bytecode/MixinTest.java|   1 -
 .../common/config/InmemoryConfigurationTest.java   |   6 +-
 .../threadlocal/InternalThreadLocalTest.java   |   1 -
 .../apache/dubbo/common/utils/PojoUtilsTest.java   |   5 +-
 dubbo-compatible/pom.xml   |   1 +
 .../dubbo/rpc/protocol/dubbo/FutureAdapter.java|   6 +-
 .../org/apache/dubbo/config/MethodConfigTest.java  |   1 -
 .../org/apache/dubbo/filter/LegacyInvoker.java |   2 +-
 .../java/org/apache/dubbo/rpc/RpcContextTest.java  |   6 +-
 dubbo-config/dubbo-config-api/pom.xml  |   1 +
 .../org/apache/dubbo/config/ApplicationConfig.java |   1 -
 .../org/apache/dubbo/config/ReferenceConfig.java   |  14 +-
 .../org/apache/dubbo/config/RegistryConfig.java|  10 +-
 .../org/apache/dubbo/config/ServiceConfig.java |   5 +-
 .../apache/dubbo/config/ReferenceConfigTest.java   |   8 +-
 .../ConfigurableMetadataServiceExporterTest.java   |   5 +-
 dubbo-config/dubbo-config-spring/pom.xml   |   1 +
 .../factory/annotation/ReferenceBeanBuilder.java   |   9 +
 .../ServiceAnnotationBeanPostProcessor.java|  14 +
 .../dubbo/config/spring/util/AnnotationUtils.java  |  20 +-
 .../ReferenceAnnotationBeanPostProcessorTest.java  |  89 +++---
 .../ServiceAnnotationBeanPostProcessorTest.java|  13 +
 .../context/annotation/EnableDubboConfigTest.java  |  11 +
 .../annotation/provider/DemoServiceImpl.java   |   4 +-
 .../DubboComponentScanRegistrarTest.java   | 118 
 .../DubboConfigBindingRegistrarTest.java   |  88 --
 .../DubboConfigBindingsRegistrarTest.java  |  63 -
 .../annotation/DubboConfigConfigurationTest.java   |  99 ---
 .../context/annotation/EnableDubboConfigTest.java  | 120 
 .../context/annotation/EnableDubboTest.java| 162 ---
 .../annotation/consumer/ConsumerConfiguration.java | 126 -
 .../consumer/test/TestConsumerConfiguration.java   |  96 ---
 .../annotation/provider/DemoServiceImpl.java   |  55 
 .../annotation/provider/ProviderConfiguration.java | 109 
 .../properties/DefaultDubboConfigBinderTest.java   |  94 ---
 dubbo-config/pom.xml   |   1 +
 .../support/nop/NopDynamicConfigurationTest.java   |  70 -
 .../dubbo-configcenter-apollo/pom.xml  |   1 +
 .../support/apollo/ApolloDynamicConfiguration.java |  10 +-
 .../dubbo-configcenter-consul/pom.xml  |   3 +-
 .../consul/ConsulDynamicConfiguration.java |   6 +-
 dubbo-configcenter/dubbo-configcenter-etcd/pom.xml |   3 +-
 .../support/etcd/EtcdDynamicConfiguration.java |  20 +-
 .../dubbo-configcenter-nacos/pom.xml   |   3 +-
 .../support/nacos/NacosDynamicConfiguration.java   |   8 +-
 .../nacos/NacosDynamicConfigurationTest.java   |   6 +-
 .../dubbo-configcenter-zookeeper/pom.xml   |   1 +
 .../zookeeper/ZookeeperDynamicConfiguration.java   |  84 +++---
 .../ZookeeperDynamicConfigurationTest.java |   2 +-
 dubbo-configcenter/pom.xml |   1 +
 dubbo-container/dubbo-container-api/pom.xml|   1 +
 dubbo-container/dubbo-container-log4j/pom.xml  |   1 +
 dubbo-container/dubbo-container-logback/pom.xml|   1 +

[dubbo] 01/04: Change how service instance is created.

2019-08-08 Thread liujun

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 550b40461197fbd9d1e6dc7ba5cb6ade8d7be77f
Author: ken.lj 
AuthorDate: Thu Aug 8 16:03:27 2019 +0800

Change how service instance is created.
---
 dubbo-bootstrap/pom.xml|   7 ++
 .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 139 +
 .../bootstrap/DubboServiceProviderBootstrap.java   |   3 +-
 .../wrapper/CompositeDynamicConfiguration.java |   2 +-
 .../apache/dubbo/config/AbstractServiceConfig.java |   2 +-
 .../org/apache/dubbo/config/RegistryConfig.java|  32 +++--
 .../dubbo/config/builders/ConfigCenterBuilder.java |   1 -
 .../apache/dubbo/config/context/ConfigManager.java |   2 +-
 .../ConfigurableMetadataServiceExporter.java   |   1 +
 .../dubbo/config/DubboProviderBootstrap.java   |   5 +-
 .../org/apache/dubbo/config/mock/MockProtocol.java |   8 ++
 .../apache/dubbo/config/mock/MockProtocol2.java|   8 ++
 .../apache/dubbo/config/mock/MockTransporter.java  |   6 +-
 .../src/main/resources/META-INF/compat/dubbo.xsd   |  10 ++
 .../src/main/resources/META-INF/dubbo.xsd  |  10 ++
 .../dubbo/metadata/WritableMetadataService.java|   1 +
 .../client/AbstractServiceDiscoveryFactory.java|  71 +++
 .../EventPublishingServiceDiscoveryFactory.java|  47 ---
 .../registry/client/ServiceDiscoveryFactory.java   |  17 +--
 ...ExportedServicesRevisionMetadataCustomizer.java |   5 +-
 ...MetadataServiceURLParamsMetadataCustomizer.java |   5 +-
 .../registry/integration/RegistryProtocol.java |   6 +
 .../registry/support/AbstractRegistryFactory.java  |   1 -
 .../registry/support/ServiceOrientedRegistry.java  |   5 +-
 ...e.dubbo.registry.client.ServiceDiscoveryFactory |   1 -
 .../client/InMemoryServiceDiscoveryFactory.java|   4 +-
 .../client/ServiceDiscoveryFactoryTest.java|  55 
 .../registry/etcd/EtcdServiceDiscoveryFactory.java |   6 +-
 .../nacos/NacosServiceDiscoveryFactory.java|   5 +-
 .../ZookeeperServiceDiscoveryFactory.java  |   5 +-
 .../java/org/apache/dubbo/remoting/Channel.java|   4 +-
 .../java/org/apache/dubbo/remoting/Endpoint.java   |   2 +-
 .../remoting/{Server.java => RemotingServer.java}  | 116 -
 .../org/apache/dubbo/remoting/Transporter.java |   2 +-
 .../org/apache/dubbo/remoting/Transporters.java|   4 +-
 .../dubbo/remoting/exchange/ExchangeServer.java|   4 +-
 .../support/header/HeaderExchangeServer.java   |   8 +-
 .../dubbo/remoting/transport/AbstractServer.java   |   8 +-
 .../dubbo/remoting/transport/ServerDelegate.java   |  12 +-
 .../transport/grizzly/GrizzlyTransporter.java  |   4 +-
 .../org/apache/dubbo/remoting/http/HttpServer.java |   3 +-
 .../remoting/http/support/AbstractHttpServer.java  |  48 +++
 .../remoting/transport/mina/MinaTransporter.java   |   4 +-
 .../remoting/transport/netty/NettyServer.java  |   4 +-
 .../remoting/transport/netty/NettyTransporter.java |   4 +-
 .../transport/netty/ClientReconnectTest.java   |   8 +-
 .../remoting/transport/netty/NettyClientTest.java  |   6 +-
 .../remoting/transport/netty4/NettyServer.java |   4 +-
 .../transport/netty4/NettyTransporter.java |   4 +-
 .../transport/netty4/ClientReconnectTest.java  |   8 +-
 .../transport/netty4/NettyTransporterTest.java |   4 +-
 .../java/org/apache/dubbo/remoting/p2p/Peer.java   |   4 +-
 .../exchange/support/AbstractExchangeGroup.java|   4 +-
 .../dubbo/remoting/p2p/support/AbstractGroup.java  |   8 +-
 .../dubbo/remoting/p2p/support/ServerPeer.java |   4 +-
 .../main/java/org/apache/dubbo/rpc/Protocol.java   |   9 ++
 .../java/org/apache/dubbo/rpc/ProtocolServer.java  |  33 +++--
 .../dubbo/rpc/protocol/AbstractProtocol.java   |  12 ++
 .../dubbo/rpc/protocol/AbstractProxyProtocol.java  |  38 ++
 .../dubbo/rpc/protocol/ProtocolFilterWrapper.java  |   6 +
 .../rpc/protocol/ProtocolListenerWrapper.java  |   9 +-
 .../dubbo/rpc/protocol/dubbo/DubboProtocol.java|  22 ++--
 .../rpc/protocol/dubbo/DubboProtocolServer.java|  62 +
 .../protocol/dubbo/status/ServerStatusChecker.java |  10 +-
 .../protocol/dubbo/telnet/PortTelnetHandler.java   |  12 +-
 .../rpc/protocol/dubbo/support/ProtocolUtils.java  |   8 +-
 .../rpc/protocol/hessian/HessianProtocol.java  |  25 ++--
 .../dubbo/rpc/protocol/http/HttpProtocol.java  |  14 +--
 .../rpc/protocol/jsonrpc/JsonRpcProtocol.java  |  21 ++--
 ...RestServer.java => BaseRestProtocolServer.java} |   2 +-
 .../dubbo/rpc/protocol/rest/DubboHttpServer.java   |   4 +-
 ...ttyServer.java => NettyRestProtocolServer.java} |   6 +-
 .../dubbo/rpc/protocol/rest/RestProtocol.java  |  16 ++-
 .../{RestServer.java => RestProtocolServer.java}   |   4 +-
 .../dubbo/rpc/protocol/rest/RestServerFactory.java |   4 +-

[dubbo-admin] branch develop updated: Fix some UI bug on test module (#341)

2019-08-08 Thread dlive

This is an automated email from the ASF dual-hosted git repository.

dlive pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git


The following commit(s) were added to refs/heads/develop by this push:
 new a21b125  Fix some UI bug on test module (#341)
a21b125 is described below

commit a21b125e77fce903993dd863f7cfea8ee20e63ed
Author: Rudolf 
AuthorDate: Fri Aug 9 10:31:35 2019 +0800

Fix some UI bug on test module (#341)

1. The service test page will throw undefined exception in console if the 
"service" parameter in url is null.
2. Keep the style of service test page consistent with other pages
---
 dubbo-admin-ui/src/components/test/ServiceTest.vue | 58 --
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/dubbo-admin-ui/src/components/test/ServiceTest.vue 
b/dubbo-admin-ui/src/components/test/ServiceTest.vue
index 7902526..95cff5e 100644
--- a/dubbo-admin-ui/src/components/test/ServiceTest.vue
+++ b/dubbo-admin-ui/src/components/test/ServiceTest.vue
@@ -20,8 +20,7 @@
   
 
   
-  
-
+  
   
 
   
@@ -45,29 +44,37 @@
 
   
 
-  
-  
-{{$t('methods')}}
-  
   
-
-  
-{{ props.item.name }}
-{{ type }}
-{{ props.item.returnType }}
-
-  
-
-  edit
-
-{{$t('test')}}
-  
-
-  
-
+
+  
+{{$t('methods')}}
+
+  
+  
+
+  
+{{ props.item.name }}
+
+  {{ type }}
+
+
+  {{ props.item.returnType }}
+
+
+  
+
+  edit
+
+{{$t('test')}}
+  
+
+  
+
+  
+
   
 
   
@@ -231,7 +238,7 @@
 mounted () {
   this.$store.dispatch('loadServiceItems')
   let query = this.$route.query
-  this.filter = query['service']
+  this.filter = query['service'] || ''
   if ('group' in query) {
 this.filter = query['group'] + '/' + this.filter
   }
@@ -241,6 +248,7 @@
   if (this.filter) {
 this.search(this.filter.replace('/', '*'))
   }
+  this.setHeaders()
 }
   }

[dubbo-go] branch master updated (a14701b -> f169566)

2019-08-08 Thread alexstocks

This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.


from a14701b  Merge pull request #159 from fangyincheng/master
 new 320c0e1  remove ineffassign
 new 8017536  remove ineffassign
 new f169566  Merge pull request #160 from 
xujianhai666/feat-remove-ineffassign

The 523 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 cluster/cluster_impl/failback_cluster_invoker.go | 2 --
 cluster/cluster_impl/failsafe_cluster_invoker.go | 1 -
 2 files changed, 3 deletions(-)

[dubbo] branch cloud-native updated: modify metadata

2019-08-08 Thread victory

This is an automated email from the ASF dual-hosted git repository.

victory pushed a commit to branch cloud-native
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/cloud-native by this push:
 new 4a3f8ab  modify metadata
4a3f8ab is described below

commit 4a3f8ab3994e34413f479cc582d13bce9b5bad61
Author: cvictory 
AuthorDate: Thu Aug 8 17:33:18 2019 +0800

modify metadata
---
 dubbo-all/pom.xml  |  2 +-
 .../ConfigurableMetadataServiceExporter.java   |  4 ++
 .../dubbo/metadata/MetadataServiceExporter.java|  1 +
 .../dubbo/metadata/WritableMetadataService.java|  9 
 .../store/InMemoryWritableMetadataService.java | 57 +-
 .../store/RemoteWritableMetadataService.java   | 18 ++-
 .../DefaultMetadataServiceProxyFactory.java| 42 
 .../metadata/MetadataServiceProxyFactory.java  | 51 ---
 .../metadata/RefreshServiceMetadataCustomizer.java | 24 +
 ...dubbo.registry.client.ServiceInstanceCustomizer |  3 +-
 10 files changed, 103 insertions(+), 108 deletions(-)

diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index f9932a1..dd68787 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -784,7 +784,7 @@
 
 
 
-
META-INF/dubbo/internal/org.apache.dubbo.registry.client.metadata.MetadataServiceProxyFactory
+
META-INF/dubbo/internal/org.apache.dubbo.registry.client.metadata.proxy.MetadataServiceProxyFactory
 
 
 
diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
index 8806f03..6fbd33b 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/metadata/ConfigurableMetadataServiceExporter.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.config.AbstractConfig;
 import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.MetadataReportConfig;
 import org.apache.dubbo.config.ProtocolConfig;
 import org.apache.dubbo.config.RegistryConfig;
 import org.apache.dubbo.config.ServiceConfig;
@@ -28,6 +29,7 @@ import org.apache.dubbo.config.context.ConfigManager;
 import org.apache.dubbo.metadata.MetadataService;
 import org.apache.dubbo.metadata.MetadataServiceExporter;
 import org.apache.dubbo.metadata.WritableMetadataService;
+import org.apache.dubbo.metadata.store.RemoteWritableMetadataService;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -55,6 +57,7 @@ public class ConfigurableMetadataServiceExporter implements 
MetadataServiceExpor
 private volatile ServiceConfig serviceConfig;
 
 private ApplicationConfig applicationConfig;
+private MetadataReportConfig metadataReportConfig;
 
 private List registries = new LinkedList<>();
 
@@ -98,6 +101,7 @@ public class ConfigurableMetadataServiceExporter implements 
MetadataServiceExpor
 }
 
 this.serviceConfig = serviceConfig;
+
 } else {
 if (logger.isWarnEnabled()) {
 logger.warn("The MetadataService has been exported : " + 
serviceConfig.getExportedUrls());
diff --git 
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java
 
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java
index 6ba99de..e256268 100644
--- 
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java
+++ 
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceExporter.java
@@ -17,6 +17,7 @@
 package org.apache.dubbo.metadata;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.extension.SPI;
 
 import java.util.List;
 
diff --git 
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java
 
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java
index 0af2163..5398fc5 100644
--- 
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java
+++ 
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/WritableMetadataService.java
@@ -60,6 +60,15 @@ public interface WritableMetadataService extends 
MetadataService {
 boolean

[dubbo] branch cloud-native updated: Remove ConfigManager operations in sub Configs, leave it to DubboBootstrap

[dubbo] branch cloud-native updated (4a3f8ab -> 05ce087)

[dubbo] 03/04: Introduce ProtocolServer to distinguish from RemotingServer

[dubbo] 04/04: Merge remote-tracking branch 'origin/cloud-native' into cloud-native

[dubbo] 02/04: Merge branch 'cloud-native' of https://github.com/apache/dubbo into cloud-native

[dubbo] 01/04: Change how service instance is created.

[dubbo-admin] branch develop updated: Fix some UI bug on test module (#341)

[dubbo-go] branch master updated (a14701b -> f169566)

[dubbo] branch cloud-native updated: modify metadata

9 matches

Site Navigation

Mail list logo

Footer information