Skip to content

Modify java generator to not use joda time anymore. #27

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

Open
sbrossie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modify java generator to not use joda time anymore. #27

Show file tree
Hide file tree
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
32 changes: 20 additions & 12 deletions src/main/java/org/killbill/billing/codegen/languages/KillbillJavaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ public void processOpts() {

typeMapping.put("array", "List");
typeMapping.put("map", "Map");
typeMapping.put("date", "LocalDate");
typeMapping.put("DateTime", "ZonedDateTime");

typeMapping.put("file", "java.io.File");

Expand All @@ -128,8 +130,8 @@ public void processOpts() {
importMapping.put("List", "java.util.List");
importMapping.put("LinkedList", "java.util.LinkedList");
importMapping.put("ArrayList", "java.util.ArrayList");
importMapping.put("DateTime", "org.joda.time.DateTime");
importMapping.put("LocalDate", "org.joda.time.LocalDate");
importMapping.put("ZonedDateTime", "java.time.ZonedDateTime");
importMapping.put("LocalDate", "java.time.LocalDate");
importMapping.put("BigDecimal", "java.math.BigDecimal");
importMapping.put("HashMap", "java.util.HashMap");
importMapping.put("Map", "java.util.Map");
Expand Down Expand Up @@ -217,17 +219,18 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
addAllImportsIfRequired(ext, imports);
convertToExtendedCodegenParam(ext, imports);
if (shouldAddDateTimeMethod(op)) {
addImportIfRequired(imports, "org.joda.time.DateTime");
addImportIfRequired(imports, "org.joda.time.LocalDate");
addImportIfRequired(imports, "java.time.ZonedDateTime");
addImportIfRequired(imports, "java.time.LocalDate");
final ExtendedCodegenOperation ext2 = new ExtendedCodegenOperation(op);
addAllImportsIfRequired(ext2, imports);
List<CodegenParameter> allParams = ext2.allParams;
for (CodegenParameter parameter : allParams) {
if (isDateParameter(parameter)) {
parameter.dataFormat = "date-time";
parameter.isDate = false;
parameter.isDateTime = true;
parameter.dataType = "DateTime";
for (List<CodegenParameter> paramList : Arrays.asList(ext2.allParams, ext2.queryParams)) {
for (CodegenParameter parameter : paramList) {
if (isDateParameter(parameter)) {
parameter.dataFormat = "date-time";
parameter.isDate = false;
parameter.isDateTime = true;
parameter.dataType = "ZonedDateTime";
}
}
}
convertToExtendedCodegenParam(ext2, imports);
Expand Down Expand Up @@ -444,7 +447,12 @@ private ExtendedCodegenOperation(CodegenOperation o) {
returnContainer.equals("array") && this.returnBaseType != null;

if (isReturnModelRefContainer) {
this.returnType = String.format("%ss", this.returnBaseType);
// ZonedDateTime wrapper class is still called DateTimes (hand-maintained)
if ("ZonedDateTime".equals(this.returnBaseType)) {
this.returnType = "DateTimes";
} else {
this.returnType = String.format("%ss", this.returnBaseType);
}
}
this.isStream = produces != null && !produces.isEmpty() && produces.get(0).get("mediaType").equals("application/octet-stream");
this.hasNonRequiredDefaultQueryParams = this.queryParams
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/killbill-java/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import java.util.Objects;
{{#imports}}import {{import}};
{{/imports}}

import java.time.format.DateTimeFormatter;

import org.killbill.billing.client.Converter;
import org.killbill.billing.client.KillBillClientException;
import org.killbill.billing.client.KillBillHttpClient;
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/killbill-java/api_query.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@
{{/isMapContainer}}
{{^isMapContainer}}
if ({{paramName}} != null) {
{{#isDateTime}}
queryParams.put("{{baseName}}", DateTimeFormatter.ISO_OFFSET_DATE_TIME.format({{paramName}}));
{{/isDateTime}}
{{^isDateTime}}
queryParams.put("{{baseName}}", String.valueOf({{paramName}}));
{{/isDateTime}}
}
{{/isMapContainer}}
{{/isListContainer}}
Expand Down