Fix exmaple issues

pull/430/head
misselvexu 3 years ago
parent 1ac73b2a85
commit f3edcee21e

@ -64,10 +64,6 @@ public class MetadataBackendController {
ret.put("transitive-metadata", customMetadataMap); ret.put("transitive-metadata", customMetadataMap);
// Get Disposable metadata from upstream service
Optional<String> upstreamDisposableMetadata = MetadataContextHolder.getDisposableMetadata("", true);
LOG.info("Upstream Disposable Metadata (Key-Value) : {}, {}", "", upstreamDisposableMetadata.get());
// Get All Disposable metadata from upstream service // Get All Disposable metadata from upstream service
Map<String, String> upstreamDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(true); Map<String, String> upstreamDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(true);
upstreamDisposableMetadatas.forEach((key, value) -> { upstreamDisposableMetadatas.forEach((key, value) -> {

@ -57,19 +57,13 @@ public class MetadataFrontendController {
* @return metadata map * @return metadata map
*/ */
@GetMapping("/feign/info") @GetMapping("/feign/info")
public Map<String, Map<String, String>> feign() { public Map<String, Map<String, Map<String, String>>> feign() {
Map<String, Map<String, String>> ret = Maps.newHashMap(); Map<String, Map<String, Map<String, String>>> ret = Maps.newHashMap();
// Call remote service with feign client // Call remote service with feign client
Map<String, String> calleeMetadata = metadataMiddleService.info(); Map<String, Map<String, String>> calleeMetadata = metadataMiddleService.info();
ret.put("callee-transitive-metadata", calleeMetadata); ret.put("callee-transitive-metadata", calleeMetadata);
// Get Custom Metadata From Context
MetadataContext context = MetadataContextHolder.get();
Map<String, String> callerTransitiveMetadata = context.getFragmentContext(MetadataContext.FRAGMENT_TRANSITIVE);
ret.put("caller-transitive-metadata", callerTransitiveMetadata);
ret.put("caller-metadata-contents", metadataLocalProperties.getContent());
return ret; return ret;
} }
@ -79,20 +73,14 @@ public class MetadataFrontendController {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@GetMapping("/rest/info") @GetMapping("/rest/info")
public Map<String, Map<String, String>> rest() { public Map<String, Map<String, Map<String, String>>> rest() {
Map<String, Map<String, String>> ret = Maps.newHashMap(); Map<String, Map<String, Map<String, String>>> ret = Maps.newHashMap();
// Call remote service with RestTemplate // Call remote service with RestTemplate
Map<String, String> calleeMetadata = restTemplate.getForObject( Map<String, Map<String, String>> calleeMetadata = restTemplate.getForObject(
"http://MetadataCalleeService/metadata/service/callee/info", "http://MetadataMiddleService/metadata/service/middle/info", Map.class);
Map.class);
ret.put("callee-transitive-metadata", calleeMetadata); ret.put("callee-transitive-metadata", calleeMetadata);
// Get Custom Metadata From Context
MetadataContext context = MetadataContextHolder.get();
Map<String, String> callerTransitiveMetadata = context.getFragmentContext(MetadataContext.FRAGMENT_TRANSITIVE);
ret.put("caller-transitive-metadata", callerTransitiveMetadata);
ret.put("caller-metadata-contents", metadataLocalProperties.getContent());
return ret; return ret;
} }

@ -36,5 +36,5 @@ public interface MetadataMiddleService {
* @return information of callee * @return information of callee
*/ */
@GetMapping("/metadata/service/middle/info") @GetMapping("/metadata/service/middle/info")
Map<String, String> info(); Map<String, Map<String, String>> info();
} }

@ -92,19 +92,15 @@ public class MetadataMiddleController {
Map<String, String> customMetadataMap = context.getFragmentContext(MetadataContext.FRAGMENT_TRANSITIVE); Map<String, String> customMetadataMap = context.getFragmentContext(MetadataContext.FRAGMENT_TRANSITIVE);
customMetadataMap.forEach((key, value) -> { customMetadataMap.forEach((key, value) -> {
LOG.info("Metadata Backend Custom Metadata (Key-Value): {} : {}", key, value); LOG.info("Metadata Middle Custom Metadata (Key-Value): {} : {}", key, value);
}); });
ret.put("transitive-metadata", customMetadataMap); ret.put("transitive-metadata", customMetadataMap);
// Get Disposable metadata from upstream service
Optional<String> upstreamDisposableMetadata = MetadataContextHolder.getDisposableMetadata("", true);
LOG.info("Upstream Disposable Metadata (Key-Value) : {}, {}", "", upstreamDisposableMetadata.get());
// Get All Disposable metadata from upstream service // Get All Disposable metadata from upstream service
Map<String, String> upstreamDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(true); Map<String, String> upstreamDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(true);
upstreamDisposableMetadatas.forEach((key, value) -> { upstreamDisposableMetadatas.forEach((key, value) -> {
LOG.info("Backend All Upstream Custom Disposable Metadata (Key-Value): {} : {}", key, value); LOG.info("Middle All Upstream Custom Disposable Metadata (Key-Value): {} : {}", key, value);
}); });
ret.put("upstream-disposable-metadata", upstreamDisposableMetadatas); ret.put("upstream-disposable-metadata", upstreamDisposableMetadatas);
@ -112,7 +108,7 @@ public class MetadataMiddleController {
// Get All Disposable metadata from upstream service // Get All Disposable metadata from upstream service
Map<String, String> localDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(false); Map<String, String> localDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(false);
localDisposableMetadatas.forEach((key, value) -> { localDisposableMetadatas.forEach((key, value) -> {
LOG.info("Backend All Upstream Custom Disposable Metadata (Key-Value): {} : {}", key, value); LOG.info("Middle All Upstream Custom Disposable Metadata (Key-Value): {} : {}", key, value);
}); });
ret.put("local-disposable-metadata", localDisposableMetadatas); ret.put("local-disposable-metadata", localDisposableMetadatas);

Loading…
Cancel
Save