Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Java, reduces unused imports #292

Merged
merged 19 commits into from
Nov 19, 2023
Merged

Java, reduces unused imports #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1353d9d
Removes imports when schema is a ref to a component schema
spacether Nov 18, 2023
337648e
Removes unneeded boolean and null schema imports
spacether Nov 18, 2023
db02d6d
Improves imports for IntJsonSchema
spacether Nov 18, 2023
438d77c
Eliminates unneeded number schema imports
spacether Nov 18, 2023
52b7be1
Removes unneeded string schema imports
spacether Nov 18, 2023
e3e1bb1
Fixes date and datetime imports
spacether Nov 18, 2023
04e8f96
Fixes string detection
spacether Nov 18, 2023
a1d5503
Removes unneeded map imports
spacether Nov 18, 2023
39e4810
Removes unneeded list schema imports
spacether Nov 18, 2023
be51d9c
Fixes imports for AnyType and NotAnyType
spacether Nov 18, 2023
145405a
Improves close brace, adds missing number var equals class case
spacether Nov 18, 2023
955b028
Fixes required indentation
spacether Nov 18, 2023
0d15286
Adds anytype detection
spacether Nov 18, 2023
d067a4e
Adjusts anytype and map imports more
spacether Nov 18, 2023
e11918d
Set and LinkedHashSet import improvement
spacether Nov 18, 2023
be0f902
Tweak string imports more
spacether Nov 19, 2023
c920a94
Removes schema shared imports template
spacether Nov 19, 2023
c633f92
Adds missing string import for binary schema
spacether Nov 19, 2023
9d28e20
Generator docs regenerated
spacether Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions docs/generators/java.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|AdditionalProperties|✗|OAS2,OAS3
|AllOf|✗|OAS2,OAS3
|AnyOf|✗|OAS3
|AllOf|✓|OAS2,OAS3
|AnyOf|✓|OAS3
|Const|✗|OAS3
|Contains|✗|OAS3
|Default|✗|OAS2,OAS3
Expand All @@ -347,9 +347,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|MinProperties|✓|OAS2,OAS3
|Minimum|✓|OAS2,OAS3
|MultipleOf|✓|OAS2,OAS3
|Not|✗|OAS3
|Not|✓|OAS3
|Nullable|✗|OAS3
|OneOf|✗|OAS3
|OneOf|✓|OAS3
|Pattern|✓|OAS2,OAS3
|PatternProperties|✗|OAS3
|PrefixItems|✗|OAS3
Expand Down
33 changes: 1 addition & 32 deletions .../int32jsoncontenttypeheader/content/applicationjson/Int32JsonContentTypeHeaderSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,9 @@
package org.openapijsonschematools.components.headers.int32jsoncontenttypeheader.content.applicationjson;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.BooleanJsonSchema;
import org.openapijsonschematools.schemas.DateJsonSchema;
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
import org.openapijsonschematools.schemas.DecimalJsonSchema;
import org.openapijsonschematools.schemas.DoubleJsonSchema;
import org.openapijsonschematools.schemas.FloatJsonSchema;
import org.openapijsonschematools.schemas.FrozenList;
import org.openapijsonschematools.schemas.FrozenMap;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.Int64JsonSchema;
import org.openapijsonschematools.schemas.IntJsonSchema;
import org.openapijsonschematools.schemas.JsonSchema;
import org.openapijsonschematools.schemas.ListJsonSchema;
import org.openapijsonschematools.schemas.MapJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NullJsonSchema;
import org.openapijsonschematools.schemas.NumberJsonSchema;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.UuidJsonSchema;

import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

public class Int32JsonContentTypeHeaderSchema {
// nest classes so all schemas and input/output classes can be public


public class Int32JsonContentTypeHeaderSchema1 extends Int32JsonSchema {
}
public class Int32JsonContentTypeHeaderSchema1 extends Int32JsonSchema {}
}
41 changes: 2 additions & 39 deletions ...n/java/org/openapijsonschematools/components/headers/numberheader/NumberHeaderSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,9 @@
package org.openapijsonschematools.components.headers.numberheader;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.BooleanJsonSchema;
import org.openapijsonschematools.schemas.DateJsonSchema;
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
import org.openapijsonschematools.schemas.DecimalJsonSchema;
import org.openapijsonschematools.schemas.DoubleJsonSchema;
import org.openapijsonschematools.schemas.FloatJsonSchema;
import org.openapijsonschematools.schemas.FrozenList;
import org.openapijsonschematools.schemas.FrozenMap;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.Int64JsonSchema;
import org.openapijsonschematools.schemas.IntJsonSchema;
import org.openapijsonschematools.schemas.JsonSchema;
import org.openapijsonschematools.schemas.ListJsonSchema;
import org.openapijsonschematools.schemas.MapJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NullJsonSchema;
import org.openapijsonschematools.schemas.NumberJsonSchema;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.UuidJsonSchema;

import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

public class NumberHeaderSchema {
// nest classes so all schemas and input/output classes can be public


public class NumberHeaderSchema1 implements JsonSchema {
static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
String.class
));
static final String format = "number";
public static String validate(String arg, SchemaConfiguration configuration) {
return JsonSchema.validate(NumberHeaderSchema1.class, arg, configuration);
}
}}
public class NumberHeaderSchema1 extends DecimalJsonSchema {}
}
33 changes: 1 addition & 32 deletions .../headers/refcontentschemaheader/content/applicationjson/RefContentSchemaHeaderSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,10 @@
package org.openapijsonschematools.components.headers.refcontentschemaheader.content.applicationjson;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.BooleanJsonSchema;
import org.openapijsonschematools.schemas.DateJsonSchema;
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
import org.openapijsonschematools.schemas.DecimalJsonSchema;
import org.openapijsonschematools.schemas.DoubleJsonSchema;
import org.openapijsonschematools.schemas.FloatJsonSchema;
import org.openapijsonschematools.schemas.FrozenList;
import org.openapijsonschematools.schemas.FrozenMap;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.Int64JsonSchema;
import org.openapijsonschematools.schemas.IntJsonSchema;
import org.openapijsonschematools.schemas.JsonSchema;
import org.openapijsonschematools.schemas.ListJsonSchema;
import org.openapijsonschematools.schemas.MapJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NullJsonSchema;
import org.openapijsonschematools.schemas.NumberJsonSchema;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.UuidJsonSchema;

import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.openapijsonschematools.components.schemas.StringWithValidation;

public class RefContentSchemaHeaderSchema extends StringWithValidation {
// $refed class


public class RefContentSchemaHeaderSchema1 extends StringWithValidation1 {
}
public class RefContentSchemaHeaderSchema1 extends StringWithValidation1 {}
}
33 changes: 1 addition & 32 deletions .../org/openapijsonschematools/components/headers/refschemaheader/RefSchemaHeaderSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,10 @@
package org.openapijsonschematools.components.headers.refschemaheader;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.BooleanJsonSchema;
import org.openapijsonschematools.schemas.DateJsonSchema;
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
import org.openapijsonschematools.schemas.DecimalJsonSchema;
import org.openapijsonschematools.schemas.DoubleJsonSchema;
import org.openapijsonschematools.schemas.FloatJsonSchema;
import org.openapijsonschematools.schemas.FrozenList;
import org.openapijsonschematools.schemas.FrozenMap;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.Int64JsonSchema;
import org.openapijsonschematools.schemas.IntJsonSchema;
import org.openapijsonschematools.schemas.JsonSchema;
import org.openapijsonschematools.schemas.ListJsonSchema;
import org.openapijsonschematools.schemas.MapJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NullJsonSchema;
import org.openapijsonschematools.schemas.NumberJsonSchema;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.UuidJsonSchema;

import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.openapijsonschematools.components.schemas.StringWithValidation;

public class RefSchemaHeaderSchema extends StringWithValidation {
// $refed class


public class RefSchemaHeaderSchema1 extends StringWithValidation1 {
}
public class RefSchemaHeaderSchema1 extends StringWithValidation1 {}
}
40 changes: 2 additions & 38 deletions ...n/java/org/openapijsonschematools/components/headers/stringheader/StringHeaderSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,9 @@
package org.openapijsonschematools.components.headers.stringheader;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.BooleanJsonSchema;
import org.openapijsonschematools.schemas.DateJsonSchema;
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
import org.openapijsonschematools.schemas.DecimalJsonSchema;
import org.openapijsonschematools.schemas.DoubleJsonSchema;
import org.openapijsonschematools.schemas.FloatJsonSchema;
import org.openapijsonschematools.schemas.FrozenList;
import org.openapijsonschematools.schemas.FrozenMap;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.Int64JsonSchema;
import org.openapijsonschematools.schemas.IntJsonSchema;
import org.openapijsonschematools.schemas.JsonSchema;
import org.openapijsonschematools.schemas.ListJsonSchema;
import org.openapijsonschematools.schemas.MapJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NullJsonSchema;
import org.openapijsonschematools.schemas.NumberJsonSchema;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.UuidJsonSchema;

import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

public class StringHeaderSchema {
// nest classes so all schemas and input/output classes can be public


public class StringHeaderSchema1 implements JsonSchema {
static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
String.class
));
public static String validate(String arg, SchemaConfiguration configuration) {
return JsonSchema.validate(StringHeaderSchema1.class, arg, configuration);
}
}}
public class StringHeaderSchema1 extends StringJsonSchema {}
}
33 changes: 1 addition & 32 deletions ...nts/parameters/componentrefschemastringwithvalidation/content/applicationjson/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,10 @@
package org.openapijsonschematools.components.parameters.componentrefschemastringwithvalidation.content.applicationjson;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.BooleanJsonSchema;
import org.openapijsonschematools.schemas.DateJsonSchema;
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
import org.openapijsonschematools.schemas.DecimalJsonSchema;
import org.openapijsonschematools.schemas.DoubleJsonSchema;
import org.openapijsonschematools.schemas.FloatJsonSchema;
import org.openapijsonschematools.schemas.FrozenList;
import org.openapijsonschematools.schemas.FrozenMap;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.Int64JsonSchema;
import org.openapijsonschematools.schemas.IntJsonSchema;
import org.openapijsonschematools.schemas.JsonSchema;
import org.openapijsonschematools.schemas.ListJsonSchema;
import org.openapijsonschematools.schemas.MapJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NullJsonSchema;
import org.openapijsonschematools.schemas.NumberJsonSchema;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.UuidJsonSchema;

import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.openapijsonschematools.components.schemas.StringWithValidation;

public class Schema extends StringWithValidation {
// $refed class


public class Schema1 extends StringWithValidation1 {
}
public class Schema1 extends StringWithValidation1 {}
}
40 changes: 2 additions & 38 deletions ...a/src/main/java/org/openapijsonschematools/components/parameters/pathusername/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,9 @@
package org.openapijsonschematools.components.parameters.pathusername;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.BooleanJsonSchema;
import org.openapijsonschematools.schemas.DateJsonSchema;
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
import org.openapijsonschematools.schemas.DecimalJsonSchema;
import org.openapijsonschematools.schemas.DoubleJsonSchema;
import org.openapijsonschematools.schemas.FloatJsonSchema;
import org.openapijsonschematools.schemas.FrozenList;
import org.openapijsonschematools.schemas.FrozenMap;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.Int64JsonSchema;
import org.openapijsonschematools.schemas.IntJsonSchema;
import org.openapijsonschematools.schemas.JsonSchema;
import org.openapijsonschematools.schemas.ListJsonSchema;
import org.openapijsonschematools.schemas.MapJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NullJsonSchema;
import org.openapijsonschematools.schemas.NumberJsonSchema;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.UuidJsonSchema;

import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

public class Schema {
// nest classes so all schemas and input/output classes can be public


public class Schema1 implements JsonSchema {
static final LinkedHashSet<Class<?>> type = new LinkedHashSet<>(Set.of(
String.class
));
public static String validate(String arg, SchemaConfiguration configuration) {
return JsonSchema.validate(Schema1.class, arg, configuration);
}
}}
public class Schema1 extends StringJsonSchema {}
}
33 changes: 1 addition & 32 deletions ...rg/openapijsonschematools/components/parameters/refschemastringwithvalidation/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,10 @@
package org.openapijsonschematools.components.parameters.refschemastringwithvalidation;
import org.openapijsonschematools.configurations.SchemaConfiguration;
import org.openapijsonschematools.schemas.AnyTypeJsonSchema;
import org.openapijsonschematools.schemas.BooleanJsonSchema;
import org.openapijsonschematools.schemas.DateJsonSchema;
import org.openapijsonschematools.schemas.DateTimeJsonSchema;
import org.openapijsonschematools.schemas.DecimalJsonSchema;
import org.openapijsonschematools.schemas.DoubleJsonSchema;
import org.openapijsonschematools.schemas.FloatJsonSchema;
import org.openapijsonschematools.schemas.FrozenList;
import org.openapijsonschematools.schemas.FrozenMap;
import org.openapijsonschematools.schemas.Int32JsonSchema;
import org.openapijsonschematools.schemas.Int64JsonSchema;
import org.openapijsonschematools.schemas.IntJsonSchema;
import org.openapijsonschematools.schemas.JsonSchema;
import org.openapijsonschematools.schemas.ListJsonSchema;
import org.openapijsonschematools.schemas.MapJsonSchema;
import org.openapijsonschematools.schemas.NotAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.NullJsonSchema;
import org.openapijsonschematools.schemas.NumberJsonSchema;
import org.openapijsonschematools.schemas.StringJsonSchema;
import org.openapijsonschematools.schemas.UnsetAnyTypeJsonSchema;
import org.openapijsonschematools.schemas.UuidJsonSchema;

import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.AbstractMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.openapijsonschematools.components.schemas.StringWithValidation;

public class Schema extends StringWithValidation {
// $refed class


public class Schema1 extends StringWithValidation1 {
}
public class Schema1 extends StringWithValidation1 {}
}
Loading