Skip to content

Commit

Permalink
[REQ][Java] Additional annotations with String params (OpenAPITools#7117
Browse files Browse the repository at this point in the history
)

* Additional annotations with String params

* Additional annotations with String params. Missed sample update

* Additional annotations with String params. Use Jackson annotations

* insert unescaped content

* fix imports

* fix imports
  • Loading branch information
borsch authored Aug 12, 2020
1 parent 9ba34b2 commit c9939a2
Show file tree
Hide file tree
Showing 62 changed files with 149 additions and 60 deletions.
1 change: 1 addition & 0 deletions bin/configs/spring-mvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ additionalProperties:
artifactId: spring-mvc-server
hideGenerationTimestamp: "true"
serverPort: "8002"
additionalModelTypeAnnotations: '@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name");@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")'
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{{#additionalModelTypeAnnotations}}{{.}}
{{#additionalModelTypeAnnotations}}{{{.}}}
{{/additionalModelTypeAnnotations}}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* AdditionalPropertiesAnyType
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
@JsonProperty("name")
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
/**
* AdditionalPropertiesArray
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class AdditionalPropertiesArray extends HashMap<String, List> {
@JsonProperty("name")
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* AdditionalPropertiesBoolean
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
@JsonProperty("name")
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
/**
* AdditionalPropertiesClass
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class AdditionalPropertiesClass {
@JsonProperty("map_string")
@Valid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* AdditionalPropertiesInteger
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
@JsonProperty("name")
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
/**
* AdditionalPropertiesNumber
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
@JsonProperty("name")
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* AdditionalPropertiesObject
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class AdditionalPropertiesObject extends HashMap<String, Map> {
@JsonProperty("name")
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* AdditionalPropertiesString
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class AdditionalPropertiesString extends HashMap<String, String> {
@JsonProperty("name")
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),
@JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
})
@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class Animal {
@JsonProperty("className")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
/**
* ArrayOfArrayOfNumberOnly
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class ArrayOfArrayOfNumberOnly {
@JsonProperty("ArrayArrayNumber")
@Valid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
/**
* ArrayOfNumberOnly
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class ArrayOfNumberOnly {
@JsonProperty("ArrayNumber")
@Valid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
/**
* ArrayTest
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class ArrayTest {
@JsonProperty("array_of_string")
@Valid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
/**
* BigCat
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class BigCat extends Cat {
/**
* Gets or Sets kind
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
/**
* BigCatAllOf
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class BigCatAllOf {
/**
* Gets or Sets kind
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
/**
* Capitalization
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class Capitalization {
@JsonProperty("smallCamel")
private String smallCamel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* Cat
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class Cat extends Animal {
@JsonProperty("declawed")
private Boolean declawed;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
/**
* CatAllOf
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class CatAllOf {
@JsonProperty("declawed")
private Boolean declawed;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
/**
* Category
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class Category {
@JsonProperty("id")
private Long id;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
* Model for testing model with \&quot;_class\&quot; property
*/
@ApiModel(description = "Model for testing model with \"_class\" property")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class ClassModel {
@JsonProperty("_class")
private String propertyClass;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
/**
* Client
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class Client {
@JsonProperty("client")
private String client;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* Dog
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class Dog extends Animal {
@JsonProperty("breed")
private String breed;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
/**
* DogAllOf
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class DogAllOf {
@JsonProperty("breed")
private String breed;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
/**
* EnumArrays
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class EnumArrays {
/**
* Gets or Sets justSymbol
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* EnumTest
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class EnumTest {
/**
* Gets or Sets enumString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
/**
* FileSchemaTestClass
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class FileSchemaTestClass {
@JsonProperty("file")
private java.io.File file;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
/**
* FormatTest
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class FormatTest {
@JsonProperty("integer")
private Integer integer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
/**
* HasOnlyReadOnly
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class HasOnlyReadOnly {
@JsonProperty("bar")
private String bar;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
/**
* MapTest
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")@com.fasterxml.jackson.annotation.JsonFilter(value = "filter-name")
@com.fasterxml.jackson.annotation.JsonIgnoreProperties(value = "id")

public class MapTest {
@JsonProperty("map_map_of_string")
@Valid
Expand Down
Loading

0 comments on commit c9939a2

Please sign in to comment.