Skip to content

Commit

Permalink
Migrate from @Introspected to @Serdeable for micronaut 4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
sschnabe committed Aug 16, 2023
1 parent 78ca8d9 commit 0d33d3b
Show file tree
Hide file tree
Showing 100 changed files with 96 additions and 115 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Include in your `pom.xml`:
### Config options

* clientId: id for generated clients (if no client id is provided no interface will be generated)
* introspected: add `@io.micronaut.core.annotation.Introspected` to models (default `true`)
* serdeable: add `@io.micronaut.serde.annotation.Serdeable` to models (default `true`)
* dateTimeRelaxed: add type registrar for relaxed time converter (default `true`)
* useBeanValidation: generate validation annotations (default `true`)
* useGenericResponse: return generic container or specific model, e.g. `Model` vs. `HttpResponse<Model>` (default `true`)
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/async/reactor/Multipart.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.async.reactor;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class Multipart {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/async/reactor/NumberModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.async.reactor;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModel {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/async/reactor/ParameterModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.async.reactor;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModel {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/async/reactor/StringModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.async.reactor;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModel {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/async/simple/Multipart.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.async.simple;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class Multipart {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/async/simple/NumberModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.async.simple;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModel {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/async/simple/ParameterModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.async.simple;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModel {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/async/simple/StringModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.async.simple;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModel {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/defaults/Multipart.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.defaults;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class Multipart {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/defaults/NumberModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.defaults;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModel {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/defaults/ParameterModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.defaults;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModel {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/defaults/StringModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.defaults;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModel {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/modelsuffix/MultipartVO.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.modelsuffix;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class MultipartVO {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/modelsuffix/NumberModelVO.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.modelsuffix;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModelVO {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/modelsuffix/ParameterModelVO.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.modelsuffix;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModelVO {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/modelsuffix/StringModelVO.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.modelsuffix;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModelVO {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/nogeneric/Multipart.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.nogeneric;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class Multipart {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/nogeneric/NumberModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.nogeneric;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModel {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/nogeneric/ParameterModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.nogeneric;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModel {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/nogeneric/StringModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.nogeneric;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModel {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/nooptional/Multipart.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.nooptional;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class Multipart {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/nooptional/NumberModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.nooptional;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModel {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/nooptional/ParameterModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.nooptional;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModel {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/nooptional/StringModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.nooptional;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModel {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/novalidation/Multipart.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.novalidation;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class Multipart {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/novalidation/NumberModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.novalidation;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModel {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/novalidation/ParameterModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.novalidation;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModel {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/novalidation/StringModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.novalidation;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModel {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/packages/model/Multipart.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.packages.model;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class Multipart {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/packages/model/NumberModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.packages.model;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModel {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/packages/model/ParameterModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.packages.model;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModel {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/packages/model/StringModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testapi.packages.model;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModel {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/types/Multipart.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package testapi.types;

@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class Multipart {

public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/types/NumberModel.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package testapi.types;

@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class NumberModel {

public static final java.lang.String JSON_PROPERTY_BAR = "bar";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/types/ParameterModel.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package testapi.types;

@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class ParameterModel {

public static final java.lang.String JSON_PROPERTY_BOOL = "bool";
Expand Down
2 changes: 1 addition & 1 deletion gen/main/java/testapi/types/StringModel.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package testapi.types;

@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class StringModel {

public static final java.lang.String JSON_PROPERTY_FOO = "foo";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testmodel.micronaut_pojo;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class AdditionalPropertiesModel {

public static final java.lang.String JSON_PROPERTY_ID = "id";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package testmodel.micronaut_pojo;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
public enum EnumerationInteger {

NUMBER_MINUS_2147483648(-2147483648),
Expand Down
4 changes: 1 addition & 3 deletions gen/main/java/testmodel/micronaut_pojo/EnumerationModel.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testmodel.micronaut_pojo;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
@io.micronaut.serde.annotation.Serdeable
public class EnumerationModel {

public static final java.lang.String JSON_PROPERTY_STRING = "string";
Expand Down Expand Up @@ -115,7 +115,6 @@ public void setEmbeddedDefault(EmbeddedDefault newEmbeddedDefault) {
this.embeddedDefault = newEmbeddedDefault;
}

@io.micronaut.core.annotation.Introspected
public enum Embedded {

FIRST("first"),
Expand Down Expand Up @@ -148,7 +147,6 @@ public java.lang.String getValue() {
}
}

@io.micronaut.core.annotation.Introspected
public enum EmbeddedDefault {

THREE("three"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package testmodel.micronaut_pojo;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
public enum EnumerationNumber {

NUMBER_MINUS_1(-1D),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package testmodel.micronaut_pojo;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
public enum EnumerationString {

ONE("one"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package testmodel.micronaut_pojo;

@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen")
@io.micronaut.core.annotation.Introspected
public enum EnumerationStringDefault {

THREE("three"),
Expand Down
Loading

0 comments on commit 0d33d3b

Please sign in to comment.