check more package selection options (#115)

hauner · hauner · commit 8f7842733d67 · 2025-06-15T18:53:11.000+02:00
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/bar.yaml b/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/bar.yaml
@@ -0,0 +1,9 @@
+get:
+  tags: [ bar ]
+  responses:
+    '200':
+      description: the bar result
+      content:
+        application/json:
+            schema:
+              $ref: './resources.yaml#/Bar'
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/mapping.yaml b/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/mapping.yaml
@@ -1,6 +1,11 @@
 openapi-processor-mapping: v13
 
 options:
-  package-name: io.openapiprocessor
-  package-name-from-path: true
+#  package-name: io.openapiprocessor
+  package-names:
+    base: io.openapiprocessor.openapi
+    location: io.openapiprocessor
+
+  bean-validation: true
+  enum-type: string
   format-code: false
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/openapi30.yaml b/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/openapi30.yaml
@@ -6,4 +6,9 @@ info:
 paths:
 
   /foo:
+    # placed into location package
     $ref: '../main/kotlin/io/openapiprocessor/foo/foo.yaml'
+
+  /bar:
+    # placed into base package
+    $ref: './bar.yaml'
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/openapi31.yaml b/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/openapi31.yaml
@@ -6,4 +6,9 @@ info:
 paths:
 
   /foo:
+    # placed into location package
     $ref: '../main/kotlin/io/openapiprocessor/foo/foo.yaml'
+
+  /bar:
+    # placed into base package
+    $ref: './bar.yaml'
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/resources.yaml b/openapi-processor-core/src/testInt/resources/tests/packages/inputs/api/resources.yaml
@@ -0,0 +1,5 @@
+Bar:
+  type: object
+  properties:
+    foo:
+      type: string
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/inputs/main/kotlin/io/openapiprocessor/foo/foo.yaml b/openapi-processor-core/src/testInt/resources/tests/packages/inputs/main/kotlin/io/openapiprocessor/foo/foo.yaml
@@ -1,4 +1,5 @@
 get:
+  tags: [foo]
   responses:
     '200':
       description: the foo result
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs.yaml b/openapi-processor-core/src/testInt/resources/tests/packages/outputs.yaml
@@ -1,3 +1,8 @@
 items:
-  - outputs/io/openapiprocessor/foo/Api.java
+  - outputs/io/openapiprocessor/foo/FooApi.java
   - outputs/io/openapiprocessor/foo/<model>/Foo.java
+  - outputs/io/openapiprocessor/openapi/api/BarApi.java
+  - outputs/io/openapiprocessor/openapi/model/<model>/Bar.java
+  - outputs/io/openapiprocessor/openapi/support/Generated.java
+  - outputs/io/openapiprocessor/openapi/validation/Values.java
+  - outputs/io/openapiprocessor/openapi/validation/ValueValidator.java
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/foo/FooApi.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/foo/FooApi.java
@@ -1,10 +1,10 @@
 package io.openapiprocessor.foo;
 
 import annotation.Mapping;
-import io.openapiprocessor.support.Generated;
+import io.openapiprocessor.openapi.support.Generated;
 
 @Generated(value = "openapi-processor-core", version = "test")
-public interface Api {
+public interface FooApi {
 
     @Mapping("/foo")
     Foo getFoo();
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/foo/_default_/Foo.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/foo/_default_/Foo.java
@@ -1,7 +1,7 @@
 package io.openapiprocessor.foo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.openapiprocessor.support.Generated;
+import io.openapiprocessor.openapi.support.Generated;
 
 @Generated(value = "openapi-processor-core", version = "test")
 public class Foo {
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/foo/_record_/Foo.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/foo/_record_/Foo.java
@@ -1,7 +1,7 @@
 package io.openapiprocessor.foo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.openapiprocessor.support.Generated;
+import io.openapiprocessor.openapi.support.Generated;
 
 @Generated(value = "openapi-processor-core", version = "test")
 public record Foo(
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/api/BarApi.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/api/BarApi.java
@@ -0,0 +1,13 @@
+package io.openapiprocessor.openapi.api;
+
+import annotation.Mapping;
+import io.openapiprocessor.openapi.model.Bar;
+import io.openapiprocessor.openapi.support.Generated;
+
+@Generated(value = "openapi-processor-core", version = "test")
+public interface BarApi {
+
+    @Mapping("/bar")
+    Bar getBar();
+
+}
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/model/_default_/Bar.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/model/_default_/Bar.java
@@ -0,0 +1,20 @@
+package io.openapiprocessor.openapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.openapiprocessor.openapi.support.Generated;
+
+@Generated(value = "openapi-processor-core", version = "test")
+public class Bar {
+
+    @JsonProperty("foo")
+    private String foo;
+
+    public String getFoo() {
+        return foo;
+    }
+
+    public void setFoo(String foo) {
+        this.foo = foo;
+    }
+
+}
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/model/_record_/Bar.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/model/_record_/Bar.java
@@ -0,0 +1,10 @@
+package io.openapiprocessor.openapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.openapiprocessor.openapi.support.Generated;
+
+@Generated(value = "openapi-processor-core", version = "test")
+public record Bar(
+    @JsonProperty("foo")
+    String foo
+) {}
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/support/Generated.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/support/Generated.java
@@ -0,0 +1,37 @@
+package io.openapiprocessor.openapi.support;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+@Documented
+@Retention(CLASS)
+@Target({TYPE, METHOD})
+@Generated(value = "openapi-processor-core", version = "test")
+public @interface Generated {
+    /**
+     * The name of the source code generator, i.e. openapi-processor-*.
+     *
+     * @return name of the generator
+     */
+    String value();
+
+    /**
+     * @return version of the generator
+     */
+    String version();
+
+    /**
+     * The date &amp; time of generation (ISO 8601) or "-" if no date was set.
+     *
+     * @return date of generation
+     */
+    String date() default "-";
+
+    /**
+     * The url of the generator.
+     *
+     * @return url of generator
+     */
+    String url() default "https://openapiprocessor.io";
+}
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/validation/ValueValidator.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/validation/ValueValidator.java
@@ -0,0 +1,21 @@
+package io.openapiprocessor.openapi.validation;
+
+import io.openapiprocessor.openapi.support.Generated;
+import java.util.Arrays;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+@Generated(value = "openapi-processor-core", version = "test")
+public class ValueValidator implements ConstraintValidator<Values, String> {
+    private String[] values;
+
+    @Override
+    public void initialize (Values constraintAnnotation) {
+        values = constraintAnnotation.values();
+    }
+
+    @Override
+    public boolean isValid (String value, ConstraintValidatorContext context) {
+        return value != null && Arrays.asList(values).contains(value);
+    }
+}
diff --git a/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/validation/Values.java b/openapi-processor-core/src/testInt/resources/tests/packages/outputs/io/openapiprocessor/openapi/validation/Values.java
@@ -0,0 +1,18 @@
+package io.openapiprocessor.openapi.validation;
+
+import io.openapiprocessor.openapi.support.Generated;
+import java.lang.annotation.*;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+@Target({ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = ValueValidator.class)
+@Documented
+@Generated(value = "openapi-processor-core", version = "test")
+public @interface Values {
+    String message() default "Invalid value. Should be one of values.";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+    String[] values() default {};
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`get:`
	`2`	`+ tags: [foo]`
`2`	`3`	`responses:`
`3`	`4`	`'200':`
`4`	`5`	`description: the foo result`