Java generator, adds schema default + Servers (#355)

* Stores default in schemas

* Adds schema defaults, writes server base classes

* Root variables fixed

* Fixes server class names for path servers

* Fixes path verb servers

* 303 java sample updated

* Fixes datetime default values

* Fixes the type of defaultValue in docs

* Adds DefaultValueMethod interface

* Fiexs type error when accessing defaultValue by adding DefaultValueMethod interface

* Petstore regen with schema docs

* Adds servers feature in java docs

* Samples regen

Author: spacether

docs/generators/java.md

@@ -168,7 +168,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ### Client Modification Feature
 | Name | Supported | Defined By |
 | ---- | --------- | ---------- |
-|BasePath|✓|ToolingExtension
+|BasePath|✗|ToolingExtension
 |Authorizations|✗|ToolingExtension
 |UserAgent|✗|ToolingExtension
 |MockServer|✗|ToolingExtension
@@ -216,7 +216,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Name | Supported | Defined By |
 | ---- | --------- | ---------- |
 |Readme|✓|ToolingExtension
-|Servers|✗|OAS3
+|Servers|✓|OAS3
 |Security|✗|OAS2,OAS3
 |ComponentSchemas|✓|OAS3
 |ComponentResponses|✗|OAS3
@@ -233,7 +233,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Name | Supported | Defined By |
 | ---- | --------- | ---------- |
 |Info|✓|OAS2,OAS3
-|Servers|✗|OAS3
+|Servers|✓|OAS3
 |Paths|✗|OAS2,OAS3
 |Webhooks|✗|OAS3
 |Components|✓|OAS3

samples/client/3_0_3_unit_test/java/.openapi-generator/FILES

@@ -86,6 +86,7 @@ docs/components/schemas/UniqueitemsValidation.md
 docs/components/schemas/UriFormat.md
 docs/components/schemas/UriReferenceFormat.md
 docs/components/schemas/UriTemplateFormat.md
+docs/servers/Server0.md
 pom.xml
 src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidate.java
 src/main/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefault.java
@@ -209,6 +210,7 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/BooleanEnumVa
 src/main/java/org/openapijsonschematools/client/schemas/validation/BooleanSchemaValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/BooleanValueMethod.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/CustomIsoparser.java
+src/main/java/org/openapijsonschematools/client/schemas/validation/DefaultValueMethod.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/DoubleEnumValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/DoubleValueMethod.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/EnumValidator.java
@@ -261,6 +263,9 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/TypeValidator
 src/main/java/org/openapijsonschematools/client/schemas/validation/UniqueItemsValidator.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/UnsetAnyTypeJsonSchema.java
 src/main/java/org/openapijsonschematools/client/schemas/validation/ValidationMetadata.java
+src/main/java/org/openapijsonschematools/client/servers/Server0.java
+src/main/java/org/openapijsonschematools/client/servers/ServerWithVariables.java
+src/main/java/org/openapijsonschematools/client/servers/ServerWithoutVariables.java
 src/test/java/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlagsTest.java
 src/test/java/org/openapijsonschematools/client/schemas/AnyTypeSchemaTest.java
 src/test/java/org/openapijsonschematools/client/schemas/ArrayTypeSchemaTest.java

samples/client/3_0_3_unit_test/java/README.md

@@ -148,6 +148,11 @@ org.openapijsonschematools.client.components.schemas to validate input payloads
 output classes. Json schemas allow multiple types for one schema, so a schema's validate method can have
 allowed input and output types.
 
+## Servers
+| server_index | Class | Description |
+| ------------ | ----- | ----------- |
+| 0 | [Server0](docs/servers/Server0.md) | |
+
 ## Component Schemas
 
 | Class | Description |

samples/client/3_0_3_unit_test/java/docs/components/schemas/InvalidStringValueForDefault.md

@@ -111,6 +111,7 @@ String validatedPayload = InvalidStringValueForDefault.Bar.validate(
 | ----------------- | ---------------------- |
 | Set<Class<?>> | type = Set.of(<br/>&nbsp;&nbsp;&nbsp;&nbsp;String.class<br/>)<br/> |
 | Integer | minLength = 4 |
+| @Nullable Object | defaultValue = "bad" |
 
 ### Method Summary
 | Modifier and Type | Method and Description |

samples/client/3_0_3_unit_test/java/docs/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.md

@@ -133,6 +133,7 @@ int validatedPayload = TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.
 | ----------------- | ---------------------- |
 | Set<Class<?>> | type = Set.of(<br/>&nbsp;&nbsp;&nbsp;&nbsp;Integer.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;Long.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;Float.class,<br/>&nbsp;&nbsp;&nbsp;&nbsp;Double.class<br/>)<br/> |
 | Number | maximum = 3 |
+| @Nullable Object | defaultValue = 5.0 |
 
 ### Method Summary
 | Modifier and Type | Method and Description |

samples/client/3_0_3_unit_test/java/docs/servers/Server0.md

@@ -0,0 +1,17 @@
+org.openapijsonschematools.client.servers.Server0
+# Server Server0
+public class Server0
+
+A class that stores a server url
+
+### Constructor Summary
+| Constructor and Description |
+| --------------------------- |
+| Server0()<br>Creates a server |
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | --------------------- |
+| String            | url = "https://someserver.com/v1"     |
+
+[[Back to top]](#top) [[Back to Servers]](../../README.md#Servers) [[Back to README]](../../README.md)

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefault.java

@@ -20,6 +20,7 @@
 import org.openapijsonschematools.client.schemas.BaseBuilder;
 import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
 import org.openapijsonschematools.client.schemas.validation.BooleanSchemaValidator;
+import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod;
 import org.openapijsonschematools.client.schemas.validation.FrozenList;
 import org.openapijsonschematools.client.schemas.validation.FrozenMap;
 import org.openapijsonschematools.client.schemas.validation.JsonSchema;
@@ -37,7 +38,7 @@ public class InvalidStringValueForDefault {
     // nest classes so all schemas and input/output classes can be public
 
 
-    public static class Bar extends JsonSchema implements StringSchemaValidator {
+    public static class Bar extends JsonSchema implements StringSchemaValidator, DefaultValueMethod<String> {
         private static @Nullable Bar instance = null;
 
         protected Bar() {
@@ -46,6 +47,7 @@ protected Bar() {
                     String.class
                 ))
                 .minLength(4)
+                .defaultValue("bad")
             );
         }
 
@@ -81,6 +83,12 @@ public String validate(String arg, SchemaConfiguration configuration) throws Val
             }
             throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
         }
+        public String defaultValue() {
+            if (defaultValue instanceof String) {
+                return (String) defaultValue;
+            }
+            throw new InvalidTypeException("Invalid type stored in defaultValue");
+        }
     }    
 
     public static class InvalidStringValueForDefaultMap extends FrozenMap<@Nullable Object> {

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.java

@@ -16,6 +16,7 @@
 import org.openapijsonschematools.client.exceptions.ValidationException;
 import org.openapijsonschematools.client.schemas.BaseBuilder;
 import org.openapijsonschematools.client.schemas.UnsetAddPropsSetter;
+import org.openapijsonschematools.client.schemas.validation.DefaultValueMethod;
 import org.openapijsonschematools.client.schemas.validation.FrozenMap;
 import org.openapijsonschematools.client.schemas.validation.JsonSchema;
 import org.openapijsonschematools.client.schemas.validation.JsonSchemaInfo;
@@ -41,6 +42,7 @@ protected Alpha() {
                     Double.class
                 ))
                 .maximum(3)
+                .defaultValue(5.0)
             );
         }
 

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/DefaultValueMethod.java

@@ -0,0 +1,5 @@
+package org.openapijsonschematools.client.schemas.validation;
+
+public interface DefaultValueMethod<T> {
+    T defaultValue();
+}

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/validation/JsonSchema.java

@@ -42,6 +42,7 @@ public abstract class JsonSchema {
     public final @Nullable Boolean uniqueItems;
     public final @Nullable Set<@Nullable Object> enumValues;
     public final @Nullable Pattern pattern;
+    public final @Nullable Object defaultValue;
     private final LinkedHashMap<String, KeywordValidator> keywordToValidator;
 
     protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
@@ -214,6 +215,7 @@ protected JsonSchema(JsonSchemaInfo jsonSchemaInfo) {
                     new PatternValidator(this.pattern)
             );
         }
+        this.defaultValue = jsonSchemaInfo.defaultValue;
         this.keywordToValidator = keywordToValidator;
     }