syntax improvment. Fixes #891

Author: bnasslahsen

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

@@ -25,15 +25,15 @@
 
 import java.util.function.Consumer;
 
-import org.springdoc.core.fn.builders.OperationBuilder;
+import org.springdoc.core.fn.builders.operation.Builder;
 
 /**
  * @author bnasslahsen
  */
 public abstract class AbstractSpringdocRouteBuilder {
 
-	protected OperationBuilder getOperationBuilder(Consumer<OperationBuilder> operationsConsumer) {
-		OperationBuilder builder = OperationBuilder.builder();
+	protected Builder getOperationBuilder(Consumer<Builder> operationsConsumer) {
+		Builder builder = Builder.operation();
 		operationsConsumer.accept(builder);
 		return builder;
 	}

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

@@ -27,7 +27,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springdoc.core.fn.builders.OperationBuilder;
+import org.springdoc.core.fn.builders.operation.Builder;
 
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -161,7 +161,7 @@ public RouterOperation(RouterFunctionData routerFunctionData) {
 
 		Map<String, Object> attributes = routerFunctionData.getAttributes();
 		if (attributes.containsKey(OPERATION_ATTRIBUTE)) {
-			OperationBuilder routerOperationBuilder = (OperationBuilder) attributes.get(OPERATION_ATTRIBUTE);
+			Builder routerOperationBuilder = (Builder) attributes.get(OPERATION_ATTRIBUTE);
 			RouterOperation routerOperation = routerOperationBuilder.build();
 			this.beanClass = routerOperation.getBeanClass();
 			this.beanMethod = routerOperation.getBeanMethod();

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ApiResponseBuilder.java renamed to springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/apiresponse/Builder.java

@@ -21,7 +21,7 @@
  *
  */
 
-package org.springdoc.core.fn.builders;
+package org.springdoc.core.fn.builders.apiresponse;
 
 import java.lang.annotation.Annotation;
 
@@ -36,7 +36,7 @@
  * The type Api response builder.
  * @author bnasslahsen
  */
-public class ApiResponseBuilder {
+public class Builder {
 
 	/**
 	 * A short description of the response.
@@ -85,16 +85,16 @@ public class ApiResponseBuilder {
 	/**
 	 * Instantiates a new Api response builder.
 	 */
-	private ApiResponseBuilder() {
+	private Builder() {
 	}
 
 	/**
 	 * Builder api response builder.
 	 *
 	 * @return the api response builder
 	 */
-	public static ApiResponseBuilder builder() {
-		return new ApiResponseBuilder();
+	public static Builder apiResponse() {
+		return new Builder();
 	}
 
 	/**
@@ -103,7 +103,7 @@ public static ApiResponseBuilder builder() {
 	 * @param description the description
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder description(String description) {
+	public Builder description(String description) {
 		this.description = description;
 		return this;
 	}
@@ -114,7 +114,7 @@ public ApiResponseBuilder description(String description) {
 	 * @param responseCode the response code
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder responseCode(String responseCode) {
+	public Builder responseCode(String responseCode) {
 		this.responseCode = responseCode;
 		return this;
 	}
@@ -125,7 +125,7 @@ public ApiResponseBuilder responseCode(String responseCode) {
 	 * @param headers the headers
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder header(HeaderBuilder headers) {
+	public Builder header(org.springdoc.core.fn.builders.header.Builder headers) {
 		this.headers = ArrayUtils.add(this.headers, headers.build());
 		return this;
 	}
@@ -136,7 +136,7 @@ public ApiResponseBuilder header(HeaderBuilder headers) {
 	 * @param linkBuilder the link builder
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder link(LinkBuilder linkBuilder) {
+	public Builder link(org.springdoc.core.fn.builders.link.Builder linkBuilder) {
 		this.links = ArrayUtils.add(this.links, linkBuilder.build());
 		return this;
 	}
@@ -147,7 +147,7 @@ public ApiResponseBuilder link(LinkBuilder linkBuilder) {
 	 * @param contentBuilder the content builder
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder content(ContentBuilder contentBuilder) {
+	public Builder content(org.springdoc.core.fn.builders.content.Builder contentBuilder) {
 		this.content = ArrayUtils.add(this.content, contentBuilder.build());
 		return this;
 	}
@@ -158,8 +158,8 @@ public ApiResponseBuilder content(ContentBuilder contentBuilder) {
 	 * @param clazz the clazz
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder implementation(Class clazz) {
-		this.content = ArrayUtils.add(this.content, ContentBuilder.builder().schema(SchemaBuilder.builder().implementation(clazz)).build());
+	public Builder implementation(Class clazz) {
+		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());
 		return this;
 	}
 
@@ -169,8 +169,8 @@ public ApiResponseBuilder implementation(Class clazz) {
 	 * @param clazz the clazz
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder implementationArray(Class clazz) {
-		this.content = ArrayUtils.add(this.content, ContentBuilder.builder().array(ArraySchemaBuilder.builder().schema(SchemaBuilder.builder().implementation(clazz))).build());
+	public Builder implementationArray(Class clazz) {
+		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());
 		return this;
 	}
 
@@ -180,7 +180,7 @@ public ApiResponseBuilder implementationArray(Class clazz) {
 	 * @param extensionBuilder the extension builder
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder extension(ExtensionBuilder extensionBuilder) {
+	public Builder extension(org.springdoc.core.fn.builders.extension.Builder extensionBuilder) {
 		this.extensions = ArrayUtils.add(this.extensions, extensionBuilder.build());
 		return this;
 	}
@@ -191,7 +191,7 @@ public ApiResponseBuilder extension(ExtensionBuilder extensionBuilder) {
 	 * @param ref the ref
 	 * @return the api response builder
 	 */
-	public ApiResponseBuilder ref(String ref) {
+	public Builder ref(String ref) {
 		this.ref = ref;
 		return this;
 	}

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ArraySchemaBuilder.java renamed to springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/arrayschema/Builder.java

@@ -21,7 +21,7 @@
  *
  */
 
-package org.springdoc.core.fn.builders;
+package org.springdoc.core.fn.builders.arrayschema;
 
 import java.lang.annotation.Annotation;
 
@@ -34,19 +34,19 @@
  * The type Array schema builder.
  * @author bnasslahsen
  */
-public class ArraySchemaBuilder {
+public class Builder {
 	/**
 	 * The schema of the items in the array
 	 *
 	 */
-	private Schema schema = SchemaBuilder.builder().build();
+	private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schema().build();
 
 	/**
 	 * Allows to define the properties to be resolved into properties of the schema of type `array` (not the ones of the
 	 * `items` of such schema which are defined in schema}.
 	 *
 	 */
-	private Schema arraySchema = SchemaBuilder.builder().build();
+	private Schema arraySchema = org.springdoc.core.fn.builders.schema.Builder.schema().build();
 
 	/**
 	 * sets the maximum number of items in an array.  Ignored if value is Integer.MIN_VALUE.
@@ -76,16 +76,16 @@ public class ArraySchemaBuilder {
 	/**
 	 * Instantiates a new Array schema builder.
 	 */
-	private ArraySchemaBuilder() {
+	private Builder() {
 	}
 
 	/**
 	 * Builder array schema builder.
 	 *
 	 * @return the array schema builder
 	 */
-	public static ArraySchemaBuilder builder() {
-		return new ArraySchemaBuilder();
+	public static Builder arraySchema() {
+		return new Builder();
 	}
 
 	/**
@@ -94,7 +94,7 @@ public static ArraySchemaBuilder builder() {
 	 * @param schemaBuilder the schema builder
 	 * @return the array schema builder
 	 */
-	public ArraySchemaBuilder schema(SchemaBuilder schemaBuilder) {
+	public Builder schema(org.springdoc.core.fn.builders.schema.Builder schemaBuilder) {
 		this.schema = schemaBuilder.build();
 		return this;
 	}
@@ -105,7 +105,7 @@ public ArraySchemaBuilder schema(SchemaBuilder schemaBuilder) {
 	 * @param schemaBuilder the schema builder
 	 * @return the array schema builder
 	 */
-	public ArraySchemaBuilder arraySchema(SchemaBuilder schemaBuilder) {
+	public Builder arraySchema(org.springdoc.core.fn.builders.schema.Builder schemaBuilder) {
 		this.arraySchema = schemaBuilder.build();
 		return this;
 	}
@@ -116,7 +116,7 @@ public ArraySchemaBuilder arraySchema(SchemaBuilder schemaBuilder) {
 	 * @param maxItems the max items
 	 * @return the array schema builder
 	 */
-	public ArraySchemaBuilder maxItems(int maxItems) {
+	public Builder maxItems(int maxItems) {
 		this.maxItems = maxItems;
 		return this;
 	}
@@ -127,7 +127,7 @@ public ArraySchemaBuilder maxItems(int maxItems) {
 	 * @param minItems the min items
 	 * @return the array schema builder
 	 */
-	public ArraySchemaBuilder minItems(int minItems) {
+	public Builder minItems(int minItems) {
 		this.minItems = minItems;
 		return this;
 	}
@@ -138,7 +138,7 @@ public ArraySchemaBuilder minItems(int minItems) {
 	 * @param uniqueItems the unique items
 	 * @return the array schema builder
 	 */
-	public ArraySchemaBuilder uniqueItems(boolean uniqueItems) {
+	public Builder uniqueItems(boolean uniqueItems) {
 		this.uniqueItems = uniqueItems;
 		return this;
 	}
@@ -149,7 +149,7 @@ public ArraySchemaBuilder uniqueItems(boolean uniqueItems) {
 	 * @param extensionBuilder the extension builder
 	 * @return the array schema builder
 	 */
-	public ArraySchemaBuilder extension(ExtensionBuilder extensionBuilder) {
+	public Builder extension(org.springdoc.core.fn.builders.extension.Builder extensionBuilder) {
 		this.extensions = ArrayUtils.add( this.extensions, extensionBuilder.build());
 		return this;
 	}

springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/ContentBuilder.java renamed to springdoc-openapi-common/src/main/java/org/springdoc/core/fn/builders/content/Builder.java

@@ -21,7 +21,7 @@
  *
  */
 
-package org.springdoc.core.fn.builders;
+package org.springdoc.core.fn.builders.content;
 
 import java.lang.annotation.Annotation;
 
@@ -37,7 +37,7 @@
  * The type Content builder.
  * @author bnasslahsen
  */
-public class ContentBuilder {
+public class Builder {
 
 	/**
 	 * The media type that this object applies to.
@@ -55,13 +55,13 @@ public class ContentBuilder {
 	 * The schema defining the type used for the content.
 	 *
 	 */
-	private Schema schema = SchemaBuilder.builder().build();
+	private Schema schema = org.springdoc.core.fn.builders.schema.Builder.schema().build();
 
 	/**
 	 * The schema of the array that defines the type used for the content.
 	 *
 	 */
-	private ArraySchema array = ArraySchemaBuilder.builder().build();
+	private ArraySchema array = org.springdoc.core.fn.builders.arrayschema.Builder.arraySchema().build();
 
 	/**
 	 * An array of encodings
@@ -80,16 +80,16 @@ public class ContentBuilder {
 	/**
 	 * Instantiates a new Content builder.
 	 */
-	private ContentBuilder() {
+	private Builder() {
 	}
 
 	/**
 	 * Builder content builder.
 	 *
 	 * @return the content builder
 	 */
-	public static ContentBuilder builder() {
-		return new ContentBuilder();
+	public static Builder content() {
+		return new Builder();
 	}
 
 	/**
@@ -98,7 +98,7 @@ public static ContentBuilder builder() {
 	 * @param mediaType the media type
 	 * @return the content builder
 	 */
-	public ContentBuilder mediaType(String mediaType) {
+	public Builder mediaType(String mediaType) {
 		this.mediaType = mediaType;
 		return this;
 	}
@@ -109,7 +109,7 @@ public ContentBuilder mediaType(String mediaType) {
 	 * @param exampleObjectBuilder the example object builder
 	 * @return the content builder
 	 */
-	public ContentBuilder example(ExampleObjectBuilder exampleObjectBuilder) {
+	public Builder example(org.springdoc.core.fn.builders.exampleobject.Builder exampleObjectBuilder) {
 		this.examples =  ArrayUtils.add( this.examples, exampleObjectBuilder.build());
 		return this;
 	}
@@ -120,7 +120,7 @@ public ContentBuilder example(ExampleObjectBuilder exampleObjectBuilder) {
 	 * @param schemaBuilder the schema builder
 	 * @return the content builder
 	 */
-	public ContentBuilder schema(SchemaBuilder schemaBuilder) {
+	public Builder schema(org.springdoc.core.fn.builders.schema.Builder schemaBuilder) {
 		this.schema = schemaBuilder.build();
 		return this;
 	}
@@ -131,7 +131,7 @@ public ContentBuilder schema(SchemaBuilder schemaBuilder) {
 	 * @param arraySchemaBuilder the array schema builder
 	 * @return the content builder
 	 */
-	public ContentBuilder array(ArraySchemaBuilder arraySchemaBuilder) {
+	public Builder array(org.springdoc.core.fn.builders.arrayschema.Builder arraySchemaBuilder) {
 		this.array = arraySchemaBuilder.build();
 		return this;
 	}
@@ -142,7 +142,7 @@ public ContentBuilder array(ArraySchemaBuilder arraySchemaBuilder) {
 	 * @param encodingBuilder the encoding builder
 	 * @return the content builder
 	 */
-	public ContentBuilder encoding(EncodingBuilder encodingBuilder) {
+	public Builder encoding(org.springdoc.core.fn.builders.encoding.Builder encodingBuilder) {
 		this.encodings = ArrayUtils.add( this.encodings, encodingBuilder.build());
 		return this;
 	}
@@ -153,7 +153,7 @@ public ContentBuilder encoding(EncodingBuilder encodingBuilder) {
 	 * @param extensionBuilder the extension builder
 	 * @return the content builder
 	 */
-	public ContentBuilder extension(ExtensionBuilder extensionBuilder) {
+	public Builder extension(org.springdoc.core.fn.builders.extension.Builder extensionBuilder) {
 		this.extensions = ArrayUtils.add( this.extensions, extensionBuilder.build());
 		return this;
 	}