Skip to content

Commit 9650179

Browse files
Mattias-SehlstedtMattias-Sehlstedt
committed
Move the Codegen vendor extensions into CodegenConstants
1 parent 3ed73ea commit 9650179

6 files changed

Lines changed: 20 additions & 36 deletions

File tree

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,4 +456,7 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
456456
public static final String USE_DEFAULT_VALUES_FOR_REQUIRED_VARS = "useDefaultValuesForRequiredVars";
457457

458458
public static final String DEFAULT_TO_EMPTY_CONTAINER = "defaultToEmptyContainer";
459+
460+
public static final String X_INTERNAL = "x-internal";
461+
public static final String X_PARENT = "x-parent";
459462
}

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenVendorExtension.java‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@
8888
import java.util.stream.Collectors;
8989
import java.util.stream.Stream;
9090

91-
import static org.openapitools.codegen.CodegenConstants.DEFAULT_TO_EMPTY_CONTAINER;
92-
import static org.openapitools.codegen.CodegenConstants.UNSUPPORTED_V310_SPEC_MSG;
93-
import static org.openapitools.codegen.CodegenVendorExtension.X_INTERNAL;
91+
import static org.openapitools.codegen.CodegenConstants.*;
9492
import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
9593
import static org.openapitools.codegen.utils.OnceLogger.once;
9694
import static org.openapitools.codegen.utils.StringUtils.*;
@@ -5198,7 +5196,7 @@ public CodegenCallback fromCallback(String name, Callback callback, List<Server>
51985196
String method = p.getKey();
51995197
Operation op = p.getValue();
52005198

5201-
if (op.getExtensions() != null && Boolean.TRUE.equals(op.getExtensions().get(X_INTERNAL.getName()))) {
5199+
if (op.getExtensions() != null && Boolean.TRUE.equals(op.getExtensions().get(X_INTERNAL))) {
52025200
// skip operation if x-internal sets to true
52035201
LOGGER.info("Operation ({} {} - {}) not generated since x-internal is set to true",
52045202
method, expression, op.getOperationId());

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
import java.util.stream.Collectors;
6262

6363
import static org.apache.commons.lang3.StringUtils.removeStart;
64-
import static org.openapitools.codegen.CodegenVendorExtension.X_INTERNAL;
64+
import static org.openapitools.codegen.CodegenConstants.X_INTERNAL;
6565
import static org.openapitools.codegen.utils.OnceLogger.once;
6666

6767
@SuppressWarnings("rawtypes")
@@ -487,7 +487,7 @@ void generateModels(List<File> files, List<ModelMap> allModels, List<String> unu
487487

488488
Schema schema = ModelUtils.getSchemas(this.openAPI).get(name);
489489

490-
if (schema.getExtensions() != null && Boolean.TRUE.equals(schema.getExtensions().get(X_INTERNAL.getName()))) {
490+
if (schema.getExtensions() != null && Boolean.TRUE.equals(schema.getExtensions().get(X_INTERNAL))) {
491491
LOGGER.info("Model {} not generated since x-internal is set to true", name);
492492
continue;
493493
} else if (ModelUtils.isFreeFormObject(schema, openAPI)) { // check to see if it's a free-form object
@@ -1565,7 +1565,7 @@ private void processOperation(String resourcePath, String httpMethod, Operation
15651565
final List<SecurityRequirement> globalSecurities = openAPI.getSecurity();
15661566
for (Tag tag : tags) {
15671567
try {
1568-
if (operation.getExtensions() != null && Boolean.TRUE.equals(operation.getExtensions().get(X_INTERNAL.getName()))) {
1568+
if (operation.getExtensions() != null && Boolean.TRUE.equals(operation.getExtensions().get(X_INTERNAL))) {
15691569
// skip operation if x-internal sets to true
15701570
LOGGER.info("Operation ({} {} - {}) not generated since x-internal is set to true",
15711571
httpMethod, resourcePath, operation.getOperationId());

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import java.util.function.Function;
3838
import java.util.stream.Collectors;
3939

40-
import static org.openapitools.codegen.CodegenVendorExtension.X_INTERNAL;
41-
import static org.openapitools.codegen.CodegenVendorExtension.X_PARENT;
40+
import static org.openapitools.codegen.CodegenConstants.X_INTERNAL;
41+
import static org.openapitools.codegen.CodegenConstants.X_PARENT;
4242
import static org.openapitools.codegen.utils.ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema;
4343
import static org.openapitools.codegen.utils.StringUtils.getUniqueString;
4444

@@ -432,17 +432,17 @@ protected void normalizePaths() {
432432
for (Operation operation : operations) {
433433
if (operationIdFilters.size() > 0) {
434434
if (operationIdFilters.contains(operation.getOperationId())) {
435-
operation.addExtension(X_INTERNAL.getName(), false);
435+
operation.addExtension(X_INTERNAL, false);
436436
} else {
437437
LOGGER.info("operation `{}` marked as internal only (x-internal: true) by the operationId FILTER", operation.getOperationId());
438-
operation.addExtension(X_INTERNAL.getName(), true);
438+
operation.addExtension(X_INTERNAL, true);
439439
}
440440
} else if (!tagFilters.isEmpty()) {
441441
if (operation.getTags().stream().anyMatch(tagFilters::contains)) {
442-
operation.addExtension(X_INTERNAL.getName(), false);
442+
operation.addExtension(X_INTERNAL, false);
443443
} else {
444444
LOGGER.info("operation `{}` marked as internal only (x-internal: true) by the tag FILTER", operation.getOperationId());
445-
operation.addExtension(X_INTERNAL.getName(), true);
445+
operation.addExtension(X_INTERNAL, true);
446446
}
447447
}
448448

@@ -1084,10 +1084,10 @@ protected void processUseAllOfRefAsParent(Schema schema) {
10841084
refSchema.setExtensions(new HashMap<>());
10851085
}
10861086

1087-
if (refSchema.getExtensions().containsKey(X_PARENT.getName())) {
1087+
if (refSchema.getExtensions().containsKey(X_PARENT)) {
10881088
// doing nothing as x-parent already exists
10891089
} else {
1090-
refSchema.getExtensions().put(X_PARENT.getName(), true);
1090+
refSchema.getExtensions().put(X_PARENT, true);
10911091
}
10921092

10931093
LOGGER.debug("processUseAllOfRefAsParent added `x-parent: true` to {}", refSchema);
@@ -1109,8 +1109,8 @@ protected void processRemoveXInternalFromOperation(Operation operation) {
11091109
return;
11101110
}
11111111

1112-
if (Boolean.parseBoolean(String.valueOf(operation.getExtensions().get(X_INTERNAL.getName())))) {
1113-
operation.getExtensions().remove(X_INTERNAL.getName());
1112+
if (Boolean.parseBoolean(String.valueOf(operation.getExtensions().get(X_INTERNAL)))) {
1113+
operation.getExtensions().remove(X_INTERNAL);
11141114
}
11151115
}
11161116

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import java.util.Map.Entry;
5757
import java.util.stream.Collectors;
5858

59-
import static org.openapitools.codegen.CodegenVendorExtension.X_PARENT;
59+
import static org.openapitools.codegen.CodegenConstants.X_PARENT;
6060
import static org.openapitools.codegen.utils.OnceLogger.once;
6161

6262
public class ModelUtils {
@@ -1717,7 +1717,7 @@ public static boolean isExtensionParent(Schema schema) {
17171717
return false;
17181718
}
17191719

1720-
Object xParent = schema.getExtensions().get(X_PARENT.getName());
1720+
Object xParent = schema.getExtensions().get(X_PARENT);
17211721
if (xParent == null) {
17221722
return false;
17231723
} else if (xParent instanceof Boolean) {

0 commit comments

Comments
 (0)