natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[dubbo-5876] Remove unused variable (#5879)

This commit is contained in:
huangdx0726 2020-03-28 23:44:04 +08:00 committed by GitHub
parent 40e14a5599
commit 40be2972e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dubbo-common/src/main/java/org/apache/dubbo/common/config/Environment.java
View File

@ -30,8 +30,6 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
public class Environment extends LifecycleAdapter implements FrameworkExt {
public static final String NAME = "environment";
@ -42,7 +40,6 @@ public class Environment extends LifecycleAdapter implements FrameworkExt {
private final InmemoryConfiguration externalConfiguration;
private final InmemoryConfiguration appExternalConfiguration;
private final ConcurrentMap<AbstractConfig, CompositeConfiguration> prefixedConfigurations = new ConcurrentHashMap<>();
private CompositeConfiguration globalConfiguration;
private Map<String, String> externalConfigurationMap = new HashMap<>();
@ -116,12 +113,6 @@ public class Environment extends LifecycleAdapter implements FrameworkExt {
* @return
*/
public synchronized CompositeConfiguration getPrefixedConfiguration(AbstractConfig config) {
// CompositeConfiguration prefixedConfiguration =
// prefixedConfigurations.putIfAbsent(config, new CompositeConfiguration(config.getPrefix(), config.getId()));
// if (prefixedConfiguration != null) {
// return prefixedConfiguration;
// }
// prefixedConfiguration = prefixedConfigurations.get(config);
CompositeConfiguration prefixedConfiguration = new CompositeConfiguration(config.getPrefix(), config.getId());
Configuration configuration = new ConfigConfigurationAdapter(config);
if (this.isConfigCenterFirst()) {

5
dubbo-metadata/dubbo-metadata-processor/src/main/java/org/apache/dubbo/metadata/annotation/processing/rest/ServiceRestMetadataStorage.java
View File

@ -42,16 +42,13 @@ public class ServiceRestMetadataStorage {
}
public void append(Set<ServiceRestMetadata> serviceRestMetadata) throws IOException {
Set<ServiceRestMetadata> allServiceRestMetadata = new LinkedHashSet<>();
storage.read(SERVICE_REST_METADATA_RESOURCE_PATH, reader -> {
Gson gson = new Gson();
return (List) gson.fromJson(reader, getParameterized(List.class, ServiceRestMetadata.class).getType());
}).ifPresent(existedMetadata -> {
// Add all existed ServiceRestMetadata
allServiceRestMetadata.addAll(existedMetadata);
serviceRestMetadata.addAll(existedMetadata);
});
// Add all new ServiceRestMetadata
allServiceRestMetadata.addAll(serviceRestMetadata);
write(serviceRestMetadata);
}