Merge branch '3.0.x'

sdeleuze · Jul 20, 2023 · 028387c · 028387c
2 parents 73b4145 + bc7195d
commit 028387c
Show file tree

Hide file tree

Showing 15 changed files with 247 additions and 76 deletions.
diff --git a/framework/rest-template/docker-compose.yml b/framework/rest-template/docker-compose.yml
@@ -1,7 +1,22 @@
 version: '3'
 services:
-  httpecho:
-    image: 'mhalbritter/http-echo:2'
+  httpbin:
+    image: 'mccutchen/go-httpbin:v2.10.0'
     ports:
-      - '80'
-      - '443'
+      - '8080'
+  httpbin_tls:
+    image: 'mccutchen/go-httpbin:v2.10.0'
+    environment:
+      - 'PORT=8443'
+      - 'HTTPS_CERT_FILE=/server-certificate'
+      - 'HTTPS_KEY_FILE=/server-key'
+    configs:
+      - 'server-certificate'
+      - 'server-key'
+    ports:
+      - '8443'
+configs:
+  server-certificate:
+    file: './server.crt'
+  server-key:
+    file: './server.key'
diff --git a/framework/rest-template/server.crt b/framework/rest-template/server.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICQDCCAcagAwIBAgIUJL2NEOsGlUgyKo3jUur8gol3ymowCgYIKoZIzj0EAwIw
+VjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwT
+RGVmYXVsdCBDb21wYW55IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIzMDYy
+NjA4MzY0NFoYDzIxMjMwNjAyMDgzNjQ0WjBWMQswCQYDVQQGEwJYWDEVMBMGA1UE
+BwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZhdWx0IENvbXBhbnkgTHRkMRIw
+EAYDVQQDDAlsb2NhbGhvc3QwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARm10hC6jI0
+tA5dVYyYLsaS+rDXaFDbtspX/mxHk5VTfklPD06L3sXcNJeve6YQHlOTwdUzLi2y
+iGuaVcljlA31iOtfQEATeSdbeFxxLjM22U+FZJ94j14XrbemtpspuTujUzBRMB0G
+A1UdDgQWBBQEfrPdmYvL/w5sLHWL0eVj0f1M0DAfBgNVHSMEGDAWgBQEfrPdmYvL
+/w5sLHWL0eVj0f1M0DAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA2gAMGUC
+MHtVMoEKtgkOcv2fhrv0788S/yIRa6PBt8nxMa6d7mDTFGkMhBCIG168pJk9nHE+
+vgIxAJ1JF2uB5PYV5nYwliOttnb8LMza7hhun1EVsfKuFgvMUD3VTgtZJ9PE4c8I
+pxq8IA==
+-----END CERTIFICATE-----
diff --git a/framework/rest-template/server.key b/framework/rest-template/server.key
@@ -0,0 +1,9 @@
+-----BEGIN EC PARAMETERS-----
+BgUrgQQAIg==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDCVOy3osulJ/8y+ckbBc0dAdSiLFiRcU1SFqWWsmoaCKexSBOgA8/vG
+DFFqYvummn6gBwYFK4EEACKhZANiAARm10hC6jI0tA5dVYyYLsaS+rDXaFDbtspX
+/mxHk5VTfklPD06L3sXcNJeve6YQHlOTwdUzLi2yiGuaVcljlA31iOtfQEATeSdb
+eFxxLjM22U+FZJ94j14XrbemtpspuTs=
+-----END EC PRIVATE KEY-----
diff --git a/...t-template/src/appTest/java/com/example/resttemplate/RestTemplateApplicationAotTests.java b/...t-template/src/appTest/java/com/example/resttemplate/RestTemplateApplicationAotTests.java
@@ -19,14 +19,16 @@ class RestTemplateApplicationAotTests {
 	void httpWorks(AssertableOutput output) {
 		Awaitility.await()
 			.atMost(Duration.ofSeconds(30))
-			.untilAsserted(() -> assertThat(output).hasSingleLineContaining("http worked:"));
+			.untilAsserted(() -> assertThat(output)
+				.hasLineMatching("http: DataDto\\{url='http:\\/\\/\\w+:\\d+\\/anything', method='GET'\\}"));
 	}
 
 	@Test
 	void httpsWorks(AssertableOutput output) {
 		Awaitility.await()
 			.atMost(Duration.ofSeconds(30))
-			.untilAsserted(() -> assertThat(output).hasSingleLineContaining("https worked:"));
+			.untilAsserted(() -> assertThat(output)
+				.hasLineMatching("https: DataDto\\{url='https:\\/\\/\\w+:\\d+\\/anything', method='GET'\\}"));
 	}
 
 }
diff --git a/framework/rest-template/src/main/java/com/example/resttemplate/CLR.java b/framework/rest-template/src/main/java/com/example/resttemplate/CLR.java
@@ -2,27 +2,32 @@
 
 import java.net.URI;
 
+import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
 @Component
+@RegisterReflectionForBinding(DataDto.class)
 class CLR implements CommandLineRunner {
 
 	private final RestTemplate restTemplate;
 
-	private final String host;
+	private final String httpHost;
 
-	private final int port;
+	private final int httpPort;
 
-	private final int tlsPort;
+	private final String httpsHost;
+
+	private final int httpsPort;
 
 	CLR(RestTemplate restTemplate) {
 		this.restTemplate = restTemplate;
-		this.host = env("HTTPECHO_HOST", "localhost");
-		this.port = env("HTTPECHO_PORT_80", 8080);
-		this.tlsPort = env("HTTPECHO_PORT_443", 8443);
+		this.httpHost = env("HTTPBIN_HOST", "localhost");
+		this.httpsHost = env("HTTPBIN_TLS_HOST", "localhost");
+		this.httpPort = env("HTTPBIN_PORT_8080", 8080);
+		this.httpsPort = env("HTTPBIN_TLS_PORT_8443", 8443);
 	}
 
 	@Override
@@ -33,9 +38,9 @@ public void run(String... args) {
 
 	private void http() {
 		try {
-			String response = this.restTemplate
-				.getForObject(URI.create("http://%s:%d/".formatted(this.host, this.port)), String.class);
-			System.out.printf("http worked: %s%n", response);
+			DataDto dto = restTemplate.getForObject(
+					URI.create("http://%s:%d/anything".formatted(this.httpHost, this.httpPort)), DataDto.class);
+			System.out.printf("http: %s%n", dto);
 		}
 		catch (Exception ex) {
 			System.out.println("http failed:");
@@ -45,9 +50,9 @@ private void http() {
 
 	private void https() {
 		try {
-			String response = this.restTemplate
-				.getForObject(URI.create("https://%s:%d/".formatted(this.host, this.tlsPort)), String.class);
-			System.out.printf("https worked: %s%n", response);
+			DataDto dto = restTemplate.getForObject(
+					URI.create("https://%s:%d/anything".formatted(this.httpsHost, this.httpsPort)), DataDto.class);
+			System.out.printf("https: %s%n", dto);
 		}
 		catch (Exception ex) {
 			System.out.println("https failed:");

diff --git a/framework/rest-template/src/main/java/com/example/resttemplate/DataDto.java b/framework/rest-template/src/main/java/com/example/resttemplate/DataDto.java
@@ -0,0 +1,33 @@
+package com.example.resttemplate;
+
+public class DataDto {
+
+	private String url;
+
+	private String method;
+
+	public DataDto() {
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getMethod() {
+		return method;
+	}
+
+	public void setMethod(String method) {
+		this.method = method;
+	}
+
+	@Override
+	public String toString() {
+		return "DataDto{" + "url='" + url + '\'' + ", method='" + method + '\'' + '}';
+	}
+
+}
diff --git a/framework/webclient/docker-compose.yml b/framework/webclient/docker-compose.yml
@@ -1,7 +1,22 @@
 version: '3'
 services:
-  httpecho:
-    image: 'mhalbritter/http-echo:2'
+  httpbin:
+    image: 'mccutchen/go-httpbin:v2.10.0'
     ports:
-      - '80'
-      - '443'
+      - '8080'
+  httpbin_tls:
+    image: 'mccutchen/go-httpbin:v2.10.0'
+    environment:
+      - 'PORT=8443'
+      - 'HTTPS_CERT_FILE=/server-certificate'
+      - 'HTTPS_KEY_FILE=/server-key'
+    configs:
+      - 'server-certificate'
+      - 'server-key'
+    ports:
+      - '8443'
+configs:
+  server-certificate:
+    file: './server.crt'
+  server-key:
+    file: './server.key'
diff --git a/framework/webclient/server.crt b/framework/webclient/server.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICQDCCAcagAwIBAgIUJL2NEOsGlUgyKo3jUur8gol3ymowCgYIKoZIzj0EAwIw
+VjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwT
+RGVmYXVsdCBDb21wYW55IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIzMDYy
+NjA4MzY0NFoYDzIxMjMwNjAyMDgzNjQ0WjBWMQswCQYDVQQGEwJYWDEVMBMGA1UE
+BwwMRGVmYXVsdCBDaXR5MRwwGgYDVQQKDBNEZWZhdWx0IENvbXBhbnkgTHRkMRIw
+EAYDVQQDDAlsb2NhbGhvc3QwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARm10hC6jI0
+tA5dVYyYLsaS+rDXaFDbtspX/mxHk5VTfklPD06L3sXcNJeve6YQHlOTwdUzLi2y
+iGuaVcljlA31iOtfQEATeSdbeFxxLjM22U+FZJ94j14XrbemtpspuTujUzBRMB0G
+A1UdDgQWBBQEfrPdmYvL/w5sLHWL0eVj0f1M0DAfBgNVHSMEGDAWgBQEfrPdmYvL
+/w5sLHWL0eVj0f1M0DAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA2gAMGUC
+MHtVMoEKtgkOcv2fhrv0788S/yIRa6PBt8nxMa6d7mDTFGkMhBCIG168pJk9nHE+
+vgIxAJ1JF2uB5PYV5nYwliOttnb8LMza7hhun1EVsfKuFgvMUD3VTgtZJ9PE4c8I
+pxq8IA==
+-----END CERTIFICATE-----
diff --git a/framework/webclient/server.key b/framework/webclient/server.key
@@ -0,0 +1,9 @@
+-----BEGIN EC PARAMETERS-----
+BgUrgQQAIg==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDCVOy3osulJ/8y+ckbBc0dAdSiLFiRcU1SFqWWsmoaCKexSBOgA8/vG
+DFFqYvummn6gBwYFK4EEACKhZANiAARm10hC6jI0tA5dVYyYLsaS+rDXaFDbtspX
+/mxHk5VTfklPD06L3sXcNJeve6YQHlOTwdUzLi2yiGuaVcljlA31iOtfQEATeSdb
+eFxxLjM22U+FZJ94j14XrbemtpspuTs=
+-----END EC PRIVATE KEY-----
diff --git a/framework/webclient/src/appTest/java/com/example/webclient/WebClientApplicationAotTests.java b/framework/webclient/src/appTest/java/com/example/webclient/WebClientApplicationAotTests.java
@@ -17,23 +17,26 @@ class WebClientApplicationAotTests {
 	@Test
 	@DisabledIfEnvironmentVariable(named = "CI", matches = "true", disabledReason = "HTTP is blocked on CI")
 	void httpWorks(AssertableOutput output) {
-		Awaitility.await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> {
-			assertThat(output).hasSingleLineContaining("https worked:");
-		});
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(30))
+			.untilAsserted(() -> assertThat(output)
+				.hasLineMatching("http: DataDto\\{url='http:\\/\\/\\w+:\\d+\\/anything', method='GET'\\}"));
 	}
 
 	@Test
 	void httpsWorks(AssertableOutput output) {
-		Awaitility.await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> {
-			assertThat(output).hasSingleLineContaining("https worked:");
-		});
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(30))
+			.untilAsserted(() -> assertThat(output)
+				.hasLineMatching("https: DataDto\\{url='https:\\/\\/\\w+:\\d+\\/anything', method='GET'\\}"));
 	}
 
 	@Test
 	void serviceWorks(AssertableOutput output) {
-		Awaitility.await().atMost(Duration.ofSeconds(30)).untilAsserted(() -> {
-			assertThat(output).hasSingleLineContaining("service worked:");
-		});
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(30))
+			.untilAsserted(() -> assertThat(output)
+				.hasLineMatching("service: ExchangeDataDto\\{url='http:\\/\\/\\w+:\\d+\\/anything', method='GET'\\}"));
 	}
 
 }
diff --git a/framework/webclient/src/main/java/com/example/webclient/CLR.java b/framework/webclient/src/main/java/com/example/webclient/CLR.java
@@ -2,12 +2,14 @@
 
 import java.time.Duration;
 
+import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Component
+@RegisterReflectionForBinding(DataDto.class)
 class CLR implements CommandLineRunner {
 
 	private final WebClient httpWebClient;
@@ -32,13 +34,13 @@ public void run(String... args) {
 
 	private void http() {
 		try {
-			String response = this.httpWebClient.get()
-				.uri("/")
+			DataDto dto = this.httpWebClient.get()
+				.uri("/anything")
 				.retrieve()
-				.bodyToMono(String.class)
+				.bodyToMono(DataDto.class)
 				.timeout(Duration.ofSeconds(10))
 				.block();
-			System.out.printf("http worked: %s%n", response);
+			System.out.printf("http: %s%n", dto);
 		}
 		catch (Exception ex) {
 			System.out.println("http failed:");
@@ -48,13 +50,13 @@ private void http() {
 
 	private void https() {
 		try {
-			String response = this.httpsWebClient.get()
-				.uri("/")
+			DataDto dto = this.httpsWebClient.get()
+				.uri("/anything")
 				.retrieve()
-				.bodyToMono(String.class)
+				.bodyToMono(DataDto.class)
 				.timeout(Duration.ofSeconds(10))
 				.block();
-			System.out.printf("https worked: %s%n", response);
+			System.out.printf("https: %s%n", dto);
 		}
 		catch (Exception ex) {
 			System.out.println("https failed:");
@@ -64,8 +66,8 @@ private void https() {
 
 	private void service() {
 		try {
-			String dto = this.dataService.getData();
-			System.out.printf("service worked: %s%n", dto);
+			ExchangeDataDto dto = this.dataService.getData();
+			System.out.printf("service: %s%n", dto);
 		}
 		catch (Exception ex) {
 			System.out.println("service failed:");

diff --git a/framework/webclient/src/main/java/com/example/webclient/DataDto.java b/framework/webclient/src/main/java/com/example/webclient/DataDto.java
@@ -0,0 +1,33 @@
+package com.example.webclient;
+
+public class DataDto {
+
+	private String url;
+
+	private String method;
+
+	public DataDto() {
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getMethod() {
+		return method;
+	}
+
+	public void setMethod(String method) {
+		this.method = method;
+	}
+
+	@Override
+	public String toString() {
+		return "DataDto{" + "url='" + url + '\'' + ", method='" + method + '\'' + '}';
+	}
+
+}
diff --git a/framework/webclient/src/main/java/com/example/webclient/DataService.java b/framework/webclient/src/main/java/com/example/webclient/DataService.java
@@ -4,7 +4,7 @@
 
 interface DataService {
 
-	@GetExchange("/")
-	String getData();
+	@GetExchange("/anything")
+	ExchangeDataDto getData();
 
 }
diff --git a/framework/webclient/src/main/java/com/example/webclient/ExchangeDataDto.java b/framework/webclient/src/main/java/com/example/webclient/ExchangeDataDto.java
@@ -0,0 +1,33 @@
+package com.example.webclient;
+
+public class ExchangeDataDto {
+
+	private String url;
+
+	private String method;
+
+	public ExchangeDataDto() {
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getMethod() {
+		return method;
+	}
+
+	public void setMethod(String method) {
+		this.method = method;
+	}
+
+	@Override
+	public String toString() {
+		return "ExchangeDataDto{" + "url='" + url + '\'' + ", method='" + method + '\'' + '}';
+	}
+
+}