saving work

Author: bnasslahsen

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

@@ -288,14 +288,14 @@ private void calculateAccept(String value) {
 		}
 	}
 
-	protected void attributes(Map<String, Object> attributes) {
-		this.attributes = attributes;
-	}
-
 	protected void route() {
 		this.routerFunctionData = new RouterFunctionData();
 		routerFunctionDatas.add(this.routerFunctionData);
 		this.routerFunctionData.addAttributes(this.attributes);
 	}
 
+	public void attributes(Map<String, Object> map) {
+		this.attributes = map;
+	}
+
 }

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

@@ -156,14 +156,16 @@ public RouterOperation(RouterFunctionData routerFunctionData) {
 
 		Map<String, Object> attributes = routerFunctionData.getAttributes();
 		if (attributes.containsKey(ROUTER_ATTRIBUTE)) {
-			RouterOperation routerOperation = (RouterOperation) attributes.get(ROUTER_ATTRIBUTE);
+			RouterOperationBuilder routerOperationBuilder = (RouterOperationBuilder) attributes.get(ROUTER_ATTRIBUTE);
+			RouterOperation routerOperation = routerOperationBuilder.build();
 			this.beanClass = routerOperation.getBeanClass();
 			this.beanMethod = routerOperation.getBeanMethod();
 			this.parameterTypes = routerOperation.getParameterTypes();
 			this.operation = routerOperation.getOperation();
 		}
 		else if (attributes.containsKey(OPERATION_ATTRIBUTE)) {
-			this.operation = (Operation) attributes.get(OPERATION_ATTRIBUTE);
+			OperationBuilder operationBuilder = (OperationBuilder) attributes.get(OPERATION_ATTRIBUTE);
+			this.operation = operationBuilder.build();
 		}
 	}
 

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ApiResponseBuilder.java

@@ -201,8 +201,7 @@ public ApiResponseBuilder ref(String ref) {
 	 * @return the api response
 	 */
 	public ApiResponse build() {
-		ApiResponse apiResponse = new ApiResponse() {
-
+		return new ApiResponse() {
 			@Override
 			public Class<? extends Annotation> annotationType() {
 				return null;
@@ -243,6 +242,5 @@ public String ref() {
 				return ref;
 			}
 		};
-		return apiResponse;
 	}
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ArraySchemaBuilder.java

@@ -159,7 +159,7 @@ public ArraySchemaBuilder extension(ExtensionBuilder extensionBuilder) {
 	 * @return the array schema
 	 */
 	public ArraySchema build() {
-		ArraySchema arraySchemaResult = new ArraySchema() {
+		return new ArraySchema() {
 			@Override
 			public Class<? extends Annotation> annotationType() {
 				return null;
@@ -195,7 +195,5 @@ public Extension[] extensions() {
 				return extensions;
 			}
 		};
-
-		return arraySchemaResult;
 	}
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ContentBuilder.java

@@ -163,7 +163,7 @@ public ContentBuilder extension(ExtensionBuilder extensionBuilder) {
 	 * @return the content
 	 */
 	public Content build() {
-		Content content = new Content(){
+		return new Content(){
 
 			@Override
 			public Class<? extends Annotation> annotationType() {
@@ -200,6 +200,5 @@ public Extension[] extensions() {
 				return extensions;
 			}
 		};
-		return content;
 	}
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/DiscriminatorMappingBuilder.java

@@ -88,7 +88,7 @@ public DiscriminatorMappingBuilder schema(Class<?> schema) {
 	 * @return the discriminator mapping
 	 */
 	public DiscriminatorMapping build() {
-		DiscriminatorMapping discriminatorMapping = new DiscriminatorMapping() {
+		return new DiscriminatorMapping() {
 
 			@Override
 			public Class<? extends Annotation> annotationType() {
@@ -105,7 +105,6 @@ public Class<?> schema() {
 				return schema;
 			}
 		};
-		return discriminatorMapping;
 	}
 
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/EncodingBuilder.java

@@ -180,7 +180,7 @@ public EncodingBuilder extension(ExtensionBuilder extensionBuilder) {
 	 * @return the encoding
 	 */
 	public Encoding build() {
-		Encoding encoding = new Encoding(){
+		return new Encoding(){
 
 			@Override
 			public Class<? extends Annotation> annotationType() {
@@ -222,6 +222,5 @@ public Extension[] extensions() {
 				return extensions;
 			}
 		};
-		return encoding;
 	}
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ExampleObjectBuilder.java

@@ -167,7 +167,7 @@ public ExampleObjectBuilder description(String description) {
 	 * @return the example object
 	 */
 	public ExampleObject build() {
-		ExampleObject exampleObject = new ExampleObject() {
+		return new ExampleObject() {
 			@Override
 			public Class<? extends Annotation> annotationType() {
 				return null;
@@ -208,6 +208,5 @@ public String description() {
 				return description;
 			}
 		};
-		return exampleObject;
 	}
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ExtensionBuilder.java

@@ -89,7 +89,7 @@ public ExtensionBuilder propertie(ExtensionPropertyBuilder extensionPropertyBuil
 	 * @return the extension
 	 */
 	public Extension build() {
-		Extension extension = new Extension(){
+		return new Extension(){
 			@Override
 			public Class<? extends Annotation> annotationType() {
 				return null;
@@ -105,6 +105,5 @@ public ExtensionProperty[] properties() {
 				return properties;
 			}
 		};
-		return extension;
 	}
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ExtensionPropertyBuilder.java

@@ -104,7 +104,7 @@ public ExtensionPropertyBuilder parseValue(boolean parseValue) {
 	 * @return the extension property
 	 */
 	public ExtensionProperty build() {
-		ExtensionProperty extensionProperty = new ExtensionProperty() {
+		return new ExtensionProperty() {
 			@Override
 			public Class<? extends Annotation> annotationType() {
 				return null;
@@ -122,6 +122,5 @@ public boolean parseValue() {
 				return parseValue;
 			}
 		};
-		return extensionProperty;
 	}
 }