diff --git a/pom.xml b/pom.xml index db6b9979f..033ac4ce8 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 0.7.0 1.5.0 - 2.2.30 + 2.2.34 5.21.0 1.13.1 0.9.1 diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java index c033610ed..764d4862d 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java @@ -449,6 +449,11 @@ public Class contains() { return parameterSchema.$dynamicAnchor(); } + @Override + public String $dynamicRef() { + return ""; + } + @Override public String contentEncoding() { return parameterSchema.contentEncoding(); @@ -836,6 +841,11 @@ public Class contains() { return schema.$dynamicAnchor(); } + @Override + public String $dynamicRef() { + return schema.$dynamicRef(); + } + @Override public String contentEncoding() { return schema.contentEncoding(); diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java index 99de085aa..ba5ae9657 100644 --- a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java +++ b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java @@ -299,6 +299,11 @@ public class Builder { */ private String $dynamicAnchor = ""; + /** + * The Dynamic ref + */ + private String $dynamicRef = ""; + /** * The Content encoding. */ @@ -1149,6 +1154,11 @@ public Class contains() { return $dynamicAnchor; } + @Override + public String $dynamicRef() { + return $dynamicRef; + } + @Override public String contentEncoding() { return contentEncoding; diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app110.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app110.json index 62f211aa2..91a4af137 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app110.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app110.json @@ -257,7 +257,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app111.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app111.json index 7143898e4..d3cbb307c 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app111.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app111.json @@ -175,7 +175,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app112.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app112.json index 5fa3b7691..28c883169 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app112.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app112.json @@ -257,7 +257,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app110.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app110.json index afb60ad05..092229524 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app110.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app110.json @@ -257,7 +257,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json index 1ea58db5d..e4e0d7f21 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app111.json @@ -175,7 +175,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app112.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app112.json index 7ac383dcc..d964c6530 100644 --- a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app112.json +++ b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.1.0/app112.json @@ -257,7 +257,8 @@ "type": "string" }, "email1": { - "type": "string" + "type": "string", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app110.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app110.json index 18cacc1db..45fbdf662 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app110.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app110.json @@ -289,7 +289,8 @@ }, "email1": { "type": "string", - "description": "The Email 1." + "description": "The Email 1.", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app111.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app111.json index 853585c74..2809dcb57 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app111.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app111.json @@ -202,7 +202,8 @@ }, "email1": { "type": "string", - "description": "The Email 1." + "description": "The Email 1.", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app112.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app112.json index 06e588d36..86ad04a5a 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app112.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.0.1/app112.json @@ -289,7 +289,8 @@ }, "email1": { "type": "string", - "description": "The Email 1." + "description": "The Email 1.", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app110.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app110.json index 4c8e48984..d89c5b674 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app110.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app110.json @@ -289,7 +289,8 @@ }, "email1": { "type": "string", - "description": "The Email 1." + "description": "The Email 1.", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app111.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app111.json index f55f690ec..0c0c52be5 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app111.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app111.json @@ -202,7 +202,8 @@ }, "email1": { "type": "string", - "description": "The Email 1." + "description": "The Email 1.", + "format": "email" }, "age": { "maximum": 30, diff --git a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app112.json b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app112.json index a14264c5e..f3a30b68f 100644 --- a/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app112.json +++ b/springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/3.1.0/app112.json @@ -289,7 +289,8 @@ }, "email1": { "type": "string", - "description": "The Email 1." + "description": "The Email 1.", + "format": "email" }, "age": { "maximum": 30, @@ -307,4 +308,4 @@ } } } -} \ No newline at end of file +}