Merge pull request #75 from hauner/#74

resolves #74

Author: hauner

src/main/groovy/com/github/hauner/openapi/spring/converter/ApiOptions.groovy

@@ -46,6 +46,11 @@ class ApiOptions {
      */
     String packageName
 
+    /**
+     * provide enabling Bean Validation (JSR303) annotations. Default is false (disabled)
+     */
+    boolean beanValidation = false
+
     /**
      * provide additional type mapping information to map OpenAPI types to java types. The list can
      * contain the following mappings:
@@ -59,9 +64,4 @@ class ApiOptions {
      */
     List<Mapping> typeMappings
 
-    /**
-     * provide enabling Bean Validation (JSR303) annotations. Default is false (disabled)
-     */
-    boolean beanValidation = false;
-
 }

src/main/groovy/com/github/hauner/openapi/spring/generatr/SpringGeneratr.groovy

@@ -78,7 +78,7 @@ class SpringGeneratr implements OpenApiGeneratr {
             new DataTypeWriter(
                 headerWriter: headerWriter,
                 beanValidationFactory: beanValidationFactory,
-                apiOptions: options,
+                apiOptions: options
             ),
             new StringEnumWriter(headerWriter: headerWriter)
         )
@@ -87,18 +87,44 @@ class SpringGeneratr implements OpenApiGeneratr {
     }
 
     private ApiOptions convertOptions (Map<String, ?> generatrOptions) {
-        def options = new ApiOptions()
+        def reader = new MappingReader ()
+        def converter = new MappingConverter ()
+        def mapping
+
+        if (generatrOptions.containsKey ('mapping')) {
+            mapping = reader.read (generatrOptions.mapping as String)
+
+        } else if (generatrOptions.containsKey ('typeMappings')) {
+            mapping = reader.read (generatrOptions.typeMappings as String)
+            println "warning: 'typeMappings' option is deprecated, use 'mapping'!"
+        }
+
+        def options = new ApiOptions ()
         options.apiPath = generatrOptions.apiPath
         options.targetDir = generatrOptions.targetDir
-        options.packageName = generatrOptions.packageName
 
-        def reader = new MappingReader ()
-        def converter = new MappingConverter()
-        def mapping = reader.read (generatrOptions.typeMappings as String)
+        if (generatrOptions.packageName) {
+            options.packageName = generatrOptions.packageName
+            println "warning: 'options:package-name' should be set in the mapping yaml!"
+        }
+
+        if (generatrOptions.containsKey ('beanValidation')) {
+            options.beanValidation = generatrOptions.beanValidation
+            println "warning: 'options:bean-validation' should be set in the mapping yaml!"
+        }
+
         if (mapping) {
+            if (mapping?.options?.packageName != null) {
+                options.packageName = mapping.options.packageName
+            }
+
+            if (mapping?.options?.beanValidation != null) {
+                options.beanValidation = mapping.options.beanValidation
+            }
+
             options.typeMappings = converter.convert (mapping)
         }
-        options.beanValidation = generatrOptions.beanValidation != null && generatrOptions.beanValidation == true
+
         options
     }
 

src/main/groovy/com/github/hauner/openapi/spring/generatr/mapping/Mapping.groovy

@@ -29,7 +29,12 @@ class Mapping {
     String openapiGeneratrSpring
 
     /**
-     * the mappings
+     * general options
+     */
+    Options options
+
+    /**
+     * the type mappings
      */
     Map map
 

src/main/groovy/com/github/hauner/openapi/spring/generatr/mapping/Options.groovy

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2020 the original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.hauner.openapi.spring.generatr.mapping
+
+/**
+ * general options
+ *
+ *  @author Martin Hauner
+ */
+class Options {
+
+    /**
+     * the root package name of the generated interfaces & models (required)
+     *
+     * Interfaces and models will be generated into the `api` and `model` subpackages of `packageName`.
+     * - so the final package name of the generated interfaces will be `"${packageName}.api"`
+     * - and the final package name of the generated models will be `"${packageName}.model"`
+     */
+    String packageName
+
+    /**
+     * bean validation (optional)
+     */
+    Boolean beanValidation
+
+}

src/test/groovy/com/github/hauner/openapi/spring/generatr/MappingExampleSpec.groovy

@@ -29,6 +29,10 @@ class MappingExampleSpec extends Specification {
 
 
     String yaml = """
+options:
+    package-name: com.github.hauner.openapi
+    bean-validation: true 
+
 map:
   types:
     - from: array
@@ -55,7 +59,6 @@ map:
       to: com.github.hauner.openapi.FooBar  
 
   paths:
-    # not implemented
     /first:
       exclude: true