[plugins/openapi-controllers] **breaking** useOptional for method p…

…arameters defaults to false
ZenWave360 · Dec 1, 2024 · bfaf37c · bfaf37c
1 parent 3051132
commit bfaf37c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/e2e/src/test/resources/projects/customer-address-postgres-json/pom.xml b/e2e/src/test/resources/projects/customer-address-postgres-json/pom.xml
@@ -170,7 +170,7 @@
 								<useSpringBoot3>true</useSpringBoot3>
 								<documentationProvider>none</documentationProvider>
 								<openApiNullable>false</openApiNullable>
-								<useOptional>true</useOptional>
+								<useOptional>false</useOptional>
 								<useTags>true</useTags>
 								<interfaceOnly>true</interfaceOnly>
 								<skipDefaultInterface>true</skipDefaultInterface>

diff --git a/e2e/src/test/resources/projects/customer-address-relational/pom.xml b/e2e/src/test/resources/projects/customer-address-relational/pom.xml
@@ -166,7 +166,7 @@
 								<useSpringBoot3>true</useSpringBoot3>
 								<documentationProvider>none</documentationProvider>
 								<openApiNullable>false</openApiNullable>
-								<useOptional>true</useOptional>
+								<useOptional>false</useOptional>
 								<useTags>true</useTags>
 								<interfaceOnly>true</interfaceOnly>
 								<skipDefaultInterface>true</skipDefaultInterface>

diff --git a/e2e/src/test/resources/projects/online-food-delivery-mongo/modules/orders/pom.xml b/e2e/src/test/resources/projects/online-food-delivery-mongo/modules/orders/pom.xml
@@ -133,7 +133,7 @@
                                 <useJakartaEe>true</useJakartaEe>
                                 <documentationProvider>none</documentationProvider>
                                 <openApiNullable>false</openApiNullable>
-                                <useOptional>true</useOptional>
+                                <useOptional>false</useOptional>
                                 <useTags>true</useTags>
                             </configOptions>
                         </configuration>
@@ -158,7 +158,7 @@
                                 <useJakartaEe>true</useJakartaEe>
                                 <documentationProvider>none</documentationProvider>
                                 <openApiNullable>false</openApiNullable>
-                                <useOptional>true</useOptional>
+                                <useOptional>false</useOptional>
                                 <useTags>true</useTags>
                             </configOptions>
                         </configuration>

diff --git a/e2e/src/test/resources/projects/online-food-delivery-mongo/pom.xml b/e2e/src/test/resources/projects/online-food-delivery-mongo/pom.xml
@@ -157,7 +157,7 @@
 										<useSpringBoot3>true</useSpringBoot3>
 										<documentationProvider>none</documentationProvider>
 										<openApiNullable>false</openApiNullable>
-										<useOptional>true</useOptional>
+										<useOptional>false</useOptional>
 										<useTags>true</useTags>
 										<interfaceOnly>true</interfaceOnly>
 										<skipDefaultInterface>true</skipDefaultInterface>

diff --git a/e2e/src/test/resources/projects/simple-domain-packaging/pom.xml b/e2e/src/test/resources/projects/simple-domain-packaging/pom.xml
@@ -166,7 +166,7 @@
 								<useSpringBoot3>true</useSpringBoot3>
 								<documentationProvider>none</documentationProvider>
 								<openApiNullable>false</openApiNullable>
-								<useOptional>true</useOptional>
+								<useOptional>false</useOptional>
 								<useTags>true</useTags>
 								<interfaceOnly>true</interfaceOnly>
 								<skipDefaultInterface>true</skipDefaultInterface>

diff --git a/...k/plugins/OpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs b/...k/plugins/OpenAPIControllersGenerator/src/main/java/web/mvc/ServiceApiController.java.hbs
@@ -101,6 +101,7 @@ public class {{serviceName}}ApiController implements {{serviceName}}Api {
     }
 {{~/each}}
 
+{{~#if useOptional~}}
   protected Pageable pageOf(Optional<Integer> page, Optional<Integer> limit, Optional<List<String>> sort) {
     Sort sortOrder = sort.map(s -> Sort.by(s.stream().map(sortParam -> {
     String[] parts = sortParam.split(":");
@@ -110,4 +111,15 @@ public class {{serviceName}}ApiController implements {{serviceName}}Api {
     }).toList())).orElse(Sort.unsorted());
     return PageRequest.of(page.orElse(0), limit.orElse(10), sortOrder);
   }
+{{~else}}
+  protected Pageable pageOf(Integer page, Integer limit, List<String> sort) {
+    Sort sortOrder = sort != null ? Sort.by(sort.stream().map(sortParam -> {
+    String[] parts = sortParam.split(":");
+    String property = parts[0];
+    Sort.Direction direction = parts.length > 1 ? Sort.Direction.fromString(parts[1]) : Sort.Direction.ASC;
+    return new Sort.Order(direction, property);
+    }).toList()) : Sort.unsorted();
+    return PageRequest.of(page != null ? page : 0, limit != null ? limit : 10, sortOrder);
+  }
+{{~/if}}
 }
diff --git a/plugins/openapi-spring-webtestclient/src/test/resources/pom.xml b/plugins/openapi-spring-webtestclient/src/test/resources/pom.xml
@@ -137,7 +137,7 @@
                             <configOptions>
                                 <documentationProvider>none</documentationProvider>
                                 <openApiNullable>false</openApiNullable>
-                                <useOptional>true</useOptional>
+                                <useOptional>false</useOptional>
                                 <useTags>true</useTags>
                                 <interfaceOnly>true</interfaceOnly>
                                 <delegatePattern>false</delegatePattern>