diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java index 412655b8dc8b..2bc3b8cc40b0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java @@ -598,7 +598,6 @@ private void flattenContent(Content content, String name) { gatherInlineModels(schema, schemaName); if (isModelNeeded(schema)) { // If this schema should be split into its own model, do so - //Schema refSchema = this.makeSchema(schemaName, schema); mediaType.setSchema(this.makeSchemaInComponents(schemaName, schema)); } } @@ -806,29 +805,6 @@ private void flattenComponents() { } } - /** - * This function fix models that are string (mostly enum). Before this fix, the - * example would look something like that in the doc: "\"example from def\"" - * - * @param m Schema implementation - */ - private void fixStringModel(Schema m) { - if (schemaIsOfType(m, "string") && schemaContainsExample(m)) { - String example = m.getExample().toString(); - if (example.startsWith("\"") && example.endsWith("\"")) { - m.setExample(example.substring(1, example.length() - 1)); - } - } - } - - private boolean schemaIsOfType(Schema m, String type) { - return m.getType() != null && m.getType().equals(type); - } - - private boolean schemaContainsExample(Schema m) { - return m.getExample() != null && m.getExample() != ""; - } - /** * Generates a unique model name. Non-alphanumeric characters will be replaced * with underscores @@ -1143,19 +1119,6 @@ private Schema makeSchemaInComponents(String name, Schema schema) { return refSchema; } - /** - * Make a Schema - * - * @param ref new property name - * @param property Schema - * @return {@link Schema} A constructed OpenAPI property - */ - private Schema makeSchema(String ref, Schema property) { - Schema newProperty = new Schema().$ref(ref); - this.copyVendorExtensions(property, newProperty); - return newProperty; - } - /** * Copy vendor extensions from Model to another Model * diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java index 4762205e7e1b..49b19cf44a52 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java @@ -51,7 +51,6 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg // Common media types. private static final String APPLICATION_XML = "application/xml"; private static final String TEXT_XML = "text/xml"; - private static final String APPLICATION_OCTET_STREAM = "application/octet-stream"; private static final String TEXT_PLAIN = "text/plain"; private static final String APPLICATION_JSON = "application/json"; private static final String APPLICATION_X_WWW_FORM_URLENCODED = "application/x-www-form-urlencoded"; @@ -1208,10 +1207,6 @@ private boolean isMimetypeMultipartFormData(String mimetype) { return mimetype.toLowerCase(Locale.ROOT).startsWith("multipart/form-data"); } - private boolean isMimetypeOctetStream(String mimetype) { - return mimetype.toLowerCase(Locale.ROOT).startsWith(APPLICATION_OCTET_STREAM); - } - private boolean isMimetypeMultipartRelated(String mimetype) { return mimetype.toLowerCase(Locale.ROOT).startsWith("multipart/related"); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java index 8d19e01fb870..1f0c5948fb7b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.languages; -import com.google.common.base.Strings; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.MapSchema; import io.swagger.v3.oas.models.media.Schema; @@ -472,33 +471,6 @@ public ModelsMap postProcessModels(ModelsMap objs) { return postProcessModelsEnum(objs); } - /* the following function is not used anywhere in this class so we'll remove it later - private static String getAccept(Operation operation) { - String accepts = null; - String defaultContentType = "application/json"; - if (operation.getProduces() != null && !operation.getProduces().isEmpty()) { - StringBuilder sb = new StringBuilder(); - for (String produces : operation.getProduces()) { - if (defaultContentType.equalsIgnoreCase(produces)) { - accepts = defaultContentType; - break; - } else { - if (sb.length() > 0) { - sb.append(","); - } - sb.append(produces); - } - } - if (accepts == null) { - accepts = sb.toString(); - } - } else { - accepts = defaultContentType; - } - - return accepts; - }*/ - @Override protected boolean needToImport(String type) { return super.needToImport(type) && type.indexOf(".") < 0; @@ -574,21 +546,6 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation return op; } - private static String sanitizePackageName(String packageName) { - packageName = packageName.trim(); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. - packageName = packageName.replaceAll("[^a-zA-Z0-9_\\.]", "_"); - if (Strings.isNullOrEmpty(packageName)) { - return "invalidPackageName"; - } - return packageName; - } - - - private String sanitizePath(String p) { - //prefer replace a ", instead of a fuLL URL encode for readability - return p.replaceAll("\"", "%22"); - } - @Override public String toRegularExpression(String pattern) { return escapeText(pattern); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppOatppClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppOatppClientCodegen.java index 638f669828b8..e925cc7cd797 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppOatppClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppOatppClientCodegen.java @@ -272,21 +272,6 @@ private void postProcessSingleOperation(OperationMap operations, CodegenOperatio } } - /** - * postProcessSingleParam - Modifies a single parameter, adjusting generated - * data types for Header and Query parameters. - * - * @param param CodegenParameter to be modified. - */ - private static void postProcessSingleParam(CodegenParameter param) { - if (param.isQueryParam) { - param.dataType = "std::optional<" + param.dataType + ">"; - if (!param.isPrimitiveType) { - param.baseType = "std::optional<" + param.baseType + ">"; - } - } - } - @Override public String toModelFilename(String name) { return toModelName(name); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppOatppServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppOatppServerCodegen.java index c65dbce49798..650cba3c5c7e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppOatppServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppOatppServerCodegen.java @@ -275,21 +275,6 @@ private void postProcessSingleOperation(OperationMap operations, CodegenOperatio } } - /** - * postProcessSingleParam - Modifies a single parameter, adjusting generated - * data types for Header and Query parameters. - * - * @param param CodegenParameter to be modified. - */ - private static void postProcessSingleParam(CodegenParameter param) { - if (param.isQueryParam) { - param.dataType = "std::optional<" + param.dataType + ">"; - if (!param.isPrimitiveType) { - param.baseType = "std::optional<" + param.baseType + ">"; - } - } - } - @Override public String toModelFilename(String name) { return toModelName(name); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java index 73ea654d0a31..aa0fdc53f838 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptApolloClientCodegen.java @@ -861,12 +861,6 @@ public CodegenModel fromModel(String name, Schema model) { return codegenModel; } - /* - private String sanitizePath(String p) { - //prefer replace a ', instead of a fuLL URL encode for readability - return p.replaceAll("'", "%27"); - }*/ - private String trimBrackets(String s) { if (s != null) { int beginIdx = s.charAt(0) == '[' ? 1 : 0; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java index d26f88fc7c5e..7f6bef3837d1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java @@ -892,12 +892,6 @@ public CodegenModel fromModel(String name, Schema model) { return codegenModel; } - /* - private String sanitizePath(String p) { - //prefer replace a ', instead of a fuLL URL encode for readability - return p.replaceAll("'", "%27"); - }*/ - private String trimBrackets(String s) { if (s != null) { int beginIdx = s.charAt(0) == '[' ? 1 : 0; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java index de6aaed2c329..0264f3cebc7b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java @@ -856,10 +856,6 @@ private boolean isKtor() { return Constants.KTOR.equals(library); } - private boolean isKtor2() { - return Constants.KTOR2.equals(library); - } - /** Computes the longest common path prefix shared by all operations. */ private static String computeCommonPath(List ops) { String commonPath = null; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java index 73907fbd09f4..ed7cf68f2baf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java @@ -80,7 +80,6 @@ public class RustServerCodegen extends AbstractRustCodegen implements CodegenCon private static final String xmlMimeType = "application/xml"; private static final String textXmlMimeType = "text/xml"; - private static final String octetMimeType = "application/octet-stream"; private static final String plainTextMimeType = "text/plain"; private static final String jsonMimeType = "application/json"; @@ -429,10 +428,6 @@ private boolean isMimetypeMultipartFormData(String mimetype) { return mimetype.toLowerCase(Locale.ROOT).startsWith("multipart/form-data"); } - private boolean isMimetypeOctetStream(String mimetype) { - return mimetype.toLowerCase(Locale.ROOT).startsWith(octetMimeType); - } - private boolean isMimetypeMultipartRelated(String mimetype) { return mimetype.toLowerCase(Locale.ROOT).startsWith("multipart/related"); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegenDeprecated.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegenDeprecated.java index 2d817efc47ce..16233fc7eddf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegenDeprecated.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegenDeprecated.java @@ -417,10 +417,6 @@ private boolean isMimetypeMultipartFormData(String mimetype) { return mimetype.toLowerCase(Locale.ROOT).startsWith("multipart/form-data"); } - private boolean isMimetypeOctetStream(String mimetype) { - return mimetype.toLowerCase(Locale.ROOT).startsWith(octetMimeType); - } - private boolean isMimetypeMultipartRelated(String mimetype) { return mimetype.toLowerCase(Locale.ROOT).startsWith("multipart/related"); }