Fix examples/cors

examples/cors/pom.xml

@@ -61,10 +61,22 @@
             <groupId>io.helidon.nima.observe</groupId>
             <artifactId>helidon-nima-observe</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.nima.observe</groupId>
+            <artifactId>helidon-nima-observe-health</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.nima.observe</groupId>
+            <artifactId>helidon-nima-observe-metrics</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-yaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.nima.http.media</groupId>
+            <artifactId>helidon-nima-http-media-jsonp</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.health</groupId>
             <artifactId>helidon-health-checks</artifactId>

examples/cors/src/main/java/io/helidon/examples/cors/Main.java

@@ -23,6 +23,7 @@
 import io.helidon.logging.common.LogConfig;
 import io.helidon.nima.observe.ObserveFeature;
 import io.helidon.nima.webserver.WebServer;
+import io.helidon.nima.webserver.WebServerConfig;
 import io.helidon.nima.webserver.cors.CorsSupport;
 import io.helidon.nima.webserver.http.HttpRouting;
 
@@ -50,11 +51,10 @@ public static void main(final String[] args) {
         Config config = Config.create();
 
         // Get webserver config from the "server" section of application.yaml
-        WebServer server = WebServer.builder()
+        WebServerConfig.Builder builder = WebServer.builder();
+        WebServer server = builder
                 .config(config.get("server"))
-                .putSocket("@default", socket -> socket
-                        .port(8080)
-                        .routing(routing -> routing(routing, config)))
+                .routing(it -> routing(it, config))
                 .build()
                 .start();
 
@@ -71,10 +71,9 @@ static void routing(HttpRouting.Builder routing, Config config) {
 
         GreetService greetService = new GreetService(config);
 
-
         // Note: Add the CORS routing *before* registering the GreetService routing.
         routing.register("/greet", corsSupportForGreeting(config), greetService)
-                .addFeature(ObserveFeature.create(config));
+                .addFeature(ObserveFeature.create());
     }
 
     private static CorsSupport corsSupportForGreeting(Config config) {

examples/cors/src/test/java/io/helidon/examples/cors/MainTest.java

@@ -69,80 +69,67 @@ public static void setup(WebServerConfig.Builder server) {
     @Order(1) // Make sure this runs before the greeting message changes so responses are deterministic.
     @Test
     public void testHelloWorld() {
-
-        try (Http1ClientResponse response = client.get()
-                .path("/greet")
+        try (Http1ClientResponse response = client.get("/greet")
                 .accept(HttpMediaType.APPLICATION_JSON)
                 .request()) {
 
-            assertThat("HTTP response1", response.status().code(), is(200));
+            assertThat(response.status().code(), is(200));
 
             String payload = GreetingMessage.fromRest(response.entity().as(JsonObject.class)).getMessage();
-            assertThat("default message", payload, is("Hello World!"));
+            assertThat(payload, is("Hello World!"));
         }
 
-        try (Http1ClientResponse response = client.get()
-                .path("/greet/Joe")
+        try (Http1ClientResponse response = client.get("/greet/Joe")
                 .accept(HttpMediaType.APPLICATION_JSON)
                 .request()) {
 
-            assertThat("HTTP response2", response.status().code(), is(200));
+            assertThat(response.status().code(), is(200));
 
             String payload = GreetingMessage.fromRest(response.entity().as(JsonObject.class)).getMessage();
-            assertThat("default message", payload, is("Hello Joe!"));
+            assertThat(payload, is("Hello Joe!"));
         }
 
-        try (Http1ClientResponse response = client.put()
-                .path("/greet/greeting")
+        try (Http1ClientResponse response = client.put("/greet/greeting")
                 .accept(HttpMediaType.APPLICATION_JSON)
                 .submit(new GreetingMessage("Hola").forRest())) {
 
-            assertThat("HTTP response3", response.status().code(), is(204));
+            assertThat(response.status().code(), is(204));
         }
 
-        try (Http1ClientResponse response = client.get()
-                .path("/greet/Jose")
+        try (Http1ClientResponse response = client.get("/greet/Jose")
                 .accept(HttpMediaType.APPLICATION_JSON)
                 .request()) {
 
-            assertThat("HTTP response4", response.status().code(), is(200));
+            assertThat(response.status().code(), is(200));
 
             String payload = GreetingMessage.fromRest(response.entity().as(JsonObject.class)).getMessage();
-            assertThat("hola Jose message", payload, is("Hola Jose!"));
+            assertThat(payload, is("Hola Jose!"));
         }
 
-        try (Http1ClientResponse response = client.get()
-                .path("/observe/health")
-                .request()) {
-
-            assertThat("HTTP response5", response.status().code(), is(200));
+        try (Http1ClientResponse response = client.get("/observe/health").request()) {
+            assertThat(response.status().code(), is(204));
         }
 
-        try (Http1ClientResponse response = client.get()
-                .path("/observe/metrics")
-                .request()) {
-
-            assertThat("HTTP response6", response.status().code(), is(200));
+        try (Http1ClientResponse response = client.get("/observe/metrics").request()) {
+            assertThat(response.status().code(), is(200));
         }
     }
 
     @Order(10)
     // Run after the non-CORS tests (so the greeting is Hola) but before the CORS test that changes the greeting again.
     @Test
     void testAnonymousGreetWithCors() {
-        Http1ClientRequest request = client.get()
+        try (Http1ClientResponse response = client.get()
                 .path("/greet")
-                .accept(HttpMediaType.APPLICATION_JSON);
-        request.headers(headers -> {
-            headers.set(ORIGIN, "http://foo.com");
-            headers.set(HOST, "here.com");
-            return headers;
-        });
-        try (Http1ClientResponse response = request.request()) {
-            assertThat("HTTP response", response.status().code(), is(200));
-            String payload = GreetingMessage.fromRest(response.entity().as(JsonObject.class))
-                    .getMessage();
-            assertThat("HTTP response payload was " + payload, payload, containsString("Hola World"));
+                .accept(HttpMediaType.APPLICATION_JSON)
+                .headers(it -> it
+                        .set(ORIGIN, "http://foo.com")
+                        .set(HOST, "here.com"))
+                .request()) {
+
+            assertThat(response.status().code(), is(200));
+            String payload = GreetingMessage.fromRest(response.entity().as(JsonObject.class)).getMessage();
+            assertThat(payload, containsString("Hola World"));
             Headers responseHeaders = response.headers();
             Optional<String> allowOrigin = responseHeaders.value(ACCESS_CONTROL_ALLOW_ORIGIN);
             assertThat("Expected CORS header " + CrossOriginConfig.ACCESS_CONTROL_ALLOW_ORIGIN + " is absent",
@@ -154,20 +141,15 @@ void testAnonymousGreetWithCors() {
     @Order(11) // Run after the non-CORS tests but before other CORS tests.
     @Test
     void testGreetingChangeWithCors() {
-
         // Send the pre-flight request and check the response.
-
-        Http1ClientRequest request = client.options()
-                .path("/greet/greeting");
-        request.headers(headers -> {
-            headers.set(ORIGIN, "http://foo.com");
-            headers.set(HOST, "here.com");
-            headers.set(ACCESS_CONTROL_REQUEST_METHOD, "PUT");
-            return headers;
-        });
-
         WritableHeaders<?> preFlightHeaders = WritableHeaders.create();
-        try (Http1ClientResponse response = request.request()) {
+        try (Http1ClientResponse response = client.options()
+                .path("/greet/greeting")
+                .headers(it -> it
+                        .set(ORIGIN, "http://foo.com")
+                        .set(HOST, "here.com")
+                        .set(ACCESS_CONTROL_REQUEST_METHOD, "PUT"))
+                .request()) {
             response.headers().forEach(preFlightHeaders::add);
             List<String> allowMethods = preFlightHeaders.values(ACCESS_CONTROL_ALLOW_METHODS);
             assertThat("pre-flight response does not include " + CrossOriginConfig.ACCESS_CONTROL_ALLOW_METHODS,
@@ -177,46 +159,40 @@ void testGreetingChangeWithCors() {
             assertThat("pre-flight response does not include " + CrossOriginConfig.ACCESS_CONTROL_ALLOW_ORIGIN,
                     allowOrigins, not(empty()));
             assertThat("Header " + CrossOriginConfig.ACCESS_CONTROL_ALLOW_ORIGIN
-                            + " should contain '*' but does not; " + allowOrigins,
+                       + " should contain '*' but does not; " + allowOrigins,
                     allowOrigins, hasItem("http://foo.com"));
         }
 
         // Send the follow-up request.
-        request = client.put("/greet/greeting")
-                .accept(HttpMediaType.APPLICATION_JSON);
-
-        request.headers(headers -> {
-            headers.set(ORIGIN, "http://foo.com");
-            headers.set(HOST, "here.com");
-            preFlightHeaders.forEach(headers::add);
-            return headers;
-        });
-
         GreetingMessage payload = new GreetingMessage("Cheers");
-        try (Http1ClientResponse response = request.submit(payload.forRest())) {
-
-            assertThat("HTTP response3", response.status().code(), is(204));
+        try (Http1ClientResponse response = client.put("/greet/greeting")
+                .accept(HttpMediaType.APPLICATION_JSON)
+                .headers(headers -> {
+                    headers.set(ORIGIN, "http://foo.com");
+                    headers.set(HOST, "here.com");
+                    preFlightHeaders.forEach(headers::add);
+                    return headers;
+                }).submit(payload.forRest())) {
+
+            assertThat(response.status().code(), is(204));
             List<String> allowOrigins = preFlightHeaders.values(ACCESS_CONTROL_ALLOW_ORIGIN);
             assertThat("Expected CORS header " + CrossOriginConfig.ACCESS_CONTROL_ALLOW_ORIGIN + " has no value(s)",
                     allowOrigins, not(empty()));
             assertThat("Header " + CrossOriginConfig.ACCESS_CONTROL_ALLOW_ORIGIN
-                            + " should contain '*' but does not; " + allowOrigins,
+                       + " should contain '*' but does not; " + allowOrigins,
                     allowOrigins, hasItem("http://foo.com"));
         }
     }
 
     @Order(12) // Run after CORS test changes greeting to Cheers.
     @Test
     void testNamedGreetWithCors() {
-        Http1ClientRequest request = client.get()
-                .path("/greet/Maria");
-        request.headers(headers -> {
-            headers.set(ORIGIN, "http://foo.com");
-            headers.set(HOST, "here.com");
-            return headers;
-        });
-
-        try (Http1ClientResponse response = request.request()) {
+        try (Http1ClientResponse response = client.get()
+                .path("/greet/Maria")
+                .headers(headers -> headers
+                        .set(ORIGIN, "http://foo.com")
+                        .set(HOST, "here.com"))
+                .request()) {
             assertThat("HTTP response", response.status().code(), is(200));
             String payload = GreetingMessage.fromRest(response.entity().as(JsonObject.class)).getMessage();
             assertThat(payload, containsString("Cheers Maria"));