save work

docs/mp/openapi/openapi.adoc

@@ -229,7 +229,7 @@ Having written the filter and model reader classes, identify them by adding conf
 [source,properties]
 ----
 mp.openapi.filter=io.helidon.microprofile.examples.openapi.basic.internal.SimpleAPIFilter
-mp.openapi.model.reader=io.helidon.microprofile.examples.openapi.basic.internal.SimpleAPIModelReader
+mp.openapi.model.reader=internal.io.helidon.microprofile.examples.openapi.SimpleAPIModelReader
 ----
 
 

examples/microprofile/openapi-basic/README.md → examples/microprofile/openapi/README.md

@@ -1,4 +1,4 @@
-# Helidon MP Basic OpenAPI Example
+# Helidon MP OpenAPI Example
 
 This example shows a simple greeting application, similar to the one from the 
 Helidon MP QuickStart, enhanced with OpenAPI support.
@@ -7,7 +7,7 @@ Helidon MP QuickStart, enhanced with OpenAPI support.
 
 ```bash
 mvn package
-java -jar target/helidon-examples-microprofile-openapi-basic.jar
+java -jar target/helidon-examples-microprofile-openapi.jar
 ```
 
 Try the endpoints:

examples/microprofile/openapi-basic/pom.xml → examples/microprofile/openapi/pom.xml

@@ -28,12 +28,8 @@
         <relativePath>../../../applications/mp/pom.xml</relativePath>
     </parent>
     <groupId>io.helidon.examples.microprofile</groupId>
-    <artifactId>helidon-examples-microprofile-openapi-basic</artifactId>
-    <name>Helidon Examples Microprofile Basic OpenAPI</name>
-
-    <description>
-        Microprofile example showing basic OpenAPI support
-    </description>
+    <artifactId>helidon-examples-microprofile-openapi</artifactId>
+    <name>Helidon Examples Microprofile OpenAPI</name>
 
     <dependencies>
         <dependency>
@@ -65,6 +61,11 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.testing</groupId>
+            <artifactId>helidon-microprofile-testing-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

examples/microprofile/openapi-basic/src/main/java/io/helidon/microprofile/examples/openapi/basic/GreetResource.java → examples/microprofile/openapi/src/main/java/io/helidon/microprofile/examples/openapi/GreetResource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.helidon.microprofile.examples.openapi.basic;
+package io.helidon.microprofile.examples.openapi;
 
 import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
@@ -50,7 +50,7 @@
  *
  * Note that the output will include not only the annotated endpoints from this
  * class but also an endpoint added by the
- * {@link io.helidon.microprofile.examples.openapi.basic.internal.SimpleAPIModelReader}.
+ * {@link io.helidon.microprofile.examples.openapi.internal.SimpleAPIModelReader}.
  *
  * The message is returned as a JSON object.
  */

examples/microprofile/openapi-basic/src/main/java/io/helidon/microprofile/examples/openapi/basic/GreetingMessage.java → examples/microprofile/openapi/src/main/java/io/helidon/microprofile/examples/openapi/GreetingMessage.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.helidon.microprofile.examples.openapi.basic;
+package io.helidon.microprofile.examples.openapi;
 
 /**
  * POJO defining the greeting message content.

examples/microprofile/openapi-basic/src/main/java/io/helidon/microprofile/examples/openapi/basic/GreetingProvider.java → examples/microprofile/openapi/src/main/java/io/helidon/microprofile/examples/openapi/GreetingProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.helidon.microprofile.examples.openapi.basic;
+package io.helidon.microprofile.examples.openapi;
 
 import java.util.concurrent.atomic.AtomicReference;
 

examples/openapi/src/main/java/io/helidon/examples/openapi/internal/SimpleAPIFilter.java → examples/microprofile/openapi/src/main/java/io/helidon/microprofile/examples/openapi/internal/SimpleAPIFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.helidon.examples.openapi.internal;
+package io.helidon.microprofile.examples.openapi.internal;
 
 import java.util.Map;
 

examples/openapi/src/main/java/io/helidon/examples/openapi/internal/SimpleAPIModelReader.java → examples/microprofile/openapi/src/main/java/io/helidon/microprofile/examples/openapi/internal/SimpleAPIModelReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 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.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.helidon.examples.openapi.internal;
+package io.helidon.microprofile.examples.openapi.internal;
 
 import org.eclipse.microprofile.openapi.OASFactory;
 import org.eclipse.microprofile.openapi.OASModelReader;

examples/microprofile/openapi-basic/src/main/java/io/helidon/microprofile/examples/openapi/basic/internal/package-info.java → examples/microprofile/openapi/src/main/java/io/helidon/microprofile/examples/openapi/internal/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 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.
@@ -17,4 +17,4 @@
 /**
  * Internal classes supporting Helidon MP OpenAPI.
  */
-package io.helidon.microprofile.examples.openapi.basic.internal;
+package io.helidon.microprofile.examples.openapi.internal;

examples/microprofile/openapi-basic/src/main/java/io/helidon/microprofile/examples/openapi/basic/package-info.java → examples/microprofile/openapi/src/main/java/io/helidon/microprofile/examples/openapi/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 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.
@@ -15,6 +15,6 @@
  */
 
 /**
- * Helidon MicroProfile OpenAPI basic example.
+ * Helidon MicroProfile OpenAPI example.
  */
-package io.helidon.microprofile.examples.openapi.basic;
+package io.helidon.microprofile.examples.openapi;

examples/microprofile/openapi-basic/src/main/resources/META-INF/beans.xml → examples/microprofile/openapi/src/main/resources/META-INF/beans.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2019, 2023 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.

examples/microprofile/openapi-basic/src/main/resources/META-INF/microprofile-config.properties → examples/microprofile/openapi/src/main/resources/META-INF/microprofile-config.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+# Copyright (c) 2019, 2023 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.
@@ -21,5 +21,5 @@ app.greeting=Hello
 server.port=8080
 server.host=0.0.0.0
 
-mp.openapi.filter=io.helidon.microprofile.examples.openapi.basic.internal.SimpleAPIFilter
-mp.openapi.model.reader=io.helidon.microprofile.examples.openapi.basic.internal.SimpleAPIModelReader
+mp.openapi.filter=io.helidon.microprofile.examples.openapi.internal.SimpleAPIFilter
+mp.openapi.model.reader=io.helidon.microprofile.examples.openapi.internal.SimpleAPIModelReader