add schema default value to data type

Author: hauner

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

@@ -173,26 +173,26 @@ class DataTypeConverter {
         }
 
         def defaultValue = schemaInfo.defaultValue
-        def constraints = defaultValue ? new DataTypeConstraints(defaultValue: defaultValue) : null
+        def constraints = defaultValue != null ? new DataTypeConstraints(defaultValue: defaultValue) : null
 
         def simpleType
         switch (typeFormat) {
             case 'integer':
             case 'integer/int32':
-                simpleType = new IntegerDataType ()
+                simpleType = new IntegerDataType (constraints: constraints)
                 break
             case 'integer/int64':
-                simpleType = new LongDataType ()
+                simpleType = new LongDataType (constraints: constraints)
                 break
             case 'number':
             case 'number/float':
-                simpleType = new FloatDataType ()
+                simpleType = new FloatDataType (constraints: constraints)
                 break
             case 'number/double':
-                simpleType = new DoubleDataType ()
+                simpleType = new DoubleDataType (constraints: constraints)
                 break
             case 'boolean':
-                simpleType = new BooleanDataType ()
+                simpleType = new BooleanDataType (constraints: constraints)
                 break
             case 'string':
                 simpleType = createStringDataType (schemaInfo, constraints, dataTypes)

src/main/groovy/com/github/hauner/openapi/spring/model/datatypes/BooleanDataType.groovy

@@ -23,6 +23,8 @@ package com.github.hauner.openapi.spring.model.datatypes
  */
 class BooleanDataType implements DataType {
 
+    DataTypeConstraints constraints
+
     @Override
     String getName () {
         'Boolean'
@@ -43,4 +45,9 @@ class BooleanDataType implements DataType {
         []
     }
 
+    @Override
+    DataTypeConstraints getConstraints() {
+        constraints
+    }
+
 }

src/main/groovy/com/github/hauner/openapi/spring/model/datatypes/DataTypeConstraints.groovy

@@ -23,7 +23,7 @@ class DataTypeConstraints {
 
     def defaultValue
 
-    String getDefault () {
+    def getDefault () {
         defaultValue
     }
 

src/main/groovy/com/github/hauner/openapi/spring/model/datatypes/DoubleDataType.groovy

@@ -23,6 +23,8 @@ package com.github.hauner.openapi.spring.model.datatypes
  */
 class DoubleDataType implements DataType {
 
+    DataTypeConstraints constraints
+
     @Override
     String getName () {
         'Double'
@@ -43,4 +45,9 @@ class DoubleDataType implements DataType {
         []
     }
 
+    @Override
+    DataTypeConstraints getConstraints() {
+        constraints
+    }
+
 }

src/main/groovy/com/github/hauner/openapi/spring/model/datatypes/FloatDataType.groovy

@@ -23,6 +23,8 @@ package com.github.hauner.openapi.spring.model.datatypes
  */
 class FloatDataType implements DataType {
 
+    DataTypeConstraints constraints
+
     @Override
     String getName () {
         'Float'
@@ -43,4 +45,9 @@ class FloatDataType implements DataType {
         []
     }
 
+    @Override
+    DataTypeConstraints getConstraints() {
+        constraints
+    }
+
 }

src/main/groovy/com/github/hauner/openapi/spring/model/datatypes/IntegerDataType.groovy

@@ -23,6 +23,8 @@ package com.github.hauner.openapi.spring.model.datatypes
  */
 class IntegerDataType implements DataType {
 
+    DataTypeConstraints constraints
+
     @Override
     String getName () {
         return 'Integer'
@@ -43,4 +45,9 @@ class IntegerDataType implements DataType {
         []
     }
 
+    @Override
+    DataTypeConstraints getConstraints() {
+        constraints
+    }
+
 }

src/main/groovy/com/github/hauner/openapi/spring/model/datatypes/LongDataType.groovy

@@ -23,6 +23,8 @@ package com.github.hauner.openapi.spring.model.datatypes
  */
 class LongDataType implements DataType {
 
+    DataTypeConstraints constraints
+
     @Override
     String getName () {
         'Long'
@@ -43,4 +45,9 @@ class LongDataType implements DataType {
         []
     }
 
+    @Override
+    DataTypeConstraints getConstraints() {
+        constraints
+    }
+
 }

src/test/groovy/com/github/hauner/openapi/spring/converter/DataTypeConverterSpec.groovy

@@ -63,15 +63,29 @@ class DataTypeConverterSpec extends Specification {
         'boolean' | null        | 'Boolean'
     }
 
-    void "converts primitive schema with default value" () {
-        Schema schema = new Schema(type: 'string', _default: 'bar')
+    @Unroll
+    void "converts schema(#type, #format, #dflt) to javaType with default value" () {
+        Schema schema = new Schema(type: type, format: format, _default: dflt)
 
         when:
-        def datatype = converter.convert (new SchemaInfo (null, schema, 'String'), new DataTypes())
+        def datatype = converter.convert (
+            new SchemaInfo (null, schema, javaType), new DataTypes()
+        )
 
         then:
-        datatype.name == 'String'
-        datatype.constraints.default == 'bar'
+        datatype.name == javaType
+        datatype.constraints.default == dflt
+
+        where:
+        type      | format   | dflt  | javaType
+        'string'  | null     | 'foo' | 'String'
+        'integer' | null     | 101   | 'Integer'
+        'integer' | 'int32'  | 102   | 'Integer'
+        'integer' | 'int64'  | 103   | 'Long'
+        'number'  | null     | 10.1  | 'Float'
+        'number'  | 'float'  | 10.2  | 'Float'
+        'number'  | 'double' | 10.3  | 'Double'
+        'boolean' | null     | false | 'Boolean'
     }
 
     void "throws when hitting an unknown data type" () {