Skip to content

Commit f4e2ac4

Browse files
bnasslahsenbnasslahsen
committed
syntax improvment. Fixes #891 
1 parent e0da230 commit f4e2ac4

File tree

36 files changed

+181
-181
lines changed

36 files changed

+181
-181
lines changed

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/AbstractSpringdocRouteBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public abstract class AbstractSpringdocRouteBuilder {
3434

3535
protected Builder getOperationBuilder(Consumer<Builder> operationsConsumer) {
36-
Builder builder = Builder.operation();
36+
Builder builder = Builder.operationBuilder();
3737
operationsConsumer.accept(builder);
3838
return builder;
3939
}

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/apiresponse/Builder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private Builder() {
9393
*
9494
* @return the api response builder
9595
*/
96-
public static Builder apiResponse() {
96+
public static Builder apiResponseBuilder() {
9797
return new Builder();
9898
}
9999

@@ -159,7 +159,7 @@ public Builder content(org.springdoc.core.fn.builders.content.Builder contentBui
159159
* @return the api response builder
160160
*/
161161
public Builder implementation(Class clazz) {
162-
this.content = ArrayUtils.add(this.content, org.springdoc.core.fn.builders.content.Builder.content().schema(org.springdoc.core.fn.builders.schema.Builder.schema().implementation(clazz)).build());
162+
this.content = ArrayUtils.add(this.content, org.springdoc.core.fn.builders.content.Builder.contentBuilder().schema(org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().implementation(clazz)).build());
163163
return this;
164164
}
165165

@@ -170,7 +170,7 @@ public Builder implementation(Class clazz) {
170170
* @return the api response builder
171171
*/
172172
public Builder implementationArray(Class clazz) {
173-
this.content = ArrayUtils.add(this.content, org.springdoc.core.fn.builders.content.Builder.content().array(org.springdoc.core.fn.builders.arrayschema.Builder.arraySchema().schema(org.springdoc.core.fn.builders.schema.Builder.schema().implementation(clazz))).build());
173+
this.content = ArrayUtils.add(this.content, org.springdoc.core.fn.builders.content.Builder.contentBuilder().array(org.springdoc.core.fn.builders.arrayschema.Builder.arraySchemaBuilder().schema(org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().implementation(clazz))).build());
174174
return this;
175175
}
176176

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/arrayschema/Builder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ public class Builder {
3939
* The schema of the items in the array
4040
*
4141
*/
42-
private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schema().build();
42+
private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build();
4343

4444
/**
4545
* Allows to define the properties to be resolved into properties of the schema of type `array` (not the ones of the
4646
* `items` of such schema which are defined in schema}.
4747
*
4848
*/
49-
private Schema arraySchema = org.springdoc.core.fn.builders.schema.Builder.schema().build();
49+
private Schema arraySchema = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build();
5050

5151
/**
5252
* sets the maximum number of items in an array. Ignored if value is Integer.MIN_VALUE.
@@ -84,7 +84,7 @@ private Builder() {
8484
*
8585
* @return the array schema builder
8686
*/
87-
public static Builder arraySchema() {
87+
public static Builder arraySchemaBuilder() {
8888
return new Builder();
8989
}
9090

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/content/Builder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ public class Builder {
5555
* The schema defining the type used for the content.
5656
*
5757
*/
58-
private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schema().build();
58+
private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build();
5959

6060
/**
6161
* The schema of the array that defines the type used for the content.
6262
*
6363
*/
64-
private ArraySchema array = org.springdoc.core.fn.builders.arrayschema.Builder.arraySchema().build();
64+
private ArraySchema array = org.springdoc.core.fn.builders.arrayschema.Builder.arraySchemaBuilder().build();
6565

6666
/**
6767
* An array of encodings
@@ -88,7 +88,7 @@ private Builder() {
8888
*
8989
* @return the content builder
9090
*/
91-
public static Builder content() {
91+
public static Builder contentBuilder() {
9292
return new Builder();
9393
}
9494

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/discriminatormapping/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private Builder() {
5757
*
5858
* @return the discriminator mapping builder
5959
*/
60-
public static Builder discriminatorMapping() {
60+
public static Builder discriminatorMappingBuilder() {
6161
return new Builder();
6262
}
6363

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/encoding/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private Builder() {
9494
*
9595
* @return the encoding builder
9696
*/
97-
public static Builder encoding() {
97+
public static Builder encodingBuilder() {
9898
return new Builder();
9999
}
100100

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/exampleobject/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private Builder() {
8181
*
8282
* @return the example object builder
8383
*/
84-
public static Builder exampleOject() {
84+
public static Builder exampleOjectBuilder() {
8585
return new Builder();
8686
}
8787

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/extension/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private Builder() {
5858
*
5959
* @return the extension builder
6060
*/
61-
public static Builder extension() {
61+
public static Builder extensionBuilder() {
6262
return new Builder();
6363
}
6464

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/extensionproperty/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private Builder() {
6262
*
6363
* @return the extension property builder
6464
*/
65-
public static Builder extensionProperty() {
65+
public static Builder extensionPropertyBuilder() {
6666
return new Builder();
6767
}
6868

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/externaldocumentation/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private Builder() {
6565
*
6666
* @return the external documentation builder
6767
*/
68-
public static Builder externalDocumentation() {
68+
public static Builder externalDocumentationBuilder() {
6969
return new Builder();
7070
}
7171

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/header/Builder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class Builder {
5050
* The schema defining the type used for the header. Ignored if the properties content or array are specified.
5151
*
5252
*/
53-
private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schema().build();
53+
private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build();
5454

5555
/**
5656
* Determines whether this header is mandatory. The property may be included and its default value is false.
@@ -81,7 +81,7 @@ private Builder() {
8181
*
8282
* @return the header builder
8383
*/
84-
public static Builder header() {
84+
public static Builder headerBuilder() {
8585
return new Builder();
8686
}
8787

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/link/Builder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class Builder {
7676
* An alternative server to service this operation.
7777
*
7878
*/
79-
private Server server = org.springdoc.core.fn.builders.server.Builder.server().build();
79+
private Server server = org.springdoc.core.fn.builders.server.Builder.serverBuilder().build();
8080

8181
/**
8282
* The list of optional extensions
@@ -103,7 +103,7 @@ private Builder() {
103103
*
104104
* @return the link builder
105105
*/
106-
public static Builder builder() {
106+
public static Builder linkBuilder() {
107107
return new Builder();
108108
}
109109

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/linkparameter/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private Builder() {
5656
*
5757
* @return the link parameter builder
5858
*/
59-
public static Builder linkParameter() {
59+
public static Builder linkParameterBuilder() {
6060
return new Builder();
6161
}
6262

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/operation/Builder.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ public class Builder {
8787
* Request body associated to the operation.
8888
*
8989
*/
90-
private RequestBody requestBody = org.springdoc.core.fn.builders.requestbody.Builder.requestBody().build();
90+
private RequestBody requestBody = org.springdoc.core.fn.builders.requestbody.Builder.requestBodyBuilder().build();
9191

9292
/**
9393
* Additional external documentation for this operation.
9494
*
9595
*/
96-
private ExternalDocumentation externalDocs = org.springdoc.core.fn.builders.externaldocumentation.Builder.externalDocumentation().build();
96+
private ExternalDocumentation externalDocs = org.springdoc.core.fn.builders.externaldocumentation.Builder.externalDocumentationBuilder().build();
9797

9898
/**
9999
* The operationId is used by third-party tools to uniquely identify this operation.
@@ -160,7 +160,7 @@ private Builder() {
160160
*
161161
* @return the operation builder
162162
*/
163-
public static Builder operation() {
163+
public static Builder operationBuilder() {
164164
return new Builder();
165165
}
166166

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/parameter/Builder.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ public class Builder {
9999
* The schema defining the type used for the parameter. Ignored if the properties content or array are specified.
100100
*
101101
*/
102-
private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schema().build();
102+
private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().build();
103103

104104
/**
105105
* The schema of the array that defines this parameter. Ignored if the property content is specified.
106106
*
107107
*/
108-
private ArraySchema array = org.springdoc.core.fn.builders.arrayschema.Builder.arraySchema().build();
108+
private ArraySchema array = org.springdoc.core.fn.builders.arrayschema.Builder.arraySchemaBuilder().build();
109109

110110
/**
111111
* The representation of this parameter, for different media types.
@@ -156,7 +156,7 @@ private Builder() {
156156
*
157157
* @return the parameter builder
158158
*/
159-
public static Builder parameter() {
159+
public static Builder parameterBuilder() {
160160
return new Builder();
161161
}
162162

@@ -288,7 +288,7 @@ public Builder array(org.springdoc.core.fn.builders.arrayschema.Builder arraySch
288288
* @return the parameter builder
289289
*/
290290
public Builder implementationArray(Class clazz) {
291-
this.array = org.springdoc.core.fn.builders.arrayschema.Builder.arraySchema().schema(org.springdoc.core.fn.builders.schema.Builder.schema().implementation(clazz)).build();
291+
this.array = org.springdoc.core.fn.builders.arrayschema.Builder.arraySchemaBuilder().schema(org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().implementation(clazz)).build();
292292
return this;
293293
}
294294

@@ -299,7 +299,7 @@ public Builder implementationArray(Class clazz) {
299299
* @return the parameter builder
300300
*/
301301
public Builder implementation(Class clazz) {
302-
this.schema = org.springdoc.core.fn.builders.schema.Builder.schema().implementation(clazz).build();
302+
this.schema = org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().implementation(clazz).build();
303303
return this;
304304
}
305305

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/requestbody/Builder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private Builder() {
7979
*
8080
* @return the request body builder
8181
*/
82-
public static Builder requestBody() {
82+
public static Builder requestBodyBuilder() {
8383
return new Builder();
8484
}
8585

@@ -112,7 +112,7 @@ public Builder content(org.springdoc.core.fn.builders.content.Builder contentBui
112112
* @return the request body builder
113113
*/
114114
public Builder implementation(Class clazz) {
115-
this.content = ArrayUtils.add(this.content, org.springdoc.core.fn.builders.content.Builder.content().schema(org.springdoc.core.fn.builders.schema.Builder.schema().implementation(clazz)).build());
115+
this.content = ArrayUtils.add(this.content, org.springdoc.core.fn.builders.content.Builder.contentBuilder().schema(org.springdoc.core.fn.builders.schema.Builder.schemaBuilder().implementation(clazz)).build());
116116
return this;
117117
}
118118

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/schema/Builder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public class Builder {
196196
* Additional external documentation for this schema.
197197
*
198198
*/
199-
private ExternalDocumentation externalDocs = org.springdoc.core.fn.builders.externaldocumentation.Builder.externalDocumentation().build();
199+
private ExternalDocumentation externalDocs = org.springdoc.core.fn.builders.externaldocumentation.Builder.externalDocumentationBuilder().build();
200200

201201
/**
202202
* Specifies that a schema is deprecated and should be transitioned out of usage.
@@ -272,7 +272,7 @@ private Builder() {
272272
*
273273
* @return the schema builder
274274
*/
275-
public static Builder schema() {
275+
public static Builder schemaBuilder() {
276276
return new Builder();
277277
}
278278

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/securityrequirement/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private Builder() {
5757
*
5858
* @return the security requirement builder
5959
*/
60-
public static Builder securityRequirement() {
60+
public static Builder securityRequirementBuilder() {
6161
return new Builder();
6262
}
6363

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/server/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private Builder() {
7373
*
7474
* @return the server builder
7575
*/
76-
public static Builder server() {
76+
public static Builder serverBuilder() {
7777
return new Builder();
7878
}
7979

‎springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/servervariable/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private Builder() {
7676
*
7777
* @return the server variable builder
7878
*/
79-
public static Builder serverVariable() {
79+
public static Builder serverVariableBuilder() {
8080
return new Builder();
8181
}
8282

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app82/RoutingConfiguration.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.web.reactive.function.server.ServerResponse;
77

88
import static org.springdoc.core.Constants.OPERATION_ATTRIBUTE;
9-
import static org.springdoc.core.fn.builders.operation.Builder.operation;
9+
import static org.springdoc.core.fn.builders.operation.Builder.operationBuilder;
1010
import static org.springframework.http.MediaType.APPLICATION_JSON;
1111
import static org.springframework.web.reactive.function.server.RequestPredicates.DELETE;
1212
import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
@@ -21,19 +21,19 @@ public class RoutingConfiguration {
2121
@Bean
2222
public RouterFunction<ServerResponse> monoRouterFunction(UserHandler userHandler) {
2323
return route(GET("/api/user/index").and(accept(APPLICATION_JSON)), userHandler::getAll)
24-
.withAttribute(OPERATION_ATTRIBUTE, operation().beanClass(UserRepository.class).beanMethod("getAllUsers"))
24+
.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(UserRepository.class).beanMethod("getAllUsers"))
2525

2626
.and(route(GET("/api/user/{id}").and(accept(APPLICATION_JSON)), userHandler::getUser)
27-
.withAttribute(OPERATION_ATTRIBUTE, operation().beanClass(UserRepository.class).beanMethod("getUserById")))
27+
.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(UserRepository.class).beanMethod("getUserById")))
2828

2929
.and(route(POST("/api/user/post").and(accept(APPLICATION_JSON)), userHandler::postUser)
30-
.withAttribute(OPERATION_ATTRIBUTE, operation().beanClass(UserRepository.class).beanMethod("saveUser")))
30+
.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(UserRepository.class).beanMethod("saveUser")))
3131

3232
.and(route(PUT("/api/user/put/{id}").and(accept(APPLICATION_JSON)), userHandler::putUser)
33-
.withAttribute(OPERATION_ATTRIBUTE, operation().beanClass(UserRepository.class).beanMethod("putUser")))
33+
.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(UserRepository.class).beanMethod("putUser")))
3434

3535
.and(route(DELETE("/api/user/delete/{id}").and(accept(APPLICATION_JSON)), userHandler::deleteUser)
36-
.withAttribute(OPERATION_ATTRIBUTE, operation().beanClass(UserRepository.class).beanMethod("deleteUser")));
36+
.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(UserRepository.class).beanMethod("deleteUser")));
3737
}
3838

3939
}

‎springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app83/RouteConfig.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.web.reactive.function.server.ServerResponse;
1111

1212
import static org.springdoc.core.Constants.OPERATION_ATTRIBUTE;
13-
import static org.springdoc.core.fn.builders.operation.Builder.operation;
13+
import static org.springdoc.core.fn.builders.operation.Builder.operationBuilder;
1414
import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
1515
import static org.springframework.web.reactive.function.server.RouterFunctions.route;
1616

@@ -25,13 +25,13 @@ public RouteConfig(CoffeeService service) {
2525
@Bean
2626
RouterFunction<ServerResponse> routerFunction() {
2727
return route(GET("/coffees"), this::all)
28-
.withAttribute(OPERATION_ATTRIBUTE, operation().beanClass(CoffeeService.class).beanMethod("getAllCoffees"))
28+
.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(CoffeeService.class).beanMethod("getAllCoffees"))
2929

3030
.and(route(GET("/coffees/{id}"), this::byId)
31-
.withAttribute(OPERATION_ATTRIBUTE, operation().beanClass(CoffeeService.class).beanMethod("getCoffeeById")))
31+
.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(CoffeeService.class).beanMethod("getCoffeeById")))
3232

3333
.and(route(GET("/coffees/{id}/orders"), this::orders)
34-
.withAttribute(OPERATION_ATTRIBUTE, operation().beanClass(CoffeeService.class).beanMethod("getOrdersForCoffeeById")));
34+
.withAttribute(OPERATION_ATTRIBUTE, operationBuilder().beanClass(CoffeeService.class).beanMethod("getOrdersForCoffeeById")));
3535
}
3636

3737
private Mono<ServerResponse> all(ServerRequest req) {

0 commit comments

Comments
 (0)