@@ -454,29 +454,6 @@ public String escapeQuotationMark(String input) {
454
454
return input .replace ("\" " , "\\ \" " );
455
455
}
456
456
457
- protected String escapeRegex (String pattern ) {
458
- pattern = pattern .replaceAll ("\\ \\ \\ \\ " , "\\ \\ " );
459
- pattern = pattern .replaceAll ("^/" , "" );
460
- pattern = pattern .replaceAll ("/$" , "" );
461
- return pattern ;
462
- }
463
-
464
- /**
465
- * Convert OpenAPI Parameter object to Codegen Parameter object
466
- *
467
- * @param imports set of imports for library/package/module
468
- * @param param OpenAPI parameter object
469
- * @return Codegen Parameter object
470
- */
471
- @ Override
472
- public CodegenParameter fromParameter (Parameter param , Set <String > imports ) {
473
- CodegenParameter parameter = super .fromParameter (param , imports );
474
- if (parameter .pattern != null ) {
475
- parameter .pattern = escapeRegex (parameter .pattern );
476
- }
477
- return parameter ;
478
- }
479
-
480
457
/**
481
458
* Convert OAS Property schema to Codegen Property object.
482
459
* <p>
@@ -498,9 +475,6 @@ public CodegenProperty fromProperty(String name, Schema schema, boolean required
498
475
if (needsVarEscape (property .name )) {
499
476
property .name = "var\" " + property .name + "\" " ;
500
477
}
501
- if (property .pattern != null ) {
502
- property .pattern = escapeRegex (property .pattern );
503
- }
504
478
return property ;
505
479
}
506
480
@@ -531,6 +505,19 @@ private void changeParamNames(List<CodegenParameter> paramsList, HashSet<String>
531
505
}
532
506
}
533
507
508
+ @ Override
509
+ public String toRegularExpression (String pattern ) {
510
+ if (pattern == null ) {
511
+ return pattern ;
512
+ }
513
+
514
+ pattern = escapeText (pattern );
515
+ // escapeText unnecessarily escapes `\` such that `\.` in the regex ends up as `\\.` for example.
516
+ // we need to restore it back by converting `\\` to `\`
517
+ pattern = pattern .replaceAll ("\\ \\ \\ \\ " , "\\ \\ " );
518
+ return pattern ;
519
+ }
520
+
534
521
/**
535
522
* Convert OAS Operation object to Codegen Operation object
536
523
*
0 commit comments