Use OBJECT schema type with requiredProperties in Quickstart MP (#4149)

* Use OBJECT schema type with requiredProperties. Drop example as it requires Jackson on classpath. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com> * Fixed copyright. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
helidon-io · Apr 21, 2022 · e9292bd · e9292bd
1 parent 2bb69e1
commit e9292bd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/...etypes/quickstart-mp/src/main/resources/src/main/java/__pkg__/GreetResource.java.mustache b/...etypes/quickstart-mp/src/main/resources/src/main/java/__pkg__/GreetResource.java.mustache
@@ -95,7 +95,7 @@ public class GreetResource {
     @RequestBody(name = "greeting",
             required = true,
             content = @Content(mediaType = "application/json",
-                    schema = @Schema(type = SchemaType.STRING, example = "{\"greeting\" : \"Hola\"}")))
+                    schema = @Schema(type = SchemaType.OBJECT, requiredProperties = { "greeting" })))
     @APIResponses({
             @APIResponse(name = "normal", responseCode = "204", description = "Greeting updated"),
             @APIResponse(name = "missing 'greeting'", responseCode = "400",

diff --git a/...ometer/mp/src/main/java/io/helidon/examples/integrations/micrometer/mp/GreetResource.java b/...ometer/mp/src/main/java/io/helidon/examples/integrations/micrometer/mp/GreetResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,7 +122,7 @@ public JsonObject getMessage(@PathParam("name") String name) {
     @RequestBody(name = "greeting",
             required = true,
             content = @Content(mediaType = "application/json",
-                    schema = @Schema(type = SchemaType.STRING, example = "{\"greeting\" : \"Hola\"}")))
+                    schema = @Schema(type = SchemaType.OBJECT, requiredProperties = { "greeting" })))
     @APIResponses({
             @APIResponse(name = "normal", responseCode = "204", description = "Greeting updated"),
             @APIResponse(name = "missing 'greeting'", responseCode = "400",

diff --git a/.../microprofile/cors/src/main/java/io/helidon/microprofile/examples/cors/GreetResource.java b/.../microprofile/cors/src/main/java/io/helidon/microprofile/examples/cors/GreetResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ public JsonObject getMessage(@PathParam("name") String name) {
     @RequestBody(name = "greeting",
             required = true,
             content = @Content(mediaType = "application/json",
-                    schema = @Schema(type = SchemaType.STRING, example = "{\"greeting\" : \"Hola\"}")))
+                    schema = @Schema(type = SchemaType.OBJECT, requiredProperties = { "greeting" })))
     @APIResponses({
             @APIResponse(name = "normal", responseCode = "204", description = "Greeting updated"),
             @APIResponse(name = "missing 'greeting'", responseCode = "400",

diff --git a/.../helidon-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/GreetResource.java b/.../helidon-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/GreetResource.java
@@ -110,7 +110,7 @@ public JsonObject getMessage(@PathParam("name") String name) {
     @RequestBody(name = "greeting",
             required = true,
             content = @Content(mediaType = "application/json",
-                    schema = @Schema(type = SchemaType.STRING, example = "{\"greeting\" : \"Hola\"}")))
+                    schema = @Schema(type = SchemaType.OBJECT, requiredProperties = { "greeting" })))
     @APIResponses({
             @APIResponse(name = "normal", responseCode = "204", description = "Greeting updated"),
             @APIResponse(name = "missing 'greeting'", responseCode = "400",

diff --git a/...andalone-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/GreetResource.java b/...andalone-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/GreetResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,7 +112,7 @@ public JsonObject getMessage(@PathParam("name") String name) {
     @RequestBody(name = "greeting",
             required = true,
             content = @Content(mediaType = "application/json",
-                    schema = @Schema(type = SchemaType.STRING, example = "{\"greeting\" : \"Hola\"}")))
+                    schema = @Schema(type = SchemaType.OBJECT, requiredProperties = { "greeting" })))
     @APIResponses({
             @APIResponse(name = "normal", responseCode = "204", description = "Greeting updated"),
             @APIResponse(name = "missing 'greeting'", responseCode = "400",

diff --git a/...-image/mp-3/src/main/java/io/helidon/tests/integration/nativeimage/mp3/GreetResource.java b/...-image/mp-3/src/main/java/io/helidon/tests/integration/nativeimage/mp3/GreetResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,7 +112,7 @@ public JsonObject getMessage(@PathParam("name") String name) {
     @RequestBody(name = "greeting",
             required = true,
             content = @Content(mediaType = "application/json",
-                    schema = @Schema(type = SchemaType.STRING, example = "{\"greeting\" : \"Hola\"}")))
+                    schema = @Schema(type = SchemaType.OBJECT, requiredProperties = { "greeting" })))
     @APIResponses({
             @APIResponse(name = "normal", responseCode = "204", description = "Greeting updated"),
             @APIResponse(name = "missing 'greeting'", responseCode = "400",