This commit is contained in:
ephemera
2017-08-12 02:57:13 -07:00
committed by wing328
parent 2ebb1bcaf0
commit 11424a8cdd

View File

@@ -259,7 +259,9 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
public String toModelName(String name) {
// model name cannot use reserved keyword, e.g. return
if (isReservedWord(name)) {
throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
String modelName = camelize("Model" + name);
LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
return modelName;
}
// camelize the model name
@@ -271,7 +273,9 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
public String toModelFilename(String name) {
// model name cannot use reserved keyword, e.g. return
if (isReservedWord(name)) {
throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
String filename = underscore("model_" + name);
LOGGER.warn(name + " (reserved word) cannot be used as model filename. Renamed to " + filename);
return filename;
}
// underscore the model file name
@@ -301,7 +305,9 @@ public class Rails5ServerCodegen extends DefaultCodegen implements CodegenConfig
public String toOperationId(String operationId) {
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
String newOperationId = underscore("call_" + operationId);
LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
return newOperationId;
}
return underscore(operationId);