Skip to content

[DEVTOOLING-1367] Java SDK - Manage java.time.Duration and reserved words for model names #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2025
Merged

[DEVTOOLING-1367] Java SDK - Manage java.time.Duration and reserved words for model names #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions ...enerator/src/main/java/org/openapitools/codegen/languages/PureCloudJavaClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public class PureCloudJavaClientCodegen extends JavaClientCodegen {

protected Logger LOGGER = LoggerFactory.getLogger(PureCloudJavaClientCodegen.class);

protected Set<String> reservedModelNames;

public PureCloudJavaClientCodegen() {
super();

Expand All @@ -42,6 +44,7 @@ public PureCloudJavaClientCodegen() {
importMapping.put("HashMap", "java.util.HashMap");
importMapping.put("Map", "java.util.Map");
importMapping.put("BigDecimal", "java.math.BigDecimal");
importMapping.put("Duration", "java.time.Duration");

// Type overrides
typeMapping.put("date", "LocalDate");
Expand All @@ -54,6 +57,11 @@ public PureCloudJavaClientCodegen() {
reservedWords.add("null");
reservedWords.add("request");

// Add special reserved words for Model Names
reservedModelNames = new HashSet<String>();
reservedModelNames.add("configuration");
reservedModelNames.add("case");

operationTemplateFiles.put("requestBuilder.mustache", ".java");
//supportingFiles.add(new SupportingFile("testng.mustache", "", "testng.xml"));
apiDocTemplateFiles.put("api_json.mustache", ".json");
Expand Down Expand Up @@ -267,6 +275,9 @@ public CodegenModel fromModel(String name, Schema schema) {

Set<String> imports = new HashSet<>();
for (String im : codegenModel.imports) {
if (im != null && reservedModelNames.contains(im.toLowerCase(Locale.ROOT))) {
im = "Model" + im;
}
imports.add(im.replaceAll("_+$", ""));
}
codegenModel.imports = imports;
Expand All @@ -280,6 +291,37 @@ public CodegenModel fromModel(String name, Schema schema) {
var.defaultValue = var.defaultValue
.replaceAll("_+$", "")
.replaceAll("_+(>)", "$1");

if (var.datatypeWithEnum != null && reservedModelNames.contains(var.datatypeWithEnum.toLowerCase(Locale.ROOT))) {
var.datatypeWithEnum = "Model" + var.datatypeWithEnum;
if (var.dataType != null && reservedModelNames.contains(var.dataType.toLowerCase(Locale.ROOT))) {
var.dataType = "Model" + var.dataType;
}
}

if (var.datatypeWithEnum.startsWith("List<")) {
String eltEnumName = var.datatypeWithEnum.substring(5, var.datatypeWithEnum.length() - 1);
if (eltEnumName != null && reservedModelNames.contains(eltEnumName.toLowerCase(Locale.ROOT))) {
var.datatypeWithEnum = "List<" + "Model" + eltEnumName + ">";
if (var.defaultValue != null) {
var.defaultValue = var.defaultValue.replace("<" + eltEnumName + ">", "<" + "Model" + eltEnumName + ">");
}
String eltName = var.dataType.substring(5, var.dataType.length() - 1);
if (eltName != null && reservedModelNames.contains(eltName.toLowerCase(Locale.ROOT))) {
var.dataType = "List<" + "Model" + eltName + ">";
}
}
}
if (var.datatypeWithEnum.startsWith("Map<String, ")) {
String eltEnumName = var.datatypeWithEnum.substring(12, var.datatypeWithEnum.length() - 1);
if (eltEnumName != null && reservedModelNames.contains(eltEnumName.toLowerCase(Locale.ROOT))) {
var.datatypeWithEnum = "Map<String, " + "Model" + eltEnumName + ">";
String eltName = var.dataType.substring(12, var.dataType.length() - 1);
if (eltName != null && reservedModelNames.contains(eltName.toLowerCase(Locale.ROOT))) {
var.dataType = "Map<String, " + "Model" + eltName + ">";
}
}
}
}

for (String s : Arrays.asList("pageSize","pageNumber","total","selfUri","firstUri","previousUri","nextUri","lastUri","pageCount", "entities")) {
Expand Down