Skip to content

Commit 4ad2634

Browse files
chickenljchickenlj
committed
Merge branch 'master' of https://github.com/apache/dubbo 
2 parents b939b34 + 24ca37b commit 4ad2634

12 files changed

Lines changed: 31 additions & 13 deletions

File tree

‎dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/Constants.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.dubbo.common.config.configcenter;
1818

19+
@Deprecated
1920
public interface Constants {
2021
String CONFIG_CLUSTER_KEY = "config.cluster";
2122
String CONFIG_NAMESPACE_KEY = "config.namespace";

‎dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/TreePathDynamicConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import static java.util.Collections.emptySortedSet;
2828
import static java.util.Collections.unmodifiableSortedSet;
29-
import static org.apache.dubbo.common.config.configcenter.Constants.CONFIG_NAMESPACE_KEY;
29+
import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
3030
import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
3131
import static org.apache.dubbo.common.utils.CollectionUtils.isEmpty;
3232
import static org.apache.dubbo.common.utils.PathUtils.buildPath;

‎dubbo-common/src/main/java/org/apache/dubbo/common/extension/Wrapper.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616
*/
1717
package org.apache.dubbo.common.extension;
1818

19+
import java.lang.annotation.Retention;
20+
import java.lang.annotation.RetentionPolicy;
21+
1922
/**
2023
* The annotated class will only work as a wrapper when the condition matches.
2124
*/
25+
@Retention(RetentionPolicy.RUNTIME)
2226
public @interface Wrapper {
2327

2428
/**

‎dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigConfigurationAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ConfigConfigurationAdapter implements Configuration {
3232

3333
public ConfigConfigurationAdapter(AbstractConfig config) {
3434
Map<String, String> configMetadata = config.getMetaData();
35-
metaData = new HashMap<>(configMetadata.size());
35+
metaData = new HashMap<>(configMetadata.size(), 1.0f);
3636
for (Map.Entry<String, String> entry : configMetadata.entrySet()) {
3737
String prefix = config.getPrefix().endsWith(".") ? config.getPrefix() : config.getPrefix() + ".";
3838
String id = StringUtils.isEmpty(config.getId()) ? "" : config.getId() + ".";

‎dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,6 @@ private void loadRemoteConfigs() {
869869
* Initialize {@link MetadataService} from {@link WritableMetadataService}'s extension
870870
*/
871871
private void initMetadataService() {
872-
startMetadataCenter();
873872
this.metadataService = getDefaultExtension();
874873
this.metadataServiceExporter = new ConfigurableMetadataServiceExporter(metadataService);
875874
}

‎dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfig.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.dubbo.config.ProviderConfig;
2525
import org.apache.dubbo.config.RegistryConfig;
2626

27+
import com.alibaba.spring.beans.factory.annotation.EnableConfigurationBeanBinding;
2728
import org.springframework.context.annotation.Import;
2829

2930
import java.lang.annotation.Documented;
@@ -34,7 +35,7 @@
3435
import java.lang.annotation.Target;
3536

3637
/**
37-
* As a convenient and multiple {@link EnableDubboConfigBinding}
38+
* As a convenient and multiple {@link EnableConfigurationBeanBinding}
3839
* in default behavior , is equal to single bean bindings with below convention prefixes of properties:
3940
* <ul>
4041
* <li>{@link ApplicationConfig} binding to property : "dubbo.application"</li>
@@ -57,7 +58,7 @@
5758
* <li>{@link ConsumerConfig} binding to property : "dubbo.consumers"</li>
5859
* </ul>
5960
*
60-
* @see EnableDubboConfigBinding
61+
* @see EnableConfigurationBeanBinding
6162
* @see DubboConfigConfiguration
6263
* @see DubboConfigConfigurationRegistrar
6364
* @since 2.5.8

‎dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import java.util.concurrent.CopyOnWriteArraySet;
4343
import java.util.stream.Collectors;
4444

45-
import static org.apache.dubbo.common.config.configcenter.Constants.CONFIG_NAMESPACE_KEY;
45+
import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
4646
import static org.apache.dubbo.common.constants.CommonConstants.ANYHOST_VALUE;
4747
import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
4848
import static org.apache.dubbo.common.constants.CommonConstants.CHECK_KEY;

‎dubbo-configcenter/dubbo-configcenter-etcd/src/main/java/org/apache/dubbo/configcenter/support/etcd/EtcdDynamicConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import java.util.concurrent.ConcurrentMap;
4141

4242
import static java.nio.charset.StandardCharsets.UTF_8;
43-
import static org.apache.dubbo.common.config.configcenter.Constants.CONFIG_NAMESPACE_KEY;
43+
import static org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
4444
import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR;
4545

4646
/**

‎dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ cd ..
2121
DEPLOY_DIR=`pwd`
2222
CONF_DIR=$DEPLOY_DIR/conf
2323

24-
SERVER_NAME=`sed '/dubbo.application.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
25-
SERVER_PROTOCOL=`sed '/dubbo.protocol.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
26-
SERVER_HOST=`sed '/dubbo.protocol.host/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
27-
SERVER_PORT=`sed '/dubbo.protocol.port/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
28-
LOGS_FILE=`sed '/dubbo.log4j.file/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
24+
SERVER_NAME=`sed '/^dubbo.application.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
25+
SERVER_PROTOCOL=`sed '/^dubbo.protocol.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
26+
SERVER_HOST=`sed '/^dubbo.protocol.host/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
27+
SERVER_PORT=`sed '/^dubbo.protocol.port/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
28+
LOGS_FILE=`sed '/^dubbo.log4j.file/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'`
2929
VM_ARGS_PERM_SIZE='PermSize'
3030
VM_ARGS_METASPACE_SIZE='MetaspaceSize'
3131
JAVA_8_VERSION="180"

‎dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/MetadataReportInstance.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
import org.apache.dubbo.common.URLBuilder;
2121
import org.apache.dubbo.common.extension.ExtensionLoader;
2222
import org.apache.dubbo.config.MetadataReportConfig;
23+
import org.apache.dubbo.rpc.model.ApplicationModel;
2324

2425
import java.util.HashMap;
2526
import java.util.Map;
2627
import java.util.concurrent.atomic.AtomicBoolean;
2728

29+
import static org.apache.dubbo.common.constants.CommonConstants.APPLICATION_KEY;
2830
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_DIRECTORY;
2931
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY;
3032
import static org.apache.dubbo.metadata.report.support.Constants.METADATA_REPORT_KEY;
@@ -51,6 +53,7 @@ public static void init(MetadataReportConfig config) {
5153
.removeParameter(METADATA_REPORT_KEY)
5254
.build();
5355
}
56+
url = url.addParameterIfAbsent(APPLICATION_KEY, ApplicationModel.getApplicationConfig().getName());
5457
String relatedRegistryId = config.getRegistry() == null ? DEFAULT_KEY : config.getRegistry();
5558
// RegistryConfig registryConfig = ApplicationModel.getConfigManager().getRegistry(relatedRegistryId)
5659
// .orElseThrow(() -> new IllegalStateException("Registry id " + relatedRegistryId + " does not exist."));

0 commit comments

Comments
 (0)