mirror of
https://gitee.com/nicefold/seewis-cloud-plus.git
synced 2026-10-14 10:02:13 +08:00
Revert "fix 修复 dubbo 元数据实现类 json工具使用错误问题"
This reverts commit 60290175c7.
This commit is contained in:
+2
-23
@@ -5,10 +5,10 @@ import org.apache.dubbo.common.URL;
|
||||
import org.apache.dubbo.common.config.configcenter.ConfigItem;
|
||||
import org.apache.dubbo.common.utils.CollectionUtils;
|
||||
import org.apache.dubbo.common.utils.ConcurrentHashSet;
|
||||
import org.apache.dubbo.common.utils.JsonUtils;
|
||||
import org.apache.dubbo.metadata.MappingChangedEvent;
|
||||
import org.apache.dubbo.metadata.MappingListener;
|
||||
import org.apache.dubbo.metadata.MetadataInfo;
|
||||
import org.apache.dubbo.metadata.definition.model.ServiceDefinition;
|
||||
import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
|
||||
import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
|
||||
import org.apache.dubbo.metadata.report.identifier.ServiceMetadataIdentifier;
|
||||
@@ -16,7 +16,6 @@ import org.apache.dubbo.metadata.report.identifier.SubscriberMetadataIdentifier;
|
||||
import org.apache.dubbo.metadata.report.support.AbstractMetadataReport;
|
||||
import org.apache.dubbo.rpc.RpcException;
|
||||
import org.dromara.common.core.utils.SpringUtils;
|
||||
import org.dromara.common.json.utils.JsonUtils;
|
||||
import org.redisson.api.RScript;
|
||||
import org.redisson.api.RTopic;
|
||||
import org.redisson.api.RedissonClient;
|
||||
@@ -90,21 +89,11 @@ public class RedissonMetadataReport extends AbstractMetadataReport {
|
||||
// AbstractMetadataReport — provider / consumer metadata
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
@Override
|
||||
public void storeProviderMetadata(MetadataIdentifier id, ServiceDefinition serviceDefinition) {
|
||||
doStoreProviderMetadata(id, JsonUtils.toJsonString(serviceDefinition));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doStoreProviderMetadata(MetadataIdentifier id, String serviceDefinitions) {
|
||||
storeMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), serviceDefinitions, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void storeConsumerMetadata(MetadataIdentifier id, Map<String, String> value) {
|
||||
doStoreConsumerMetadata(id, JsonUtils.toJsonString(value));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doStoreConsumerMetadata(MetadataIdentifier id, String value) {
|
||||
storeMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), value, true);
|
||||
@@ -134,21 +123,11 @@ public class RedissonMetadataReport extends AbstractMetadataReport {
|
||||
storeMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY), urlListStr, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveSubscribedData(SubscriberMetadataIdentifier id, Set<String> urls) {
|
||||
doSaveSubscriberData(id, JsonUtils.toJsonString(urls));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String doGetSubscribedURLs(SubscriberMetadataIdentifier id) {
|
||||
return getMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getSubscribedURLs(SubscriberMetadataIdentifier id) {
|
||||
return JsonUtils.parseArray(doGetSubscribedURLs(id), String.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getServiceDefinition(MetadataIdentifier id) {
|
||||
return getMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY));
|
||||
@@ -166,7 +145,7 @@ public class RedissonMetadataReport extends AbstractMetadataReport {
|
||||
@Override
|
||||
public MetadataInfo getAppMetadata(SubscriberMetadataIdentifier id, Map<String, String> instanceMetadata) {
|
||||
String content = getMetadata(id.getUniqueKey(KeyTypeEnum.UNIQUE_KEY));
|
||||
return JsonUtils.parseObject(content, MetadataInfo.class);
|
||||
return JsonUtils.toJavaObject(content, MetadataInfo.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user