fix: fix RouterLabelRestTemplateInterceptor add response headers exception with httpclient5

CHANGELOG.md

@@ -4,3 +4,5 @@
 - [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1259)
 - [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1294)
 - [feat:upgrade jacoco version.](https://github.com/Tencent/spring-cloud-tencent/pull/1308)
+- [fix: fix RouterLabelRestTemplateInterceptor add response headers exception with httpclient5.](https://github.com/Tencent/spring-cloud-tencent/pull/1267)
+- [feat: support lossless online and offline](https://github.com/Tencent/spring-cloud-tencent/pull/1268)

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java

@@ -25,10 +25,10 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import com.tencent.cloud.common.metadata.StaticMetadataManager;
+import com.tencent.cloud.common.util.OkHttpUtil;
 import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
 import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
 import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler;
-import com.tencent.cloud.polaris.util.OkHttpUtil;
 import com.tencent.cloud.rpc.enhancement.stat.config.PolarisStatProperties;
 import com.tencent.polaris.api.config.global.StatReporterConfig;
 import com.tencent.polaris.api.core.ProviderAPI;
@@ -176,7 +176,7 @@ public void register(PolarisRegistration registration) {
 	public void deregister(PolarisRegistration registration) {
 		LOGGER.info("De-registering from Polaris Server now...");
 
-		if (StringUtils.isEmpty(registration.getServiceId())) {
+		if (StringUtils.isEmpty(registration.getServiceId()) || !PolarisSDKContextManager.isRegistered) {
 			LOGGER.warn("No dom to de-register for polaris client...");
 			return;
 		}
@@ -191,6 +191,8 @@ public void deregister(PolarisRegistration registration) {
 		try {
 			ProviderAPI providerClient = polarisSDKContextManager.getProviderAPI();
 			providerClient.deRegister(deRegisterRequest);
+			PolarisSDKContextManager.isRegistered = false;
+			LOGGER.info("De-registration finished.");
 		}
 		catch (Exception e) {
 			LOGGER.error("ERR_POLARIS_DEREGISTER, de-register failed...{},", registration, e);
@@ -199,8 +201,6 @@ public void deregister(PolarisRegistration registration) {
 			if (null != heartbeatExecutor) {
 				heartbeatExecutor.shutdown();
 			}
-			LOGGER.info("De-registration finished.");
-			PolarisSDKContextManager.isRegistered = false;
 		}
 	}
 
@@ -238,21 +238,14 @@ public Object getStatus(PolarisRegistration registration) {
 	public void heartbeat(InstanceHeartbeatRequest heartbeatRequest) {
 		heartbeatExecutor.scheduleWithFixedDelay(() -> {
 			try {
-				String healthCheckEndpoint = polarisDiscoveryProperties.getHealthCheckUrl();
 				// If the health check passes, the heartbeat will be reported.
 				// If it does not pass, the heartbeat will not be reported.
-				if (!healthCheckEndpoint.startsWith("/")) {
-					healthCheckEndpoint = "/" + healthCheckEndpoint;
-				}
-
-				String healthCheckUrl = String.format("http://%s:%s%s", heartbeatRequest.getHost(),
-						heartbeatRequest.getPort(), healthCheckEndpoint);
-
 				Map<String, String> headers = new HashMap<>(1);
 				headers.put(HttpHeaders.USER_AGENT, "polaris");
-				if (!OkHttpUtil.get(healthCheckUrl, headers)) {
+				if (!OkHttpUtil.checkUrl(heartbeatRequest.getHost(), heartbeatRequest.getPort(),
+						polarisDiscoveryProperties.getHealthCheckUrl(), headers)) {
 					LOGGER.error("backend service health check failed. health check endpoint = {}",
-							healthCheckEndpoint);
+							polarisDiscoveryProperties.getHealthCheckUrl());
 					return;
 				}
 

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/resttemplate/RouterLabelRestTemplateInterceptor.java

@@ -45,6 +45,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.core.Ordered;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -104,7 +105,8 @@ public ClientHttpResponse intercept(@NonNull HttpRequest request, @NonNull byte[
 		ClientHttpResponse response = clientHttpRequestExecution.execute(request, body);
 
 		if (!CollectionUtils.isEmpty(request.getHeaders().get(RouterConstant.ROUTER_LABEL_HEADER))) {
-			response.getHeaders().addAll(RouterConstant.ROUTER_LABEL_HEADER, Objects.requireNonNull(request.getHeaders()
+			HttpHeaders responseHeaders = HttpHeaders.writableHttpHeaders(response.getHeaders());
+			responseHeaders.addAll(RouterConstant.ROUTER_LABEL_HEADER, Objects.requireNonNull(request.getHeaders()
 					.get(RouterConstant.ROUTER_LABEL_HEADER)));
 		}
 

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/OrderConstant.java

@@ -172,6 +172,11 @@ public static final class Modifier {
 		 */
 		public static Integer STAT_REPORTER_ORDER = 1;
 
+		/**
+		 * Order of lossless configuration modifier.
+		 */
+		public static Integer LOSSLESS_ORDER = 2;
+
 		/**
 		 * Order of service contract configuration modifier.
 		 */

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/util/OkHttpUtil.java → spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/OkHttpUtil.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.util;
+package com.tencent.cloud.common.util;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -87,4 +87,12 @@ public static boolean get(String path, Map<String, String> headers) {
 		}
 		return false;
 	}
+
+	public static boolean checkUrl(String host, Integer port, String endpoint, Map<String, String> headers) {
+		if (!endpoint.startsWith("/")) {
+			endpoint = "/" + endpoint;
+		}
+		String checkUrl = String.format("http://%s:%s%s", host, port, endpoint);
+		return get(checkUrl, headers);
+	}
 }

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/UrlUtils.java

@@ -0,0 +1,78 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * 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 com.tencent.cloud.common.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.util.StringUtils;
+
+import static com.tencent.cloud.common.constant.ContextConstant.UTF_8;
+
+/**
+ * Utils for URLDecoder/URLEncoder.
+ *
+ * @author Shedfree Wu
+ */
+public final class UrlUtils {
+
+	private static final Logger LOG = LoggerFactory.getLogger(UrlUtils.class);
+
+	private UrlUtils() {
+	}
+
+	public static String decode(String s) {
+		return decode(s, UTF_8);
+	}
+
+	public static String decode(String s, String enc) {
+		if (!StringUtils.hasText(s)) {
+			return s;
+		}
+		try {
+			return URLDecoder.decode(s, enc);
+		}
+		catch (UnsupportedEncodingException e) {
+			LOG.warn("Runtime system does not support {} coding. s:{}, msg:{}", enc, s, e.getMessage());
+			// return original string
+			return s;
+		}
+	}
+
+	public static String encode(String s) {
+		return encode(s, UTF_8);
+	}
+
+	public static String encode(String s, String enc) {
+		if (!StringUtils.hasText(s)) {
+			return s;
+		}
+		try {
+			return URLEncoder.encode(s, enc);
+		}
+		catch (UnsupportedEncodingException e) {
+			LOG.warn("Runtime system does not support {} coding. s:{}, msg:{}", enc, s, e.getMessage());
+			// return original string
+			return s;
+		}
+	}
+}

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/util/OkHttpUtilTest.java → spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/OkHttpUtilTest.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.util;
+package com.tencent.cloud.common.util;
 
 import org.assertj.core.util.Maps;
 import org.junit.jupiter.api.Test;
@@ -37,7 +37,13 @@
  * @author Haotian Zhang
  */
 @ExtendWith(SpringExtension.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = OkHttpUtilTest.TestApplication.class, properties = {"spring.application.name=test", "spring.cloud.polaris.discovery.register=false"})
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		classes = OkHttpUtilTest.TestApplication.class,
+		properties = {
+			"spring.application.name=test",
+			"spring.cloud.polaris.discovery.register=false",
+			"spring.cloud.gateway.enabled=false"
+		})
 public class OkHttpUtilTest {
 
 	@LocalServerPort
@@ -46,6 +52,8 @@ public class OkHttpUtilTest {
 	@Test
 	public void testGet() {
 		assertThat(OkHttpUtil.get("http://localhost:" + port + "/test", Maps.newHashMap("key", "value"))).isTrue();
+		assertThat(OkHttpUtil.checkUrl("localhost", port, "/test", Maps.newHashMap("key", "value"))).isTrue();
+		assertThat(OkHttpUtil.checkUrl("localhost", port, "test", Maps.newHashMap("key", "value"))).isTrue();
 		assertThat(OkHttpUtil.get("http://localhost:" + port + "/error", Maps.newHashMap("key", "value"))).isFalse();
 		assertThat(OkHttpUtil.get("http://localhost:55555/error", Maps.newHashMap("key", "value"))).isFalse();
 	}

spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/util/UrlUtilsTest.java

@@ -0,0 +1,68 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * 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 com.tencent.cloud.common.util;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Utils for {@link UrlUtils}.
+ *
+ * @author Shedfree Wu
+ */
+public class UrlUtilsTest {
+
+	@Test
+	public void testEncodeDecode1() {
+		String expectEncodeValue = "a%2Fb";
+		String origin = "a/b";
+		String encode1 = UrlUtils.encode(origin);
+		assertThat(expectEncodeValue).isEqualTo(encode1);
+		// encode twice is different
+		String encode2 = UrlUtils.encode(encode1);
+		assertThat(encode1).isNotEqualTo(encode2);
+		// test decode
+		assertThat(origin).isEqualTo(UrlUtils.decode(encode1));
+	}
+
+	@Test
+	public void testEncodeDecode2() {
+
+		String origin = null;
+		String encode1 = UrlUtils.encode(origin);
+		assertThat(encode1).isNull();
+
+		origin = "";
+		encode1 = UrlUtils.encode(origin);
+		assertThat(encode1).isEqualTo(origin);
+	}
+
+	@Test
+	public void testError() {
+		String origin = "a/b";
+		String encode = UrlUtils.encode(origin, "error-enc");
+		assertThat(encode).isEqualTo(origin);
+
+		encode = "a%2Fb";
+		String decode = UrlUtils.decode(encode, "error-enc");
+		assertThat(decode).isEqualTo(encode);
+	}
+
+}

spring-cloud-tencent-coverage/pom.xml

@@ -83,6 +83,11 @@
 			<groupId>com.tencent.cloud</groupId>
 			<artifactId>spring-cloud-tencent-gateway-plugin</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-tencent-lossless-plugin</artifactId>
+		</dependency>		
 	</dependencies>
 
 	<build>

spring-cloud-tencent-dependencies/pom.xml

@@ -190,6 +190,12 @@
 				<version>${revision}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>com.tencent.cloud</groupId>
+				<artifactId>spring-cloud-tencent-lossless-plugin</artifactId>
+				<version>${revision}</version>
+			</dependency>
+
 			<!-- third part framework dependencies -->
 			<dependency>
 				<groupId>com.google.guava</groupId>

spring-cloud-tencent-examples/lossless-example/lossless-callee-service/pom.xml

@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>lossless-example</artifactId>
+		<groupId>com.tencent.cloud</groupId>
+		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>lossless-callee-service</artifactId>
+	<name>Spring Cloud Starter Tencent Lossless Callee Service Example</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-all</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-tencent-lossless-plugin</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>