Merge 4.10 #1130

altro3 · 2023-07-15T11:09:51Z

Add support JsonView
Add ability to set project directory manually
Minor fixes in documentation
Minor code cleanup
Upgarde libs and gradle 8.2.1

@JSONVIEW

Add support for @JSONVIEW

# Conflicts: # gradle/libs.versions.toml # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

# Conflicts: # gradle.properties # gradle/libs.versions.toml # src/main/docs/guide/swaggerAnnotations/schemasAndGenerics.adoc

Fixed micronaut-projects#1131

…4.10 Add process WildcardElement and GenericPlaceholderElement (4.10)

Update libraries. Minor documentation fixes

Fixed micronaut-projects#1131

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java # openapi/src/test/groovy/io/micronaut/openapi/visitor/OpenApiSchemaGenericsSpec.groovy

sdelamo

Please, keep the configuration macro.

sdelamo · 2023-07-17T09:57:17Z

gradle/libs.versions.toml

 managed-javadoc-parser = "0.3.1"
 managed-jsoup = "1.16.1"
 managed-html2md-converter = "0.64.8"

-kotlin = "1.8.22"
+kotlin = "1.9.0"


we are not updating to Kotlin 1.9.0 yet.

sdelamo · 2023-07-17T10:03:17Z

src/main/docs/guide/openApiViews/swaggerui/oauth2.adoc

@@ -82,7 +83,7 @@ public class OrderController {

 Do not forget to configure Micronaut Security accordingly:

-[configuration]
+[source,yaml]


we want to use the configuration macro to output documentation not just in yaml

sdelamo · 2023-07-17T10:03:56Z

src/main/docs/guide/openApiViews/swaggerui.adoc

 To expose the `swagger-ui` views, you also must expose the generated `yaml`:

 .Exposing Swagger YAML and Swagger UI Views
-[configuration]


we want to use configuration macro

sdelamo · 2023-07-17T10:04:13Z

src/main/docs/guide/openApiViews/redoc.adoc

@@ -36,17 +36,17 @@ See https://github.com/Redocly/redoc#redoc-options-object[Redoc Options] for a d
 To expose the `redoc` views, you also must expose the generated `yaml`:

 .Exposing Swagger YAML And Redoc Views
-[configuration]
+[source,yaml]


we want to use the configuration macro

sdelamo · 2023-07-17T10:04:32Z

src/main/docs/guide/openApiViews/rapidoc.adoc

@@ -52,17 +52,17 @@ See https://mrin9.github.io/RapiDoc/api.html[RapiDoc Options] for a description.
 To expose the `rapidoc` views, you also must expose the generated `yaml`:

 .Exposing Swagger YAML And Rapidoc Views
-[configuration]
+[source,yaml]


we want to use the configuration macro

sdelamo · 2023-07-17T10:04:49Z

src/main/docs/guide/openApiViews/mappingPath.adoc

@@ -5,13 +5,13 @@ Thus, by default, the views expect to find the `yaml` under `/swagger`.
 If you change this mapping to something else:

 .Exposing Swagger YAML
-[configuration]
+[source,yaml]


we want to keep using the configuration macro

sdelamo · 2023-07-17T10:06:13Z

src/main/docs/guide/exposingSwaggerOutput.adoc

@@ -1,7 +1,7 @@
 If you wish to expose the generated OpenAPI yaml output from your running application you can simply add the necessary static resource to the application configuration. For example:

 .Exposing OpenAPI YAML
-[configuration]
+[source,yaml]


we want to use the configuration macro

sdelamo · 2023-07-17T10:06:52Z

src/main/docs/guide/customSerializers.adoc

@@ -77,7 +77,7 @@ class MyJaxbElement3 {

 And set openapi properties to map classes to custom openapi schema classes:

-[configuartion]


we want to use the configuration macro.

Fixed micronaut-projects#1131

Fixed micronaut-projects#1101

# Conflicts: # gradle/libs.versions.toml

…s (Groovy) Fixed micronaut-projects#1135

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java # openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

graemerocher · 2023-07-19T11:20:13Z

please resolve the conflicts

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

altro3 · 2023-07-19T11:35:19Z

@graemerocher done.

Could you review all other fixes for 4.10? #1137, #1136, #1115

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java # openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java

altro3 added 13 commits July 3, 2023 09:41

Add documentation about versions and groups (micronaut-projects#1097)

a73827d

Update libraries. Minor documentation fixes

39e3493

Fixed micronaut-projects#773

Add ability to set project directory.

457fd09

Fixed micronaut-projects#1101

Add support for @JSONVIEW

7ab960d

Fixes micronaut-projects#797

Merge pull request micronaut-projects#1112 from altro3/json_view

cc796ab

Add support for @JSONVIEW

Merge branch '4.10.x' into merge_4.10-2

a1efd9d

# Conflicts: # gradle/libs.versions.toml # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiEndpointVisitor.java # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

Fixes after merge

b9d94a5

Merge branch 'project_dir' into merge_4.10-2

bb06f76

Fixes after merge

ce3a382

Merge branch 'minor_fix_docs' into merge_4.10-2

154022f

# Conflicts: # gradle.properties # gradle/libs.versions.toml # src/main/docs/guide/swaggerAnnotations/schemasAndGenerics.adoc

Code cleanup

77c22ff

Fixes in documentation for micronaut-openapi-annotations

3f92488

Gradle 8.2.1

49591bc

altro3 changed the title ~~Merge 4.10 2~~ Merge 4.10 Jul 15, 2023

altro3 added 6 commits July 16, 2023 18:52

Add process WildcardElement in generics

201c3bc

Fixed micronaut-projects#1131

Merge pull request micronaut-projects#1133 from altro3/fix_wildcards_…

583fabc

…4.10 Add process WildcardElement and GenericPlaceholderElement (4.10)

Merge pull request micronaut-projects#1113 from altro3/minor_fix_docs

dfd5735

Update libraries. Minor documentation fixes

Add process WildcardElement and GenericPlaceholderElement in generics

ce94d61

Fixed micronaut-projects#1131

Merge branch '4.10.x' into merge_4.10-2

43367f0

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

Merge branch 'fix_wildcard' into merge_4.10-2

96b72be

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java # openapi/src/test/groovy/io/micronaut/openapi/visitor/OpenApiSchemaGenericsSpec.groovy

sdelamo requested changes Jul 17, 2023

View reviewed changes

sdelamo added the type: improvement A minor improvement to an existing feature label Jul 17, 2023

altro3 added 8 commits July 17, 2023 18:03

Add process WildcardElement and GenericPlaceholderElement in generics

b15ca96

Fixed micronaut-projects#1131

Add ability to set project directory.

c10d8f9

Fixed micronaut-projects#1101

Merge branch 'project_dir' into merge_4.10-2

b65f00b

# Conflicts: # gradle/libs.versions.toml

Add ability to change JsonView default inclusion

9b401c3

Fixed cannot generate schema for response having a collection of enum…

350afbe

…s (Groovy) Fixed micronaut-projects#1135

Merge branch 'fix_groovy_enum_set' into merge_4.10-2

9d0f3c0

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

Fixes after merge

a027121

Merge branch 'json_view_fields' into merge_4.10-2

4b6da9c

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

altro3 added 4 commits July 19, 2023 16:00

Add ability to change JsonView default inclusion

66b91b4

Merge branch 'json_view_fields' into merge_4.10-2

432f468

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java # openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java

Merge branch 'fix_wildcard' into merge_4.10-2

45aa2e8

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

Checkstyle fixes

8533d5f

Merge remote-tracking branch 'origin/master' into merge_4.10-2

0e5a07b

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java

altro3 added 4 commits July 19, 2023 18:47

Add ability to change JsonView default inclusion

56ea895

Merge branch 'json_view_fields' into merge_4.10-2

2c34cbc

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java # openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java

Add ability to change JsonView default inclusion

202d616

Merge branch 'json_view_fields' into merge_4.10-2

8289bc7

# Conflicts: # openapi/src/main/java/io/micronaut/openapi/visitor/AbstractOpenApiVisitor.java # openapi/src/main/java/io/micronaut/openapi/visitor/OpenApiApplicationVisitor.java

altro3 requested a review from graemerocher July 19, 2023 12:20

graemerocher merged commit 1dafa9e into micronaut-projects:master Jul 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 4.10 #1130

Merge 4.10 #1130

altro3 commented Jul 15, 2023

sdelamo left a comment

sdelamo Jul 17, 2023

altro3 Jul 17, 2023

sdelamo Jul 17, 2023

altro3 Jul 17, 2023

sdelamo Jul 17, 2023

altro3 Jul 17, 2023

sdelamo Jul 17, 2023

altro3 Jul 17, 2023

sdelamo Jul 17, 2023

altro3 Jul 17, 2023

sdelamo Jul 17, 2023

altro3 Jul 17, 2023

sdelamo Jul 17, 2023

altro3 Jul 17, 2023

sdelamo Jul 17, 2023

altro3 Jul 17, 2023

graemerocher commented Jul 19, 2023

altro3 commented Jul 19, 2023

		@@ -77,7 +77,7 @@ class MyJaxbElement3 {

		And set openapi properties to map classes to custom openapi schema classes:

		[configuartion]

Merge 4.10 #1130

Merge 4.10 #1130

Conversation

altro3 commented Jul 15, 2023

sdelamo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

graemerocher commented Jul 19, 2023

altro3 commented Jul 19, 2023