GH-1176 Add java.net to trusted packages (headers)

Resolves #1176

`HttpHeaders` renders the `Location` header as a `URI`.

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/support/DefaultKafkaHeaderMapper.java

@@ -63,8 +63,9 @@ public class DefaultKafkaHeaderMapper extends AbstractKafkaHeaderMapper {
 
 	private static final List<String> DEFAULT_TRUSTED_PACKAGES =
 			Arrays.asList(
-					"java.util",
 					"java.lang",
+					"java.net",
+					"java.util",
 					"org.springframework.util"
 			);
 

spring-kafka/src/test/java/org/springframework/kafka/support/DefaultKafkaHeaderMapperTests.java

@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
+import java.net.URI;
 import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.HashMap;
@@ -62,10 +63,11 @@ public void testTrustedAndNot() {
 				.setHeader(MessageHeaders.CONTENT_TYPE, utf8Text)
 				.setHeader("simpleContentType", MimeTypeUtils.TEXT_PLAIN)
 				.setHeader("customToString", new Bar("fiz"))
+				.setHeader("uri", URI.create("https://foo.bar"))
 				.build();
 		RecordHeaders recordHeaders = new RecordHeaders();
 		mapper.fromHeaders(message.getHeaders(), recordHeaders);
-		assertThat(recordHeaders.toArray().length).isEqualTo(9); // 8 + json_types
+		assertThat(recordHeaders.toArray().length).isEqualTo(10); // 9 + json_types
 		Map<String, Object> headers = new HashMap<>();
 		mapper.toHeaders(recordHeaders, headers);
 		assertThat(headers.get("foo")).isInstanceOf(byte[].class);
@@ -78,10 +80,11 @@ public void testTrustedAndNot() {
 		assertThat(headers.get(MessageHeaders.REPLY_CHANNEL)).isNull();
 		assertThat(headers.get(MessageHeaders.ERROR_CHANNEL)).isEqualTo("errors");
 		assertThat(headers.get("customToString")).isEqualTo("Bar [field=fiz]");
+		assertThat(headers.get("uri")).isEqualTo(URI.create("https://foo.bar"));
 		NonTrustedHeaderType ntht = (NonTrustedHeaderType) headers.get("fix");
 		assertThat(ntht.getHeaderValue()).isNotNull();
 		assertThat(ntht.getUntrustedType()).isEqualTo(Foo.class.getName());
-		assertThat(headers).hasSize(8);
+		assertThat(headers).hasSize(9);
 
 		mapper.addTrustedPackages(getClass().getPackage().getName());
 		headers = new HashMap<>();
@@ -90,7 +93,7 @@ public void testTrustedAndNot() {
 		assertThat(new String((byte[]) headers.get("foo"))).isEqualTo("bar");
 		assertThat(headers.get("baz")).isEqualTo("qux");
 		assertThat(headers.get("fix")).isEqualTo(new Foo());
-		assertThat(headers).hasSize(8);
+		assertThat(headers).hasSize(9);
 	}
 
 	@Test