@@ -456,33 +456,9 @@ public String toModelName(String name) {
456456
457457 @ Override
458458 public String toModelFilename (String name ) {
459- name = sanitizeName (name ); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
460- // remove dollar sign
461- name = name .replaceAll ("$" , "" );
462- 463- // model name cannot use reserved keyword, e.g. return
464- if (isReservedWord (name )) {
465- LOGGER .warn (name + " (reserved word) cannot be used as model filename. Renamed to " + underscore (dropDots ("model_" + name )));
466- name = "model_" + name ; // e.g. return => ModelReturn (after camelize)
467- }
468- 469- // model name starts with number
470- if (name .matches ("^\\ d.*" )) {
471- LOGGER .warn (name + " (model name starts with number) cannot be used as model name. Renamed to " + underscore ("model_" + name ));
472- name = "model_" + name ; // e.g. 200Response => Model200Response (after camelize)
473- }
474- 475- if (!StringUtils .isEmpty (modelNamePrefix )) {
476- name = modelNamePrefix + "_" + name ;
477- }
478- 479- if (!StringUtils .isEmpty (modelNameSuffix )) {
480- name = name + "_" + modelNameSuffix ;
481- }
482- 483459 // underscore the model file name
484460 // PhoneNumber => phone_number
485- return underscore (dropDots (name ));
461+ return underscore (dropDots (toModelName ( name ) ));
486462 }
487463
488464 @ Override
0 commit comments