Merge pull request #562 from mercyblitz/master
[Refactor] add Introspective DubboMetadataService for Dubbo Spring Cloudpull/579/head
Mercy Ma
6 years ago
committed by
GitHub
commit
d535c6f74f
@ -0,0 +1,96 @@
|
|||||||
|
/*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership.
|
||||||
|
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||||
|
* (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.springframework.cloud.alibaba.dubbo.service;
|
||||||
|
|
||||||
|
import org.apache.dubbo.common.URL;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.ObjectProvider;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
|
||||||
|
import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
|
||||||
|
import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import static java.util.Collections.unmodifiableMap;
|
||||||
|
import static org.springframework.util.CollectionUtils.isEmpty;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Introspective {@link DubboMetadataService} implementation
|
||||||
|
*
|
||||||
|
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
|
||||||
|
*/
|
||||||
|
public class IntrospectiveDubboMetadataService implements DubboMetadataService {
|
||||||
|
|
||||||
|
private final Logger logger = LoggerFactory.getLogger(getClass());
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ObjectProvider<DubboServiceMetadataRepository> dubboServiceMetadataRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private JSONUtils jsonUtils;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getServiceRestMetadata() {
|
||||||
|
Set<ServiceRestMetadata> serviceRestMetadata = getRepository().getServiceRestMetadata();
|
||||||
|
String serviceRestMetadataJsonConfig = null;
|
||||||
|
if (!isEmpty(serviceRestMetadata)) {
|
||||||
|
serviceRestMetadataJsonConfig = jsonUtils.toJSON(serviceRestMetadata);
|
||||||
|
}
|
||||||
|
return serviceRestMetadataJsonConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<String> getAllServiceKeys() {
|
||||||
|
return getRepository().getAllServiceKeys();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, String> getAllExportedURLs() {
|
||||||
|
Map<String, List<URL>> allExportedUrls = getRepository().getAllExportedUrls();
|
||||||
|
if (isEmpty(allExportedUrls)) {
|
||||||
|
if (logger.isDebugEnabled()) {
|
||||||
|
logger.debug("There is no registered URL.");
|
||||||
|
}
|
||||||
|
return Collections.emptyMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, String> result = new HashMap<>();
|
||||||
|
|
||||||
|
allExportedUrls.forEach((serviceKey, urls) -> {
|
||||||
|
result.put(serviceKey, jsonUtils.toJSON(urls));
|
||||||
|
});
|
||||||
|
|
||||||
|
return unmodifiableMap(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getExportedURLs(String serviceInterface, String group, String version) {
|
||||||
|
List<URL> urls = getRepository().getExportedURLs(serviceInterface, group, version);
|
||||||
|
return jsonUtils.toJSON(urls);
|
||||||
|
}
|
||||||
|
|
||||||
|
private DubboServiceMetadataRepository getRepository() {
|
||||||
|
return dubboServiceMetadataRepository.getIfAvailable();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,66 +0,0 @@
|
|||||||
/*
|
|
||||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
* contributor license agreements. See the NOTICE file distributed with
|
|
||||||
* this work for additional information regarding copyright ownership.
|
|
||||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
* (the "License"); you may not use this file except in compliance with
|
|
||||||
* the License. You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package org.springframework.cloud.alibaba.dubbo.service;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
|
|
||||||
import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
|
|
||||||
import org.springframework.util.CollectionUtils;
|
|
||||||
|
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import static org.springframework.util.ObjectUtils.isEmpty;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Publishing {@link DubboMetadataService} implementation
|
|
||||||
*
|
|
||||||
* @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
|
|
||||||
*/
|
|
||||||
public class PublishingDubboMetadataService implements DubboMetadataService {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A Map to store REST metadata temporary, its' key is the special service name for a Dubbo service,
|
|
||||||
* the value is a JSON content of JAX-RS or Spring MVC REST metadata from the annotated methods.
|
|
||||||
*/
|
|
||||||
private final Set<ServiceRestMetadata> serviceRestMetadata = new LinkedHashSet<>();
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private JSONUtils jsonUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Publish the {@link Set} of {@link ServiceRestMetadata}
|
|
||||||
*
|
|
||||||
* @param serviceRestMetadataSet the {@link Set} of {@link ServiceRestMetadata}
|
|
||||||
*/
|
|
||||||
public void publishServiceRestMetadata(Set<ServiceRestMetadata> serviceRestMetadataSet) {
|
|
||||||
for (ServiceRestMetadata serviceRestMetadata : serviceRestMetadataSet) {
|
|
||||||
if (!CollectionUtils.isEmpty(serviceRestMetadata.getMeta())) {
|
|
||||||
this.serviceRestMetadata.add(serviceRestMetadata);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getServiceRestMetadata() {
|
|
||||||
String serviceRestMetadataJsonConfig = null;
|
|
||||||
if (!isEmpty(serviceRestMetadata)) {
|
|
||||||
serviceRestMetadataJsonConfig = jsonUtils.toJSON(serviceRestMetadata);
|
|
||||||
}
|
|
||||||
return serviceRestMetadataJsonConfig;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue