From aeb397056256ccad5243f421ec31d78fdf81d1ab Mon Sep 17 00:00:00 2001 From: William Cheng <wing328hk@gmail.com> Date: Fri, 3 Feb 2023 20:55:18 +0800 Subject: [PATCH] beter code format --- .../languages/AbstractJavaCodegen.java | 23 +++++++++++-------- .../codegen/languages/JavaClientCodegen.java | 6 ++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 8a2fdf7aa89..a0a59aced6d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -979,7 +979,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code * Return null if there's no default value. * Any non-null value will cause {{#defaultValue} check to pass. * - * @param cp Codegen property + * @param cp Codegen property * @param schema Property schema * @return string presentation of the default value of the property */ @@ -1163,11 +1163,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code if (defaultValue instanceof ArrayNode) { ArrayNode array = (ArrayNode) defaultValue; return StreamSupport.stream(array.spliterator(), false) - .map(JsonNode::toString) - // remove wrapper quotes - .map(item -> StringUtils.removeStart(item, "\"")) - .map(item -> StringUtils.removeEnd(item, "\"")) - .collect(Collectors.joining(",")); + .map(JsonNode::toString) + // remove wrapper quotes + .map(item -> StringUtils.removeStart(item, "\"")) + .map(item -> StringUtils.removeEnd(item, "\"")) + .collect(Collectors.joining(",")); } } // escape quotes @@ -2231,8 +2231,9 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code /** * Search for property by {@link CodegenProperty#name} - * @param name - name to search for - * @param properties - list of properties + * + * @param name name to search for + * @param properties list of properties * @return either found property or {@link Optional#empty()} if nothing has been found */ protected Optional<CodegenProperty> findByName(String name, List<CodegenProperty> properties) { @@ -2241,8 +2242,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code } return properties.stream() - .filter(p -> p.name.equals(name)) - .findFirst(); + .filter(p -> p.name.equals(name)) + .findFirst(); } /** @@ -2284,6 +2285,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code } } } + @Override public List<VendorExtension> getSupportedVendorExtensions() { List<VendorExtension> extensions = super.getSupportedVendorExtensions(); @@ -2309,6 +2311,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code } return addImports; } + public static void addImports(List<Map<String, String>> imports, CodegenModel cm, Map<String, String> imports2Classnames) { for (Map.Entry<String, String> entry : imports2Classnames.entrySet()) { cm.imports.add(entry.getKey()); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index ed68cc92997..39255711a97 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -65,7 +65,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen public static final String USE_REFLECTION_EQUALS_HASHCODE = "useReflectionEqualsHashCode"; public static final String CASE_INSENSITIVE_RESPONSE_HEADERS = "caseInsensitiveResponseHeaders"; public static final String MICROPROFILE_FRAMEWORK = "microprofileFramework"; - public static final String MICROPROFILE_MUTINY = "microprofileMutiny"; + public static final String MICROPROFILE_MUTINY = "microprofileMutiny"; public static final String USE_ABSTRACTION_FOR_FILES = "useAbstractionForFiles"; public static final String DYNAMIC_OPERATIONS = "dynamicOperations"; public static final String SUPPORT_STREAMING = "supportStreaming"; @@ -983,7 +983,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen } // TODO: inverse logic. Do not add the imports unconditionally in the first place. - if (! AnnotationLibrary.SWAGGER1.equals(getAnnotationLibrary())) { + if (!AnnotationLibrary.SWAGGER1.equals(getAnnotationLibrary())) { // Remove io.swagger.annotations.* imports codegenModel.imports.remove("ApiModel"); codegenModel.imports.remove("ApiModelProperty"); @@ -1139,7 +1139,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen this.microprofileMutiny = microprofileMutiny; } - public void setConfigKey(String configKey) { + public void setConfigKey(String configKey) { this.configKey = configKey; } -- GitLab