diff --git a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-backend/src/main/java/com/tencent/cloud/metadata/service/backend/MetadataBackendController.java b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-backend/src/main/java/com/tencent/cloud/metadata/service/backend/MetadataBackendController.java index 7f71f9ec9..a098c7470 100644 --- a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-backend/src/main/java/com/tencent/cloud/metadata/service/backend/MetadataBackendController.java +++ b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-backend/src/main/java/com/tencent/cloud/metadata/service/backend/MetadataBackendController.java @@ -64,10 +64,6 @@ public class MetadataBackendController { ret.put("transitive-metadata", customMetadataMap); - // Get Disposable metadata from upstream service - Optional upstreamDisposableMetadata = MetadataContextHolder.getDisposableMetadata("", true); - LOG.info("Upstream Disposable Metadata (Key-Value) : {}, {}", "", upstreamDisposableMetadata.get()); - // Get All Disposable metadata from upstream service Map upstreamDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(true); upstreamDisposableMetadatas.forEach((key, value) -> { diff --git a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/java/com/tencent/cloud/metadata/service/frontend/MetadataFrontendController.java b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/java/com/tencent/cloud/metadata/service/frontend/MetadataFrontendController.java index eec2f6bb4..d5a9af127 100644 --- a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/java/com/tencent/cloud/metadata/service/frontend/MetadataFrontendController.java +++ b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/java/com/tencent/cloud/metadata/service/frontend/MetadataFrontendController.java @@ -57,19 +57,13 @@ public class MetadataFrontendController { * @return metadata map */ @GetMapping("/feign/info") - public Map> feign() { - Map> ret = Maps.newHashMap(); + public Map>> feign() { + Map>> ret = Maps.newHashMap(); // Call remote service with feign client - Map calleeMetadata = metadataMiddleService.info(); + Map> calleeMetadata = metadataMiddleService.info(); ret.put("callee-transitive-metadata", calleeMetadata); - // Get Custom Metadata From Context - MetadataContext context = MetadataContextHolder.get(); - Map callerTransitiveMetadata = context.getFragmentContext(MetadataContext.FRAGMENT_TRANSITIVE); - ret.put("caller-transitive-metadata", callerTransitiveMetadata); - ret.put("caller-metadata-contents", metadataLocalProperties.getContent()); - return ret; } @@ -79,20 +73,14 @@ public class MetadataFrontendController { */ @SuppressWarnings("unchecked") @GetMapping("/rest/info") - public Map> rest() { - Map> ret = Maps.newHashMap(); + public Map>> rest() { + Map>> ret = Maps.newHashMap(); // Call remote service with RestTemplate - Map calleeMetadata = restTemplate.getForObject( - "http://MetadataCalleeService/metadata/service/callee/info", - Map.class); + Map> calleeMetadata = restTemplate.getForObject( + "http://MetadataMiddleService/metadata/service/middle/info", Map.class); ret.put("callee-transitive-metadata", calleeMetadata); - // Get Custom Metadata From Context - MetadataContext context = MetadataContextHolder.get(); - Map callerTransitiveMetadata = context.getFragmentContext(MetadataContext.FRAGMENT_TRANSITIVE); - ret.put("caller-transitive-metadata", callerTransitiveMetadata); - ret.put("caller-metadata-contents", metadataLocalProperties.getContent()); return ret; } diff --git a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/java/com/tencent/cloud/metadata/service/frontend/MetadataMiddleService.java b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/java/com/tencent/cloud/metadata/service/frontend/MetadataMiddleService.java index e5fcdd442..ea0bde432 100644 --- a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/java/com/tencent/cloud/metadata/service/frontend/MetadataMiddleService.java +++ b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/java/com/tencent/cloud/metadata/service/frontend/MetadataMiddleService.java @@ -36,5 +36,5 @@ public interface MetadataMiddleService { * @return information of callee */ @GetMapping("/metadata/service/middle/info") - Map info(); + Map> info(); } diff --git a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-middle/src/main/java/com/tencent/cloud/metadata/service/middle/MetadataMiddleController.java b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-middle/src/main/java/com/tencent/cloud/metadata/service/middle/MetadataMiddleController.java index 8aa61f5bb..ae9122aab 100644 --- a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-middle/src/main/java/com/tencent/cloud/metadata/service/middle/MetadataMiddleController.java +++ b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-middle/src/main/java/com/tencent/cloud/metadata/service/middle/MetadataMiddleController.java @@ -92,19 +92,15 @@ public class MetadataMiddleController { Map customMetadataMap = context.getFragmentContext(MetadataContext.FRAGMENT_TRANSITIVE); 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); - // Get Disposable metadata from upstream service - Optional upstreamDisposableMetadata = MetadataContextHolder.getDisposableMetadata("", true); - LOG.info("Upstream Disposable Metadata (Key-Value) : {}, {}", "", upstreamDisposableMetadata.get()); - // Get All Disposable metadata from upstream service Map upstreamDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(true); 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); @@ -112,7 +108,7 @@ public class MetadataMiddleController { // Get All Disposable metadata from upstream service Map localDisposableMetadatas = MetadataContextHolder.getAllDisposableMetadata(false); 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);