From dbba29a52906b1521d9b04e95a529c163c236511 Mon Sep 17 00:00:00 2001 From: fuyuwei01 Date: Mon, 12 Aug 2024 15:09:47 +0800 Subject: [PATCH] update: fit spring cloud 2021 --- .../metadata/core/DecodeTransferMetadataServletFilter.java | 1 + .../resttemplate/RouterLabelRestTemplateInterceptorTest.java | 4 ++++ .../context/tsf/metadata/TsfInstanceMetadataProvider.java | 2 +- .../src/main/resources/META-INF/spring.factories | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java index fc3ab6948..ec060a4ff 100644 --- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java @@ -33,6 +33,7 @@ import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.common.util.UrlUtils; import com.tencent.cloud.metadata.provider.ServletMetadataProvider; import com.tencent.cloud.polaris.context.config.PolarisContextProperties; +import com.tencent.polaris.api.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/resttemplate/RouterLabelRestTemplateInterceptorTest.java b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/resttemplate/RouterLabelRestTemplateInterceptorTest.java index 9905cd050..b814fdf13 100644 --- a/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/resttemplate/RouterLabelRestTemplateInterceptorTest.java +++ b/spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/resttemplate/RouterLabelRestTemplateInterceptorTest.java @@ -106,6 +106,10 @@ public class RouterLabelRestTemplateInterceptorTest { return HttpMethod.POST; } + @Override + public String getMethodValue() { + return HttpMethod.GET.name(); + } @Override public URI getURI() { return uri; diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/metadata/TsfInstanceMetadataProvider.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/metadata/TsfInstanceMetadataProvider.java index 0c490020f..f11877c7a 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/metadata/TsfInstanceMetadataProvider.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/metadata/TsfInstanceMetadataProvider.java @@ -49,7 +49,7 @@ public class TsfInstanceMetadataProvider implements InstanceMetadataProvider { @Override public Map getMetadata() { - return new HashMap<>() {{ + return new HashMap() {{ put(TsfMetadataConstants.TSF_PROG_VERSION, tsfCoreProperties.getTsfProgVersion()); put(TsfMetadataConstants.TSF_APPLICATION_ID, tsfCoreProperties.getTsfApplicationId()); put(TsfMetadataConstants.TSF_GROUP_ID, tsfCoreProperties.getTsfGroupId()); diff --git a/spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories b/spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories index 061e911f7..ef0b3bf61 100644 --- a/spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories @@ -2,7 +2,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration,\ com.tencent.cloud.polaris.context.config.PolarisContextPostConfiguration,\ com.tencent.cloud.polaris.context.tsf.config.TsfCorePropertiesAutoConfiguration,\ - com.tencent.cloud.polaris.context.tsf.consul.TsfConsulAutoConfiguration + com.tencent.cloud.polaris.context.tsf.consul.TsfConsulAutoConfiguration,\ + com.tencent.cloud.polaris.context.tsf.metadata.TsfInstanceMetadataAutoConfiguration org.springframework.cloud.bootstrap.BootstrapConfiguration=\ com.tencent.cloud.polaris.context.config.PolarisContextBootstrapAutoConfiguration,\ com.tencent.cloud.polaris.context.tsf.config.TsfCorePropertiesBootstrapConfiguration,\