Skip to content

Commit 0f5fd3a

Browse files
jimschubertjimschubert
committed
[breaking] Enforce vendor extension naming convention
1 parent 2dd5477 commit 0f5fd3a

30 files changed

+52
-410
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -456,13 +456,6 @@ public CodegenModel fromModel(String name, Schema model) {
456456
}
457457
}
458458

459-
// TODO: 5.0: Remove this block and ensure templates use the newer property naming.
460-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
461-
cm.vendorExtensions.put("hasPropertyMappings", !propertyMappings.isEmpty()); // TODO: 5.0 Remove
462-
cm.vendorExtensions.put("hasDefaultValues", hasDefaultValues); // TODO: 5.0 Remove
463-
cm.vendorExtensions.put("propertyMappings", propertyMappings); // TODO: 5.0 Remove
464-
465-
466459
cm.vendorExtensions.put("x-has-property-mappings", !propertyMappings.isEmpty());
467460
cm.vendorExtensions.put("x-has-default-values", hasDefaultValues);
468461
cm.vendorExtensions.put("x-property-mappings", propertyMappings);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,14 +590,11 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
590590
* @param models list of all models
591591
*/
592592
protected void updateValueTypeProperty(Map<String, Object> models) {
593-
// TODO: 5.0: Remove the camelCased vendorExtension within the below loop and ensure templates use the newer property naming.
594-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
595593
for (Map.Entry<String, Object> entry : models.entrySet()) {
596594
String openAPIName = entry.getKey();
597595
CodegenModel model = ModelUtils.getModelByName(openAPIName, models);
598596
if (model != null) {
599597
for (CodegenProperty var : model.vars) {
600-
var.vendorExtensions.put("isValueType", isValueType(var)); // TODO: 5.0 Remove
601598
var.vendorExtensions.put("x-is-value-type", isValueType(var));
602599
}
603600
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,19 +235,14 @@ public void postProcessParameter(CodegenParameter parameter) {
235235

236236
char firstChar = parameter.paramName.charAt(0);
237237

238-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
239-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
240-
241238
if (Character.isUpperCase(firstChar)) {
242239
// First char is already uppercase, just use paramName.
243-
parameter.vendorExtensions.put("x-exportParamName", parameter.paramName); // TODO: 5.0 Remove
244240
parameter.vendorExtensions.put("x-export-param-name", parameter.paramName);
245241
}
246242

247243
// It's a lowercase first char, let's convert it to uppercase
248244
StringBuilder sb = new StringBuilder(parameter.paramName);
249245
sb.setCharAt(0, Character.toUpperCase(firstChar));
250-
parameter.vendorExtensions.put("x-exportParamName", sb.toString()); // TODO: 5.0 Remove
251246
parameter.vendorExtensions.put("x-export-param-name", sb.toString());
252247
}
253248

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -457,9 +457,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
457457
@SuppressWarnings("unchecked")
458458
List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
459459

460-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
461-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
462-
463460
for (CodegenOperation operation : operations) {
464461
// http method verb conversion (e.g. PUT => Put)
465462
operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
@@ -525,12 +522,10 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
525522

526523
// We need to specially map Time type to the optionals package
527524
if ("time.Time".equals(param.dataType)) {
528-
param.vendorExtensions.put("x-optionalDataType", "Time"); // TODO: 5.0 Remove
529525
param.vendorExtensions.put("x-optional-data-type", "Time");
530526
} else {
531527
// Map optional type to dataType
532528
String optionalType = param.dataType.substring(0, 1).toUpperCase(Locale.ROOT) + param.dataType.substring(1);
533-
param.vendorExtensions.put("x-optionalDataType", optionalType); // TODO: 5.0 Remove
534529
param.vendorExtensions.put("x-optional-data-type", optionalType);
535530
}
536531
}
@@ -539,13 +534,11 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
539534
char nameFirstChar = param.paramName.charAt(0);
540535
if (Character.isUpperCase(nameFirstChar)) {
541536
// First char is already uppercase, just use paramName.
542-
param.vendorExtensions.put("x-exportParamName", param.paramName); // TODO: 5.0 Remove
543537
param.vendorExtensions.put("x-export-param-name", param.paramName);
544538
} else {
545539
// It's a lowercase first char, let's convert it to uppercase
546540
StringBuilder sb = new StringBuilder(param.paramName);
547541
sb.setCharAt(0, Character.toUpperCase(nameFirstChar));
548-
param.vendorExtensions.put("x-exportParamName", sb.toString()); // TODO: 5.0 Remove
549542
param.vendorExtensions.put("x-export-param-name", sb.toString());
550543
}
551544
}
@@ -579,21 +572,15 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
579572
}
580573

581574
private void setExportParameterName(List<CodegenParameter> codegenParameters) {
582-
583-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
584-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
585-
586575
for (CodegenParameter param : codegenParameters) {
587576
char nameFirstChar = param.paramName.charAt(0);
588577
if (Character.isUpperCase(nameFirstChar)) {
589578
// First char is already uppercase, just use paramName.
590-
param.vendorExtensions.put("x-exportParamName", param.paramName); // TODO: 5.0 Remove
591579
param.vendorExtensions.put("x-export-param-name", param.paramName);
592580
} else {
593581
// It's a lowercase first char, let's convert it to uppercase
594582
StringBuilder sb = new StringBuilder(param.paramName);
595583
sb.setCharAt(0, Character.toUpperCase(nameFirstChar));
596-
param.vendorExtensions.put("x-exportParamName", sb.toString()); // TODO: 5.0 Remove
597584
param.vendorExtensions.put("x-export-param-name", sb.toString());
598585
}
599586
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,12 +1024,7 @@ public CodegenModel fromModel(String name, Schema model) {
10241024
public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
10251025
if (serializeBigDecimalAsString) {
10261026
if (property.baseType.equals("BigDecimal")) {
1027-
1028-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
1029-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
1030-
10311027
// we serialize BigDecimal as `string` to avoid precision loss
1032-
property.vendorExtensions.put("extraAnnotation", "@JsonSerialize(using = ToStringSerializer.class)"); // TODO: 5.0 Remove
10331028
property.vendorExtensions.put("x-extra-annotation", "@JsonSerialize(using = ToStringSerializer.class)");
10341029

10351030
// this requires some more imports to be added for this model...

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -675,14 +675,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
675675
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
676676
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
677677
List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
678-
679-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
680-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
681-
682678
for (CodegenOperation op : operationList) {
683679
// for API test method name
684680
// e.g. public function test{{vendorExtensions.x-testOperationId}}()
685-
op.vendorExtensions.put("x-testOperationId", camelize(op.operationId)); // TODO: 5.0 Remove
686681
op.vendorExtensions.put("x-test-operation-id", camelize(op.operationId));
687682
}
688683
return objs;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
9696
List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
9797
List<CodegenOperation> newOpList = new ArrayList<CodegenOperation>();
9898

99-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
100-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
101-
10299
for (CodegenOperation op : operationList) {
103100
String path = op.path;
104101

@@ -111,7 +108,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
111108
splitPath.add(item);
112109
op.path += item + "/";
113110
}
114-
op.vendorExtensions.put("x-codegen-userInfoPath", userInfoPath); // TODO: 5.0 Remove
115111
op.vendorExtensions.put("x-codegen-user-info-path", userInfoPath);
116112
boolean foundInNewList = false;
117113
for (CodegenOperation op1 : newOpList) {
@@ -124,7 +120,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
124120
}
125121
op.operationIdCamelCase = op1.operationIdCamelCase;
126122
currentOtherMethodList.add(op);
127-
op1.vendorExtensions.put("x-codegen-otherMethods", currentOtherMethodList); // TODO: 5.0 Remove
128123
op1.vendorExtensions.put("x-codegen-other-methods", currentOtherMethodList);
129124
}
130125
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
4747
private static final String PROJECT_LICENSE_URL = "projectLicenseUrl";
4848
private static final String BASE_NAMESPACE = "baseNamespace";
4949

50-
static final String X_BASE_SPEC = "x-baseSpec"; // TODO: 5.0 Remove
5150
static final String VENDOR_EXTENSION_X_BASE_SPEC = "x-base-spec";
5251
static final String X_MODELS = "x-models";
5352

@@ -202,16 +201,10 @@ public String toModelName(String name) {
202201
@Override
203202
public CodegenModel fromModel(String name, Schema mod) {
204203
CodegenModel model = super.fromModel(name, mod);
205-
206-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
207-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
208-
209204
// If a var is a base spec we won't need to import it
210205
for (CodegenProperty var : model.vars) {
211-
var.vendorExtensions.put(X_BASE_SPEC, baseSpecs.contains(var.complexType)); // TODO: 5.0 Remove
212206
var.vendorExtensions.put(VENDOR_EXTENSION_X_BASE_SPEC, baseSpecs.contains(var.complexType));
213207
if (var.items != null) {
214-
var.items.vendorExtensions.put(X_BASE_SPEC, baseSpecs.contains(var.items.complexType)); // TODO: 5.0 Remove
215208
var.items.vendorExtensions.put(VENDOR_EXTENSION_X_BASE_SPEC, baseSpecs.contains(var.items.complexType));
216209
}
217210
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
253253
String classname = (String) operations.get("classname");
254254
operations.put("classnameSnakeUpperCase", underscore(classname).toUpperCase(Locale.ROOT));
255255
operations.put("classnameSnakeLowerCase", underscore(classname).toLowerCase(Locale.ROOT));
256-
257-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
258-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
259-
260256
List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
261257
for (CodegenOperation op : operationList) {
262258
boolean consumeJson = false;
@@ -267,7 +263,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
267263
}
268264

269265
boolean isStringOrDate = op.bodyParam.isString || op.bodyParam.isDate;
270-
op.bodyParam.vendorExtensions.put("x-codegen-pistache-isStringOrDate", isStringOrDate); // TODO: 5.0 Remove
271266
op.bodyParam.vendorExtensions.put("x-codegen-pistache-is-string-or-date", isStringOrDate);
272267
}
273268
if (op.consumes != null) {
@@ -302,9 +297,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
302297
if (op.vendorExtensions == null) {
303298
op.vendorExtensions = new HashMap<>();
304299
}
305-
op.vendorExtensions.put("x-codegen-pistache-consumesJson", consumeJson); // TODO: 5.0 Remove
306300
op.vendorExtensions.put("x-codegen-pistache-consumes-json", consumeJson);
307-
op.vendorExtensions.put("x-codegen-pistache-isParsingSupported", isParsingSupported); // TODO: 5.0 Remove
308301
op.vendorExtensions.put("x-codegen-pistache-is-parsing-supported", isParsingSupported);
309302

310303
// Check if any one of the operations needs a model, then at API file level, at least one model has to be included.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
287287
List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
288288
List<CodegenOperation> newOpList = new ArrayList<CodegenOperation>();
289289

290-
// TODO: 5.0: Remove the camelCased vendorExtension below and ensure templates use the newer property naming.
291-
once(LOGGER).warn("4.3.0 has deprecated the use of vendor extensions which don't follow lower-kebab casing standards with x- prefix.");
292-
293290
for (CodegenOperation op : operationList) {
294291
String path = op.path;
295292

@@ -311,7 +308,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
311308
}
312309
op.path += item + "/";
313310
}
314-
op.vendorExtensions.put("x-codegen-resourceName", resourceNameCamelCase); // TODO: 5.0 Remove
315311
op.vendorExtensions.put("x-codegen-resource-name", resourceNameCamelCase);
316312

317313
boolean foundInNewList = false;
@@ -325,7 +321,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
325321
}
326322
op.operationIdCamelCase = op1.operationIdCamelCase;
327323
currentOtherMethodList.add(op);
328-
op1.vendorExtensions.put("x-codegen-otherMethods", currentOtherMethodList); // TODO: 5.0 Remove
329324
op1.vendorExtensions.put("x-codegen-other-methods", currentOtherMethodList);
330325
}
331326
}

0 commit comments

Comments
 (0)