loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 12:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Bug] [Java] Remove raw type compilation warnings when generating using jersey2 or jersey3 (#19033)

Browse Source 
* Add type annotations to raw types for jersey2 and jersey3 templates

* Update samples

* Add type parameters to anyof_model.mustache and oneof_model.mustache

---------

Co-authored-by: Kasper S. Nielsen <kasper.s.nielsen@secata.com>
This commit is contained in:
ksn-partisia 2024-06-30 04:06:12 +02:00 committed by GitHub
parent 53f1094765
commit fa2b5750ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
64 changed files with 176 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache vendored
View File

@ -35,7 +35,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

10
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache vendored
View File

@ -824,9 +824,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
return formatDate((Date) param);
} {{#jsr310}}else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} {{/jsr310}}else if (param instanceof Collection) {
} {{/jsr310}}else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -852,9 +852,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache vendored
View File

@ -191,9 +191,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -210,7 +210,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -230,7 +230,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

4
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache vendored
View File

@ -99,7 +99,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
}
// store a list of schema names defined in anyOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public {{classname}}() {
super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
@ -144,7 +144,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return {{classname}}.schemas;
}

4
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache vendored
View File

@ -169,7 +169,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public {{classname}}() {
super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
@ -218,7 +218,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return {{classname}}.schemas;
}

2
modules/openapi-generator/src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache vendored
View File

@ -35,7 +35,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

10
modules/openapi-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache vendored
View File

@ -824,9 +824,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
return formatDate((Date) param);
} {{#jsr310}}else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} {{/jsr310}}else if (param instanceof Collection) {
} {{/jsr310}}else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -852,9 +852,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache vendored
View File

@ -191,9 +191,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -210,7 +210,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -230,7 +230,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

4
modules/openapi-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache vendored
View File

@ -99,7 +99,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
}
// store a list of schema names defined in anyOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public {{classname}}() {
super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
@ -144,7 +144,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return {{classname}}.schemas;
}

4
modules/openapi-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache vendored
View File

@ -169,7 +169,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public {{classname}}() {
super("oneOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
@ -218,7 +218,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return {{classname}}.schemas;
}

10
samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -592,9 +592,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -620,9 +620,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

4
samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/model/Example.java
View File

@ -135,7 +135,7 @@ public class Example extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Example() {
super("oneOf", Boolean.FALSE);
@ -160,7 +160,7 @@ public class Example extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Example.schemas;
}

10
samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -592,9 +592,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -620,9 +620,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

4
samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/model/Example.java
View File

@ -135,7 +135,7 @@ public class Example extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Example() {
super("oneOf", Boolean.FALSE);
@ -156,7 +156,7 @@ public class Example extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Example.schemas;
}

10
samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -733,9 +733,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -761,9 +761,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

10
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -733,9 +733,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -761,9 +761,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

10
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -815,9 +815,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -843,9 +843,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Fruit.java
View File

@ -144,7 +144,7 @@ public class Fruit extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Fruit() {
super("oneOf", Boolean.FALSE);
@ -169,7 +169,7 @@ public class Fruit extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Fruit.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FruitReq.java
View File

@ -144,7 +144,7 @@ public class FruitReq extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public FruitReq() {
super("oneOf", Boolean.TRUE);
@ -169,7 +169,7 @@ public class FruitReq extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return FruitReq.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GmFruit.java
View File

@ -124,7 +124,7 @@ public class GmFruit extends AbstractOpenApiSchema {
}
// store a list of schema names defined in anyOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public GmFruit() {
super("anyOf", Boolean.FALSE);
@ -149,7 +149,7 @@ public class GmFruit extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return GmFruit.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Mammal.java
View File

@ -187,7 +187,7 @@ public class Mammal extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Mammal() {
super("oneOf", Boolean.FALSE);
@ -275,7 +275,7 @@ public class Mammal extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Mammal.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MammalAnyof.java
View File

@ -152,7 +152,7 @@ public class MammalAnyof extends AbstractOpenApiSchema {
}
// store a list of schema names defined in anyOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public MammalAnyof() {
super("anyOf", Boolean.FALSE);
@ -240,7 +240,7 @@ public class MammalAnyof extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return MammalAnyof.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableShape.java
View File

@ -166,7 +166,7 @@ public class NullableShape extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public NullableShape() {
super("oneOf", Boolean.TRUE);
@ -246,7 +246,7 @@ public class NullableShape extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return NullableShape.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Pig.java
View File

@ -166,7 +166,7 @@ public class Pig extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Pig() {
super("oneOf", Boolean.FALSE);
@ -246,7 +246,7 @@ public class Pig extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Pig.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Quadrilateral.java
View File

@ -166,7 +166,7 @@ public class Quadrilateral extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Quadrilateral() {
super("oneOf", Boolean.FALSE);
@ -246,7 +246,7 @@ public class Quadrilateral extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Quadrilateral.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Shape.java
View File

@ -166,7 +166,7 @@ public class Shape extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Shape() {
super("oneOf", Boolean.FALSE);
@ -246,7 +246,7 @@ public class Shape extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Shape.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeOrNull.java
View File

@ -166,7 +166,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public ShapeOrNull() {
super("oneOf", Boolean.TRUE);
@ -246,7 +246,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return ShapeOrNull.schemas;
}

4
samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Triangle.java
View File

@ -187,7 +187,7 @@ public class Triangle extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Triangle() {
super("oneOf", Boolean.FALSE);
@ -275,7 +275,7 @@ public class Triangle extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Triangle.schemas;
}

10
samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -641,9 +641,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -669,9 +669,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
View File

@ -178,9 +178,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -197,7 +197,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -217,7 +217,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

10
samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -592,9 +592,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -620,9 +620,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

10
samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -717,9 +717,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -745,9 +745,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

10
samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -717,9 +717,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -745,9 +745,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

10
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -815,9 +815,9 @@ public class ApiClient extends JavaTimeFormatter {
return formatDate((Date) param);
} else if (param instanceof OffsetDateTime) {
return formatOffsetDateTime((OffsetDateTime) param);
} else if (param instanceof Collection) {
} else if (param instanceof Collection<?>) {
StringBuilder b = new StringBuilder();
for(Object o : (Collection)param) {
for(Object o : (Collection<?>)param) {
if(b.length() > 0) {
b.append(',');
}
@ -843,9 +843,9 @@ public class ApiClient extends JavaTimeFormatter {
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
Collection valueCollection;
if (value instanceof Collection) {
valueCollection = (Collection) value;
Collection<?> valueCollection;
if (value instanceof Collection<?>) {
valueCollection = (Collection<?>) value;
} else {
params.add(new Pair(name, parameterToString(value)));
return params;

8
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
View File

@ -179,9 +179,9 @@ public class JSON implements ContextResolver<ObjectMapper> {
visitedClasses.add(modelClass);
// Traverse the oneOf/anyOf composed schemas.
Map<String, GenericType> descendants = modelDescendants.get(modelClass);
Map<String, GenericType<?>> descendants = modelDescendants.get(modelClass);
if (descendants != null) {
for (GenericType childType : descendants.values()) {
for (GenericType<?> childType : descendants.values()) {
if (isInstanceOf(childType.getRawType(), inst, visitedClasses)) {
return true;
}
@ -198,7 +198,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
/**
* A map of oneOf/anyOf descendants for each model class.
*/
private static Map<Class<?>, Map<String, GenericType>> modelDescendants = new HashMap<>();
private static Map<Class<?>, Map<String, GenericType<?>>> modelDescendants = new HashMap<>();
/**
* Register a model class discriminator.
@ -218,7 +218,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
* @param modelClass the model class
* @param descendants a map of oneOf/anyOf descendants.
*/
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType> descendants) {
public static void registerDescendants(Class<?> modelClass, Map<String, GenericType<?>> descendants) {
modelDescendants.put(modelClass, descendants);
}

2
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractOpenApiSchema {
*
* @return an instance of the actual schema/object
*/
public abstract Map<String, GenericType> getSchemas();
public abstract Map<String, GenericType<?>> getSchemas();
/**
* Get the actual instance

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
View File

@ -142,7 +142,7 @@ public class Fruit extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Fruit() {
super("oneOf", Boolean.FALSE);
@ -167,7 +167,7 @@ public class Fruit extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Fruit.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
View File

@ -142,7 +142,7 @@ public class FruitReq extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public FruitReq() {
super("oneOf", Boolean.TRUE);
@ -167,7 +167,7 @@ public class FruitReq extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return FruitReq.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
View File

@ -122,7 +122,7 @@ public class GmFruit extends AbstractOpenApiSchema {
}
// store a list of schema names defined in anyOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public GmFruit() {
super("anyOf", Boolean.FALSE);
@ -147,7 +147,7 @@ public class GmFruit extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return GmFruit.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
View File

@ -185,7 +185,7 @@ public class Mammal extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Mammal() {
super("oneOf", Boolean.FALSE);
@ -273,7 +273,7 @@ public class Mammal extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Mammal.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MammalAnyof.java
View File

@ -150,7 +150,7 @@ public class MammalAnyof extends AbstractOpenApiSchema {
}
// store a list of schema names defined in anyOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public MammalAnyof() {
super("anyOf", Boolean.FALSE);
@ -238,7 +238,7 @@ public class MammalAnyof extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return MammalAnyof.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
View File

@ -164,7 +164,7 @@ public class NullableShape extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public NullableShape() {
super("oneOf", Boolean.TRUE);
@ -244,7 +244,7 @@ public class NullableShape extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return NullableShape.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
View File

@ -164,7 +164,7 @@ public class Pig extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Pig() {
super("oneOf", Boolean.FALSE);
@ -244,7 +244,7 @@ public class Pig extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Pig.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
View File

@ -164,7 +164,7 @@ public class Quadrilateral extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Quadrilateral() {
super("oneOf", Boolean.FALSE);
@ -244,7 +244,7 @@ public class Quadrilateral extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Quadrilateral.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
View File

@ -164,7 +164,7 @@ public class Shape extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Shape() {
super("oneOf", Boolean.FALSE);
@ -244,7 +244,7 @@ public class Shape extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Shape.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
View File

@ -164,7 +164,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public ShapeOrNull() {
super("oneOf", Boolean.TRUE);
@ -244,7 +244,7 @@ public class ShapeOrNull extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return ShapeOrNull.schemas;
}

4
samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
View File

@ -185,7 +185,7 @@ public class Triangle extends AbstractOpenApiSchema {
}
// store a list of schema names defined in oneOf
public static final Map<String, GenericType> schemas = new HashMap<>();
public static final Map<String, GenericType<?>> schemas = new HashMap<>();
public Triangle() {
super("oneOf", Boolean.FALSE);
@ -273,7 +273,7 @@ public class Triangle extends AbstractOpenApiSchema {
}
@Override
public Map<String, GenericType> getSchemas() {
public Map<String, GenericType<?>> getSchemas() {
return Triangle.schemas;
}