Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1c9ae09
Adds array item type in output class
spacether Nov 22, 2023
28a406b
Adds array output type for frozenlist
spacether Nov 22, 2023
a075885
Simplifies songle types for array and map
spacether Nov 22, 2023
85cdeb1
Adds list inner type to array output constructor
spacether Nov 22, 2023
626299f
Adds forceNull parameter into list item typing
spacether Nov 22, 2023
e866ca8
Uses primitive types in JsonSchema classes when possible
spacether Nov 22, 2023
e615c88
Fixes java tests
spacether Nov 22, 2023
e89acfd
Updates generated schema validate methods to use primitives
spacether Nov 22, 2023
7958f6e
Fixes list of any type type
spacether Nov 22, 2023
2d8c2d0
Fixes array types when there are 2 or more types in items
spacether Nov 22, 2023
d036ddc
Fixes array type
spacether Nov 22, 2023
32024f0
Adds list type to getListOutputInstance
spacether Nov 22, 2023
975b76c
Adds missing FrozenMap and FrozenList imports
spacether Nov 22, 2023
9b799b9
Simplifies output templates
spacether Nov 22, 2023
57457ee
Adds input type templates
spacether Nov 22, 2023
1e0eee8
Adds array list validate input type
spacether Nov 22, 2023
721734e
Adds array output type of method
spacether Nov 22, 2023
1dfdad7
Uses catch all map input type
spacether Nov 23, 2023
3e54369
Adds array input type
spacether Nov 23, 2023
ce1d15a
Uses input array type in output array class and schema validate
spacether Nov 23, 2023
990395e
Removes array input type
spacether Nov 23, 2023
c69ba85
Fixes array out of input type
spacether Nov 23, 2023
cceb28d
Fixes array schema validate input
spacether Nov 23, 2023
34f9a17
Removes unused template
spacether Nov 23, 2023
8370847
Fixes nullable array input type
spacether Nov 23, 2023
aca5ba4
Removes arraylist import
spacether Nov 23, 2023
9b13acc
Fixes input map types
spacether Nov 23, 2023
9945322
Fixes missing tring input in map type
spacether Nov 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,32 @@ public class Schema {
// nest classes so all schemas and input/output classes can be public


public static class SchemaList extends FrozenList<Object> {
SchemaList(FrozenList<Object> m) {
public static class SchemaList extends FrozenList<User.UserMap> {

SchemaList(FrozenList<User.UserMap> m) {

super(m);
}
}
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {


return Schema1.validate(arg, configuration);
}
}


public class Schema1 extends JsonSchema {
public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
new KeywordEntry("type", new TypeValidator(Set.of(FrozenList.class))),
new KeywordEntry("items", new ItemsValidator(User.User1.class))
));
protected static SchemaList getListOutputInstance(FrozenList<Object> arg) {
protected static SchemaList getListOutputInstance(FrozenList<User.UserMap> arg) {

return new SchemaList(arg);
}
public static SchemaList validate(List<Object> arg, SchemaConfiguration configuration) {
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {


return JsonSchema.validate(Schema1.class, arg, configuration);
}
}}
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,32 @@ public class Schema {
// nest classes so all schemas and input/output classes can be public


public static class SchemaList extends FrozenList<Object> {
SchemaList(FrozenList<Object> m) {
public static class SchemaList extends FrozenList<Pet.PetMap> {

SchemaList(FrozenList<Pet.PetMap> m) {

super(m);
}
}
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {


return Schema1.validate(arg, configuration);
}
}


public class Schema1 extends JsonSchema {
public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
new KeywordEntry("type", new TypeValidator(Set.of(FrozenList.class))),
new KeywordEntry("items", new ItemsValidator(RefPet.RefPet1.class))
));
protected static SchemaList getListOutputInstance(FrozenList<Object> arg) {
protected static SchemaList getListOutputInstance(FrozenList<Pet.PetMap> arg) {

return new SchemaList(arg);
}
public static SchemaList validate(List<Object> arg, SchemaConfiguration configuration) {
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {


return JsonSchema.validate(Schema1.class, arg, configuration);
}
}}
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,32 @@ public class Schema {
// nest classes so all schemas and input/output classes can be public


public static class SchemaList extends FrozenList<Object> {
SchemaList(FrozenList<Object> m) {
public static class SchemaList extends FrozenList<Pet.PetMap> {

SchemaList(FrozenList<Pet.PetMap> m) {

super(m);
}
}
public static SchemaList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {


return Schema1.validate(arg, configuration);
}
}


public class Schema1 extends JsonSchema {
public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
new KeywordEntry("type", new TypeValidator(Set.of(FrozenList.class))),
new KeywordEntry("items", new ItemsValidator(Pet.Pet1.class))
));
protected static SchemaList getListOutputInstance(FrozenList<Object> arg) {
protected static SchemaList getListOutputInstance(FrozenList<Pet.PetMap> arg) {

return new SchemaList(arg);
}
public static SchemaList validate(List<Object> arg, SchemaConfiguration configuration) {
public static SchemaList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {


return JsonSchema.validate(Schema1.class, arg, configuration);
}
}}
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@ public static Void validate(Void arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
}

public static Boolean validate(Boolean arg, SchemaConfiguration configuration) {
public static boolean validate(boolean arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
}

public static Integer validate(Integer arg, SchemaConfiguration configuration) {
public static int validate(int arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
}

public static Long validate(Long arg, SchemaConfiguration configuration) {
public static long validate(long arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
}

public static Float validate(Float arg, SchemaConfiguration configuration) {
public static float validate(float arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
}

public static Double validate(Double arg, SchemaConfiguration configuration) {
public static double validate(double arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties1.class, arg, configuration);
}

Expand Down Expand Up @@ -124,23 +124,23 @@ public static Void validate(Void arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
}

public static Boolean validate(Boolean arg, SchemaConfiguration configuration) {
public static boolean validate(boolean arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
}

public static Integer validate(Integer arg, SchemaConfiguration configuration) {
public static int validate(int arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
}

public static Long validate(Long arg, SchemaConfiguration configuration) {
public static long validate(long arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
}

public static Float validate(Float arg, SchemaConfiguration configuration) {
public static float validate(float arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
}

public static Double validate(Double arg, SchemaConfiguration configuration) {
public static double validate(double arg, SchemaConfiguration configuration) {
return JsonSchema.validate(AdditionalProperties2.class, arg, configuration);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,30 @@ public class AdditionalPropertiesWithArrayOfEnums {
// nest classes so all schemas and input/output classes can be public


public static class AdditionalPropertiesList extends FrozenList<Object> {
AdditionalPropertiesList(FrozenList<Object> m) {
public static class AdditionalPropertiesList extends FrozenList<String> {

AdditionalPropertiesList(FrozenList<String> m) {

super(m);
}
}
public static AdditionalPropertiesList of(List<String> arg, SchemaConfiguration configuration) {

return AdditionalProperties.validate(arg, configuration);
}
}


public class AdditionalProperties extends JsonSchema {
public static final LinkedHashMap<String, KeywordValidator> keywordToValidator = new LinkedHashMap<>(Map.ofEntries(
new KeywordEntry("type", new TypeValidator(Set.of(FrozenList.class))),
new KeywordEntry("items", new ItemsValidator(EnumClass.EnumClass1.class))
));
protected static AdditionalPropertiesList getListOutputInstance(FrozenList<Object> arg) {
protected static AdditionalPropertiesList getListOutputInstance(FrozenList<String> arg) {

return new AdditionalPropertiesList(arg);
}
public static AdditionalPropertiesList validate(List<Object> arg, SchemaConfiguration configuration) {
public static AdditionalPropertiesList validate(List<String> arg, SchemaConfiguration configuration) {

return JsonSchema.validate(AdditionalProperties.class, arg, configuration);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,19 @@ public class AnimalFarm {
// nest classes so all schemas and input/output classes can be public


public static class AnimalFarmList extends FrozenList<Object> {
AnimalFarmList(FrozenList<Object> m) {
public static class AnimalFarmList extends FrozenList<Animal.AnimalMap> {

AnimalFarmList(FrozenList<Animal.AnimalMap> m) {

super(m);
}
}
public static AnimalFarmList of(List<Map<String, Object>> arg, SchemaConfiguration configuration) {


return AnimalFarm1.validate(arg, configuration);
}
}


public class AnimalFarm1 extends JsonSchema {
/*
Expand All @@ -32,10 +40,13 @@ public class AnimalFarm1 extends JsonSchema {
new KeywordEntry("type", new TypeValidator(Set.of(FrozenList.class))),
new KeywordEntry("items", new ItemsValidator(Animal.Animal1.class))
));
protected static AnimalFarmList getListOutputInstance(FrozenList<Object> arg) {
protected static AnimalFarmList getListOutputInstance(FrozenList<Animal.AnimalMap> arg) {

return new AnimalFarmList(arg);
}
public static AnimalFarmList validate(List<Object> arg, SchemaConfiguration configuration) {
public static AnimalFarmList validate(List<Map<String, Object>> arg, SchemaConfiguration configuration) {


return JsonSchema.validate(AnimalFarm1.class, arg, configuration);
}
}}
Loading