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

Commit 0929f15

Browse files
committed
Adds singletons to refed (extended) classes
1 parent 78143db commit 0929f15

40 files changed

Lines changed: 685 additions & 175 deletions

File tree

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

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -244,93 +244,6 @@ src/main/java/org/openapijsonschematools/client/schemas/validation/TypeValidator
244244
src/main/java/org/openapijsonschematools/client/schemas/validation/UniqueItemsValidator.java
245245
src/main/java/org/openapijsonschematools/client/schemas/validation/UnsetAnyTypeJsonSchema.java
246246
src/main/java/org/openapijsonschematools/client/schemas/validation/ValidationMetadata.java
247-
src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAllowsASchemaWhichShouldValidateTest.java
248-
src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesAreAllowedByDefaultTest.java
249-
src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesCanExistByItselfTest.java
250-
src/test/java/org/openapijsonschematools/client/components/schemas/AdditionalpropertiesShouldNotLookInApplicatorsTest.java
251-
src/test/java/org/openapijsonschematools/client/components/schemas/AllofCombinedWithAnyofOneofTest.java
252-
src/test/java/org/openapijsonschematools/client/components/schemas/AllofSimpleTypesTest.java
253-
src/test/java/org/openapijsonschematools/client/components/schemas/AllofTest.java
254-
src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithBaseSchemaTest.java
255-
src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithOneEmptySchemaTest.java
256-
src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheFirstEmptySchemaTest.java
257-
src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTheLastEmptySchemaTest.java
258-
src/test/java/org/openapijsonschematools/client/components/schemas/AllofWithTwoEmptySchemasTest.java
259-
src/test/java/org/openapijsonschematools/client/components/schemas/AnyofComplexTypesTest.java
260-
src/test/java/org/openapijsonschematools/client/components/schemas/AnyofTest.java
261-
src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithBaseSchemaTest.java
262-
src/test/java/org/openapijsonschematools/client/components/schemas/AnyofWithOneEmptySchemaTest.java
263-
src/test/java/org/openapijsonschematools/client/components/schemas/ArrayTypeMatchesArraysTest.java
264-
src/test/java/org/openapijsonschematools/client/components/schemas/BooleanTypeMatchesBooleansTest.java
265-
src/test/java/org/openapijsonschematools/client/components/schemas/ByIntTest.java
266-
src/test/java/org/openapijsonschematools/client/components/schemas/ByNumberTest.java
267-
src/test/java/org/openapijsonschematools/client/components/schemas/BySmallNumberTest.java
268-
src/test/java/org/openapijsonschematools/client/components/schemas/DateTimeFormatTest.java
269-
src/test/java/org/openapijsonschematools/client/components/schemas/EmailFormatTest.java
270-
src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith0DoesNotMatchFalseTest.java
271-
src/test/java/org/openapijsonschematools/client/components/schemas/EnumWith1DoesNotMatchTrueTest.java
272-
src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithEscapedCharactersTest.java
273-
src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithFalseDoesNotMatch0Test.java
274-
src/test/java/org/openapijsonschematools/client/components/schemas/EnumWithTrueDoesNotMatch1Test.java
275-
src/test/java/org/openapijsonschematools/client/components/schemas/EnumsInPropertiesTest.java
276-
src/test/java/org/openapijsonschematools/client/components/schemas/ForbiddenPropertyTest.java
277-
src/test/java/org/openapijsonschematools/client/components/schemas/HostnameFormatTest.java
278-
src/test/java/org/openapijsonschematools/client/components/schemas/IntegerTypeMatchesIntegersTest.java
279-
src/test/java/org/openapijsonschematools/client/components/schemas/InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfTest.java
280-
src/test/java/org/openapijsonschematools/client/components/schemas/InvalidStringValueForDefaultTest.java
281-
src/test/java/org/openapijsonschematools/client/components/schemas/Ipv4FormatTest.java
282-
src/test/java/org/openapijsonschematools/client/components/schemas/Ipv6FormatTest.java
283-
src/test/java/org/openapijsonschematools/client/components/schemas/JsonPointerFormatTest.java
284-
src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationTest.java
285-
src/test/java/org/openapijsonschematools/client/components/schemas/MaximumValidationWithUnsignedIntegerTest.java
286-
src/test/java/org/openapijsonschematools/client/components/schemas/MaxitemsValidationTest.java
287-
src/test/java/org/openapijsonschematools/client/components/schemas/MaxlengthValidationTest.java
288-
src/test/java/org/openapijsonschematools/client/components/schemas/Maxproperties0MeansTheObjectIsEmptyTest.java
289-
src/test/java/org/openapijsonschematools/client/components/schemas/MaxpropertiesValidationTest.java
290-
src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationTest.java
291-
src/test/java/org/openapijsonschematools/client/components/schemas/MinimumValidationWithSignedIntegerTest.java
292-
src/test/java/org/openapijsonschematools/client/components/schemas/MinitemsValidationTest.java
293-
src/test/java/org/openapijsonschematools/client/components/schemas/MinlengthValidationTest.java
294-
src/test/java/org/openapijsonschematools/client/components/schemas/MinpropertiesValidationTest.java
295-
src/test/java/org/openapijsonschematools/client/components/schemas/NestedAllofToCheckValidationSemanticsTest.java
296-
src/test/java/org/openapijsonschematools/client/components/schemas/NestedAnyofToCheckValidationSemanticsTest.java
297-
src/test/java/org/openapijsonschematools/client/components/schemas/NestedItemsTest.java
298-
src/test/java/org/openapijsonschematools/client/components/schemas/NestedOneofToCheckValidationSemanticsTest.java
299-
src/test/java/org/openapijsonschematools/client/components/schemas/NotMoreComplexSchemaTest.java
300-
src/test/java/org/openapijsonschematools/client/components/schemas/NotTest.java
301-
src/test/java/org/openapijsonschematools/client/components/schemas/NulCharactersInStringsTest.java
302-
src/test/java/org/openapijsonschematools/client/components/schemas/NullTypeMatchesOnlyTheNullObjectTest.java
303-
src/test/java/org/openapijsonschematools/client/components/schemas/NumberTypeMatchesNumbersTest.java
304-
src/test/java/org/openapijsonschematools/client/components/schemas/ObjectPropertiesValidationTest.java
305-
src/test/java/org/openapijsonschematools/client/components/schemas/ObjectTypeMatchesObjectsTest.java
306-
src/test/java/org/openapijsonschematools/client/components/schemas/OneofComplexTypesTest.java
307-
src/test/java/org/openapijsonschematools/client/components/schemas/OneofTest.java
308-
src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithBaseSchemaTest.java
309-
src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithEmptySchemaTest.java
310-
src/test/java/org/openapijsonschematools/client/components/schemas/OneofWithRequiredTest.java
311-
src/test/java/org/openapijsonschematools/client/components/schemas/PatternIsNotAnchoredTest.java
312-
src/test/java/org/openapijsonschematools/client/components/schemas/PatternValidationTest.java
313-
src/test/java/org/openapijsonschematools/client/components/schemas/PropertiesWithEscapedCharactersTest.java
314-
src/test/java/org/openapijsonschematools/client/components/schemas/PropertyNamedRefThatIsNotAReferenceTest.java
315-
src/test/java/org/openapijsonschematools/client/components/schemas/RefInAdditionalpropertiesTest.java
316-
src/test/java/org/openapijsonschematools/client/components/schemas/RefInAllofTest.java
317-
src/test/java/org/openapijsonschematools/client/components/schemas/RefInAnyofTest.java
318-
src/test/java/org/openapijsonschematools/client/components/schemas/RefInItemsTest.java
319-
src/test/java/org/openapijsonschematools/client/components/schemas/RefInNotTest.java
320-
src/test/java/org/openapijsonschematools/client/components/schemas/RefInOneofTest.java
321-
src/test/java/org/openapijsonschematools/client/components/schemas/RefInPropertyTest.java
322-
src/test/java/org/openapijsonschematools/client/components/schemas/RequiredDefaultValidationTest.java
323-
src/test/java/org/openapijsonschematools/client/components/schemas/RequiredValidationTest.java
324-
src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEmptyArrayTest.java
325-
src/test/java/org/openapijsonschematools/client/components/schemas/RequiredWithEscapedCharactersTest.java
326-
src/test/java/org/openapijsonschematools/client/components/schemas/SimpleEnumValidationTest.java
327-
src/test/java/org/openapijsonschematools/client/components/schemas/StringTypeMatchesStringsTest.java
328-
src/test/java/org/openapijsonschematools/client/components/schemas/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingTest.java
329-
src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsFalseValidationTest.java
330-
src/test/java/org/openapijsonschematools/client/components/schemas/UniqueitemsValidationTest.java
331-
src/test/java/org/openapijsonschematools/client/components/schemas/UriFormatTest.java
332-
src/test/java/org/openapijsonschematools/client/components/schemas/UriReferenceFormatTest.java
333-
src/test/java/org/openapijsonschematools/client/components/schemas/UriTemplateFormatTest.java
334247
src/test/java/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlagsTest.java
335248
src/test/java/org/openapijsonschematools/client/schemas/AnyTypeSchemaTest.java
336249
src/test/java/org/openapijsonschematools/client/schemas/ArrayTypeSchemaTest.java

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,37 @@ public class AdditionalpropertiesAllowsASchemaWhichShouldValidate {
2929
// nest classes so all schemas and input/output classes can be public
3030

3131

32-
public static class AdditionalProperties extends BooleanJsonSchema {}
32+
public static class AdditionalProperties extends BooleanJsonSchema {
33+
private static @Nullable AdditionalProperties instance = null;
34+
public static AdditionalProperties getInstance() {
35+
if (instance == null) {
36+
instance = new AdditionalProperties();
37+
}
38+
return instance;
39+
}
40+
}
3341

3442

35-
public static class Foo extends AnyTypeJsonSchema {}
43+
public static class Foo extends AnyTypeJsonSchema {
44+
private static @Nullable Foo instance = null;
45+
public static Foo getInstance() {
46+
if (instance == null) {
47+
instance = new Foo();
48+
}
49+
return instance;
50+
}
51+
}
3652

3753

38-
public static class Bar extends AnyTypeJsonSchema {}
54+
public static class Bar extends AnyTypeJsonSchema {
55+
private static @Nullable Bar instance = null;
56+
public static Bar getInstance() {
57+
if (instance == null) {
58+
instance = new Bar();
59+
}
60+
return instance;
61+
}
62+
}
3963

4064

4165
public static class AdditionalpropertiesAllowsASchemaWhichShouldValidateMap extends FrozenMap<@Nullable Object> {

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,26 @@ public class AdditionalpropertiesAreAllowedByDefault {
3737
// nest classes so all schemas and input/output classes can be public
3838

3939

40-
public static class Foo extends AnyTypeJsonSchema {}
40+
public static class Foo extends AnyTypeJsonSchema {
41+
private static @Nullable Foo instance = null;
42+
public static Foo getInstance() {
43+
if (instance == null) {
44+
instance = new Foo();
45+
}
46+
return instance;
47+
}
48+
}
4149

4250

43-
public static class Bar extends AnyTypeJsonSchema {}
51+
public static class Bar extends AnyTypeJsonSchema {
52+
private static @Nullable Bar instance = null;
53+
public static Bar getInstance() {
54+
if (instance == null) {
55+
instance = new Bar();
56+
}
57+
return instance;
58+
}
59+
}
4460

4561

4662
public static class AdditionalpropertiesAreAllowedByDefaultMap extends FrozenMap<@Nullable Object> {

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,15 @@ public class AdditionalpropertiesCanExistByItself {
2727
// nest classes so all schemas and input/output classes can be public
2828

2929

30-
public static class AdditionalProperties extends BooleanJsonSchema {}
30+
public static class AdditionalProperties extends BooleanJsonSchema {
31+
private static @Nullable AdditionalProperties instance = null;
32+
public static AdditionalProperties getInstance() {
33+
if (instance == null) {
34+
instance = new AdditionalProperties();
35+
}
36+
return instance;
37+
}
38+
}
3139

3240

3341
public static class AdditionalpropertiesCanExistByItselfMap extends FrozenMap<Boolean> {

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,26 @@ public class AdditionalpropertiesShouldNotLookInApplicators {
3838
// nest classes so all schemas and input/output classes can be public
3939

4040

41-
public static class AdditionalProperties extends BooleanJsonSchema {}
41+
public static class AdditionalProperties extends BooleanJsonSchema {
42+
private static @Nullable AdditionalProperties instance = null;
43+
public static AdditionalProperties getInstance() {
44+
if (instance == null) {
45+
instance = new AdditionalProperties();
46+
}
47+
return instance;
48+
}
49+
}
4250

4351

44-
public static class Foo extends AnyTypeJsonSchema {}
52+
public static class Foo extends AnyTypeJsonSchema {
53+
private static @Nullable Foo instance = null;
54+
public static Foo getInstance() {
55+
if (instance == null) {
56+
instance = new Foo();
57+
}
58+
return instance;
59+
}
60+
}
4561

4662

4763
public static class Schema0Map extends FrozenMap<@Nullable Object> {

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ public class Allof {
3838
// nest classes so all schemas and input/output classes can be public
3939

4040

41-
public static class Bar extends IntJsonSchema {}
41+
public static class Bar extends IntJsonSchema {
42+
private static @Nullable Bar instance = null;
43+
public static Bar getInstance() {
44+
if (instance == null) {
45+
instance = new Bar();
46+
}
47+
return instance;
48+
}
49+
}
4250

4351

4452
public static class Schema0Map extends FrozenMap<@Nullable Object> {
@@ -265,7 +273,15 @@ public Schema0Map validate(Map<String, ? extends @Nullable Object> arg, SchemaCo
265273
}
266274
}
267275

268-
public static class Foo extends StringJsonSchema {}
276+
public static class Foo extends StringJsonSchema {
277+
private static @Nullable Foo instance = null;
278+
public static Foo getInstance() {
279+
if (instance == null) {
280+
instance = new Foo();
281+
}
282+
return instance;
283+
}
284+
}
269285

270286

271287
public static class Schema1Map extends FrozenMap<@Nullable Object> {

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

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@ public class AllofWithBaseSchema {
3939
// nest classes so all schemas and input/output classes can be public
4040

4141

42-
public static class Foo extends StringJsonSchema {}
42+
public static class Foo extends StringJsonSchema {
43+
private static @Nullable Foo instance = null;
44+
public static Foo getInstance() {
45+
if (instance == null) {
46+
instance = new Foo();
47+
}
48+
return instance;
49+
}
50+
}
4351

4452

4553
public static class Schema0Map extends FrozenMap<@Nullable Object> {
@@ -266,7 +274,15 @@ public Schema0Map validate(Map<String, ? extends @Nullable Object> arg, SchemaCo
266274
}
267275
}
268276

269-
public static class Baz extends NullJsonSchema {}
277+
public static class Baz extends NullJsonSchema {
278+
private static @Nullable Baz instance = null;
279+
public static Baz getInstance() {
280+
if (instance == null) {
281+
instance = new Baz();
282+
}
283+
return instance;
284+
}
285+
}
270286

271287

272288
public static class Schema1Map extends FrozenMap<@Nullable Object> {
@@ -493,7 +509,15 @@ public Schema1Map validate(Map<String, ? extends @Nullable Object> arg, SchemaCo
493509
}
494510
}
495511

496-
public static class Bar extends IntJsonSchema {}
512+
public static class Bar extends IntJsonSchema {
513+
private static @Nullable Bar instance = null;
514+
public static Bar getInstance() {
515+
if (instance == null) {
516+
instance = new Bar();
517+
}
518+
return instance;
519+
}
520+
}
497521

498522

499523
public static class AllofWithBaseSchemaMap extends FrozenMap<@Nullable Object> {

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,15 @@ public class AllofWithOneEmptySchema {
3636
// nest classes so all schemas and input/output classes can be public
3737

3838

39-
public static class Schema0 extends AnyTypeJsonSchema {}
39+
public static class Schema0 extends AnyTypeJsonSchema {
40+
private static @Nullable Schema0 instance = null;
41+
public static Schema0 getInstance() {
42+
if (instance == null) {
43+
instance = new Schema0();
44+
}
45+
return instance;
46+
}
47+
}
4048

4149

4250
public static class AllofWithOneEmptySchema1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,26 @@ public class AllofWithTheFirstEmptySchema {
3737
// nest classes so all schemas and input/output classes can be public
3838

3939

40-
public static class Schema0 extends AnyTypeJsonSchema {}
40+
public static class Schema0 extends AnyTypeJsonSchema {
41+
private static @Nullable Schema0 instance = null;
42+
public static Schema0 getInstance() {
43+
if (instance == null) {
44+
instance = new Schema0();
45+
}
46+
return instance;
47+
}
48+
}
4149

4250

43-
public static class Schema1 extends NumberJsonSchema {}
51+
public static class Schema1 extends NumberJsonSchema {
52+
private static @Nullable Schema1 instance = null;
53+
public static Schema1 getInstance() {
54+
if (instance == null) {
55+
instance = new Schema1();
56+
}
57+
return instance;
58+
}
59+
}
4460

4561

4662
public static class AllofWithTheFirstEmptySchema1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,26 @@ public class AllofWithTheLastEmptySchema {
3737
// nest classes so all schemas and input/output classes can be public
3838

3939

40-
public static class Schema0 extends NumberJsonSchema {}
40+
public static class Schema0 extends NumberJsonSchema {
41+
private static @Nullable Schema0 instance = null;
42+
public static Schema0 getInstance() {
43+
if (instance == null) {
44+
instance = new Schema0();
45+
}
46+
return instance;
47+
}
48+
}
4149

4250

43-
public static class Schema1 extends AnyTypeJsonSchema {}
51+
public static class Schema1 extends AnyTypeJsonSchema {
52+
private static @Nullable Schema1 instance = null;
53+
public static Schema1 getInstance() {
54+
if (instance == null) {
55+
instance = new Schema1();
56+
}
57+
return instance;
58+
}
59+
}
4460

4561

4662
public static class AllofWithTheLastEmptySchema1 extends JsonSchema implements NullSchemaValidator, BooleanSchemaValidator, NumberSchemaValidator, StringSchemaValidator, ListSchemaValidator<FrozenList<@Nullable Object>>, MapSchemaValidator<FrozenMap<@Nullable Object>> {

0 commit comments

Comments
 (0)