Java client, simplifies ApiConfiguration servers info + adds operation code sample

docs/generators/java.md

@@ -235,7 +235,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ---- | --------- | ---------- |
 |Info|✓|OAS2,OAS3
 |Servers|✓|OAS3
-|Paths|✗|OAS2,OAS3
+|Paths|✓|OAS2,OAS3
 |Webhooks|✗|OAS3
 |Components|✓|OAS3
 |Security|✓|OAS2,OAS3

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

@@ -187,7 +187,7 @@ src/main/java/org/openapijsonschematools/client/contenttype/ContentTypeSerialize
 src/main/java/org/openapijsonschematools/client/exceptions/ApiException.java
 src/main/java/org/openapijsonschematools/client/exceptions/BaseException.java
 src/main/java/org/openapijsonschematools/client/exceptions/InvalidAdditionalPropertyException.java
-src/main/java/org/openapijsonschematools/client/exceptions/InvalidTypeException.java
+src/main/java/org/openapijsonschematools/client/exceptions/NotImplementedException.java
 src/main/java/org/openapijsonschematools/client/exceptions/UnsetPropertyException.java
 src/main/java/org/openapijsonschematools/client/exceptions/ValidationException.java
 src/main/java/org/openapijsonschematools/client/header/ContentHeader.java

samples/client/3_0_3_unit_test/java/docs/RootServerInfo.md

@@ -4,13 +4,36 @@ RootServerInfo.java
 public class RootServerInfo
 
 A class that provides a server, and any needed server info classes
+- a class that is a ServerProvider
 - an enum class that stores server index values
 
 ## Nested Class Summary
 | Modifier and Type | Class and Description |
 | ----------------- | --------------------- |
+| static class | [RootServerInfo.RootServerInfo1](#rootserverinfo1)<br>class that stores a server index |
 | enum | [RootServerInfo.ServerIndex](#serverindex)<br>class that stores a server index |
 
+## RootServerInfo1
+implements ServerProvider<[ServerIndex](#serverindex)><br>
+
+A class that stores servers and allows one to be returned with a ServerIndex instance
+
+### Constructor Summary
+| Constructor and Description |
+| --------------------------- |
+| RootServerInfo1()<br>Creates an instance using default server variable values |
+| RootServerInfo1(@Nullable [Server0](servers/Server0.md) server0)<br>Creates an instance using passed in servers |
+
+### Field Summary
+| Modifier and Type | Field and Description |
+| ----------------- | --------------------- |
+| [Server0](servers/Server0.md) | server0 |
+
+### Method Summary
+| Modifier and Type | Method and Description |
+| ----------------- | ---------------------- |
+| Server | getServer([ServerIndex](#serverindex) serverIndex) |
+
 ## ServerIndex
 enum ServerIndex<br>
 

samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/RootServerInfo.java

@@ -1,73 +1,33 @@
 package org.openapijsonschematools.client;
 
-import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
 import org.openapijsonschematools.client.servers.Server0;
 import org.openapijsonschematools.client.servers.Server;
 import org.openapijsonschematools.client.servers.ServerProvider;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-import java.util.AbstractMap;
-import java.util.Map;
 import java.util.Objects;
-import java.util.EnumMap;
 
-public class RootServerInfo implements ServerProvider<RootServerInfo.ServerIndex> {
-    final private Servers servers;
-    final private ServerIndex serverIndex;
+public class RootServerInfo {
+    public static class RootServerInfo1 implements ServerProvider<ServerIndex> {
+        public final Server0 server0;
 
-    public RootServerInfo() {
-        this.servers = new Servers();
-        this.serverIndex = ServerIndex.SERVER_0;
-    }
-
-    public RootServerInfo(Servers servers, ServerIndex serverIndex) {
-        this.servers = servers;
-        this.serverIndex = serverIndex;
-    }
-
-    public static class Servers {
-        private final EnumMap<ServerIndex, Server> servers;
-
-        public Servers() {
-            servers = new EnumMap<>(
-                Map.ofEntries(
-                    new AbstractMap.SimpleEntry<>(
-                        ServerIndex.SERVER_0,
-                        new Server0()
-                    )
-                )
-            );
+        public RootServerInfo1() {
+            server0 = new Server0();
         }
 
-        public Servers(
+        public RootServerInfo1(
             @Nullable Server0 server0
         ) {
-            servers = new EnumMap<>(
-                Map.ofEntries(
-                    new AbstractMap.SimpleEntry<>(
-                        ServerIndex.SERVER_0,
-                        Objects.requireNonNullElseGet(server0, Server0::new)
-                    )
-                )
-            );
+            this.server0 = Objects.requireNonNullElseGet(server0, Server0::new);
         }
 
-        public Server get(ServerIndex serverIndex) {
-            if (servers.containsKey(serverIndex)) {
-                return get(serverIndex);
-            }
-            throw new UnsetPropertyException(serverIndex+" is unset");
+        @Override
+        public Server getServer(ServerIndex serverIndex) {
+            return server0;
         }
     }
 
     public enum ServerIndex {
         SERVER_0
     }
-
-    public Server getServer(@Nullable ServerIndex serverIndex) {
-        if (serverIndex == null) {
-            return servers.get(this.serverIndex);
-        }
-        return servers.get(serverIndex);
-    }
 }

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

@@ -11,7 +11,6 @@
 import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags;
 import org.openapijsonschematools.client.configurations.SchemaConfiguration;
 import org.openapijsonschematools.client.exceptions.InvalidAdditionalPropertyException;
-import org.openapijsonschematools.client.exceptions.InvalidTypeException;
 import org.openapijsonschematools.client.exceptions.UnsetPropertyException;
 import org.openapijsonschematools.client.exceptions.ValidationException;
 import org.openapijsonschematools.client.schemas.AnyTypeJsonSchema;
@@ -88,7 +87,7 @@ public boolean getAdditionalProperty(String name) throws UnsetPropertyException,
             throwIfKeyKnown(name, requiredKeys, optionalKeys);
             var value = getOrThrow(name);
             if (!(value instanceof Boolean)) {
-                throw new InvalidTypeException("Invalid value stored for " + name);
+                throw new RuntimeException("Invalid value stored for " + name);
             }
             return (boolean) value;
         }
@@ -299,15 +298,15 @@ public AdditionalpropertiesAllowsASchemaWhichShouldValidateMap getNewInstance(Ma
             for(Map.Entry<?, ?> entry: arg.entrySet()) {
                 @Nullable Object entryKey = entry.getKey();
                 if (!(entryKey instanceof String)) {
-                    throw new InvalidTypeException("Invalid non-string key value");
+                    throw new RuntimeException("Invalid non-string key value");
                 }
                 String propertyName = (String) entryKey;
                 List<Object> propertyPathToItem = new ArrayList<>(pathToItem);
                 propertyPathToItem.add(propertyName);
                 Object value = entry.getValue();
                 LinkedHashMap<JsonSchema<?>, Void> schemas = pathToSchemas.get(propertyPathToItem);
                 if (schemas == null) {
-                    throw new InvalidTypeException("Validation result is invalid, schemas must exist for a pathToItem");
+                    throw new RuntimeException("Validation result is invalid, schemas must exist for a pathToItem");
                 }
                 JsonSchema<?> propertySchema = schemas.entrySet().iterator().next().getKey();
                 @Nullable Object propertyInstance = propertySchema.getNewInstance(value, propertyPathToItem, pathToSchemas);
@@ -317,7 +316,7 @@ public AdditionalpropertiesAllowsASchemaWhichShouldValidateMap getNewInstance(Ma
             return new AdditionalpropertiesAllowsASchemaWhichShouldValidateMap(castProperties);
         }
 
-        public AdditionalpropertiesAllowsASchemaWhichShouldValidateMap validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+        public AdditionalpropertiesAllowsASchemaWhichShouldValidateMap validate(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException {
             Set<List<Object>> pathSet = new HashSet<>();
             List<Object> pathToItem = List.of("args[0");
             Map<?, ?> castArg = castToAllowedTypes(arg, pathToItem, pathSet);
@@ -329,29 +328,29 @@ public AdditionalpropertiesAllowsASchemaWhichShouldValidateMap validate(Map<?, ?
 
 
         @Override
-        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+        public @Nullable Object validate(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException {
             if (arg instanceof Map) {
                 return validate((Map<?, ?>) arg, configuration);
             }
-            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+            throw new ValidationException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
         }        
         @Override
-        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) throws InvalidTypeException {
+        public @Nullable Object getNewInstance(@Nullable Object arg, List<Object> pathToItem, PathToSchemasMap pathToSchemas) {
             if (arg instanceof Map) {
                 return getNewInstance((Map<?, ?>) arg, pathToItem, pathToSchemas);
             }
-            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
+            throw new RuntimeException("Invalid input type="+getClass(arg)+". It can't be instantiated by this schema");
         }
         @Override
-        public AdditionalpropertiesAllowsASchemaWhichShouldValidate1BoxedMap validateAndBox(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+        public AdditionalpropertiesAllowsASchemaWhichShouldValidate1BoxedMap validateAndBox(Map<?, ?> arg, SchemaConfiguration configuration) throws ValidationException {
             return new AdditionalpropertiesAllowsASchemaWhichShouldValidate1BoxedMap(validate(arg, configuration));
         }
         @Override
-        public AdditionalpropertiesAllowsASchemaWhichShouldValidate1Boxed validateAndBox(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException, InvalidTypeException {
+        public AdditionalpropertiesAllowsASchemaWhichShouldValidate1Boxed validateAndBox(@Nullable Object arg, SchemaConfiguration configuration) throws ValidationException {
             if (arg instanceof Map<?, ?> castArg) {
                 return validateAndBox(castArg, configuration);
             }
-            throw new InvalidTypeException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
+            throw new ValidationException("Invalid input type="+getClass(arg)+". It can't be validated by this schema");
         }
     }