fix tests (openapi-processor/openapi-processor-spring#339)

Author: hauner

openapi-processor-core/src/test/groovy/io/openapiprocessor/core/writer/java/MethodWriterGSpec.groovy

@@ -46,6 +46,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getFoo();
 """
@@ -65,6 +66,7 @@ class MethodWriterGSpec extends Specification {
         then:
         target.toString () == """\
     @Deprecated
+    @Status
     @CoreMapping
     void getFoo();
 """
@@ -168,6 +170,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getFoo(@Parameter String foo);
 """
@@ -200,6 +203,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getFoo(String foo);
 """
@@ -222,6 +226,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getFoo(@Parameter @Foo String foo);
 """
@@ -246,6 +251,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getFoo(@Parameter @Foo("bar") String foo);
 """
@@ -271,6 +277,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getFoo(@Parameter @Foo(foo = "bar", oof = "rab") String foo);
 """
@@ -288,6 +295,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getFOOooBARrr();
 """
@@ -306,6 +314,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getBar();
 """
@@ -329,6 +338,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     void getFoo(@Parameter String foO);
 """
@@ -353,6 +363,7 @@ class MethodWriterGSpec extends Specification {
 
         then:
         target.toString () == """\
+    @Status
     @CoreMapping
     ResultWrapper<Void> getFoo();
 """

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/ApiOptions.kt

@@ -19,7 +19,7 @@ fun parseOptions(
     targetDir: String = "defaultTargetDir",
     version: String =
         """
-        |openapi-processor-mapping: v9
+        |openapi-processor-mapping: v13
         |
         """,
     options: String =

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/MethodWriterAnnotationSpec.kt

@@ -63,6 +63,7 @@ class MethodWriterAnnotationSpec: StringSpec ({
         // then:
         target.toString () shouldBe
             """    
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter @Bar(bar = rab) Foo foo);
             |
@@ -97,6 +98,7 @@ class MethodWriterAnnotationSpec: StringSpec ({
         // then:
         target.toString () shouldBe
             """    
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter @Bar(bar = rab) Foo foo);
             |
@@ -129,6 +131,7 @@ class MethodWriterAnnotationSpec: StringSpec ({
         // then:
         target.toString () shouldBe
             """    
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter @Bar(bar = rab) Foo foo);
             |
@@ -168,6 +171,7 @@ class MethodWriterAnnotationSpec: StringSpec ({
         // then:
         target.toString () shouldBe
             """    
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter @Bar(bar = rab) MappedFoo foo);
             |

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/MethodWriterSpec.kt

@@ -57,6 +57,7 @@ class MethodWriterSpec: StringSpec({
         // then:
         target.toString () shouldBe
             """    
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter @NotNull String foo);
             |
@@ -146,6 +147,7 @@ class MethodWriterSpec: StringSpec({
         // then:
         target.toString () shouldBe
             """    
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter FooX foo);
             |
@@ -172,6 +174,7 @@ class MethodWriterSpec: StringSpec({
         // then:
         target.toString () shouldBe
             """    
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter FooX body);
             |
@@ -229,6 +232,7 @@ class MethodWriterSpec: StringSpec({
         // then:
         target.toString () shouldBe
             """    
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter Map<String, Collection<String>> foo);
             |
@@ -287,6 +291,7 @@ class MethodWriterSpec: StringSpec({
         // then:
         target.toString () shouldBe
             """
+            |    @Status
             |    @CoreMapping
             |    void getFoo(@Parameter Bar<?> foo);
             |
@@ -313,7 +318,7 @@ class MethodWriterSpec: StringSpec({
         }
 
         writer.write (target, endpoint, endpoint.endpointResponses.first ())
-        
+
         target.toString () shouldBe
             """
             |    @Status

openapi-processor-core/src/testInt/resources/tests/bean-validation-iterable/outputs/api/Api.java

@@ -2,6 +2,7 @@
 
 import annotation.Mapping;
 import annotation.Parameter;
+import annotation.Status;
 import generated.model.Foo;
 import generated.model.FooL;
 import generated.support.Generated;
@@ -10,9 +11,11 @@
 @Generated(value = "openapi-processor-core", version = "test")
 public interface Api {
 
+    @Status("204")
     @Mapping("/foo")
     void postFoo(@Parameter @Valid Foo body);
 
+    @Status("204")
     @Mapping("/fooL")
     void postFooL(@Parameter @Valid FooL body);
 

openapi-processor-core/src/testInt/resources/tests/bean-validation-jakarta/outputs/api/Api.java

@@ -2,13 +2,15 @@
 
 import annotation.Mapping;
 import annotation.Parameter;
+import annotation.Status;
 import generated.model.Foo;
 import generated.support.Generated;
 import jakarta.validation.Valid;
 
 @Generated(value = "openapi-processor-core", version = "test")
 public interface Api {
 
+    @Status("204")
     @Mapping("/foo")
     void getFoo(@Parameter @Valid Foo body);
 

openapi-processor-core/src/testInt/resources/tests/bean-validation/inputs/mapping.yaml

@@ -1,4 +1,4 @@
-openapi-processor-mapping: v4
+openapi-processor-mapping: v13
 
 options:
   package-name: generated

openapi-processor-core/src/testInt/resources/tests/bean-validation/outputs/api/EndpointApi.java

@@ -2,6 +2,7 @@
 
 import annotation.Mapping;
 import annotation.Parameter;
+import annotation.Status;
 import generated.model.Obj1;
 import generated.support.Generated;
 import javax.validation.Valid;
@@ -15,17 +16,20 @@
 @Generated(value = "openapi-processor-core", version = "test")
 public interface EndpointApi {
 
+    @Status("204")
     @Mapping("/endpoint/required")
     void getEndpointRequired(
             @Parameter String requiredFalse,
             @Parameter @NotNull String requiredTrue);
 
+    @Status("204")
     @Mapping("/endpoint/length")
     void getEndpointLength(
             @Parameter @Size(min = 2) String minLength,
             @Parameter @Size(max = 4) String maxLength,
             @Parameter @Size(min = 2, max = 4) String minMaxLength);
 
+    @Status("204")
     @Mapping("/endpoint/minmax")
     void getEndpointMinmax(
             @Parameter @DecimalMin(value = "10") Integer min,
@@ -35,18 +39,22 @@ void getEndpointMinmax(
             @Parameter @DecimalMin(value = "10") @DecimalMax(value = "20") Integer minMax,
             @Parameter @DecimalMin(value = "10", inclusive = false) @DecimalMax(value = "20", inclusive = false) Integer minMaxEx);
 
+    @Status("204")
     @Mapping("/endpoint/items")
     void getEndpointItems(
             @Parameter @Size(min = 2) String[] min,
             @Parameter @Size(max = 4) String[] max,
             @Parameter @Size(min = 2, max = 4) String[] minMax);
 
+    @Status("204")
     @Mapping("/endpoint/obj")
     void postEndpointObj(@Parameter @Valid Obj1 body);
 
+    @Status("204")
     @Mapping("/endpoint/pattern")
     void getEndpointPattern(@Parameter @Pattern(regexp = ".*\\.\\\\") String anything);
 
+    @Status("204")
     @Mapping("/endpoint/email")
     void getEndpointEmail(@Parameter @Email String anything);
 

openapi-processor-core/src/testInt/resources/tests/endpoint-exclude/outputs/api/Api.java

@@ -2,11 +2,13 @@
 
 import annotation.Mapping;
 import annotation.Parameter;
+import annotation.Status;
 import generated.support.Generated;
 
 @Generated(value = "openapi-processor-core", version = "test")
 public interface Api {
 
+    @Status("204")
     @Mapping("/endpoint/{foo}")
     void getEndpointFoo(@Parameter String foo);
 

openapi-processor-core/src/testInt/resources/tests/endpoint-exclude/outputs/api/ExcludedApi.java

@@ -2,11 +2,13 @@
 
 import annotation.Mapping;
 import annotation.Parameter;
+import annotation.Status;
 import generated.support.Generated;
 
 @Generated(value = "openapi-processor-core", version = "test")
 public interface ExcludedApi {
 
+    @Status("204")
     @Mapping("/endpoint-exclude/{foo}")
     void getEndpointExcludeFoo(@Parameter String foo);