Skip to content

Commit c097ddc

Browse files
sbrossiesbrossie
committed
Modify java client by hand to test migration awat from joda
1 parent 1b9cd75 commit c097ddc

26 files changed

Lines changed: 133 additions & 136 deletions

‎pom.xml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
</dependency>
6060
<dependency>
6161
<groupId>com.fasterxml.jackson.datatype</groupId>
62-
<artifactId>jackson-datatype-joda</artifactId>
62+
<artifactId>jackson-datatype-jsr310</artifactId>
63+
<version>${jackson.version}</version>
6364
</dependency>
6465
<dependency>
6566
<groupId>com.github.spotbugs</groupId>
@@ -69,10 +70,6 @@
6970
<groupId>com.google.code.findbugs</groupId>
7071
<artifactId>jsr305</artifactId>
7172
</dependency>
72-
<dependency>
73-
<groupId>joda-time</groupId>
74-
<artifactId>joda-time</artifactId>
75-
</dependency>
7673
<dependency>
7774
<groupId>mysql</groupId>
7875
<artifactId>mysql-connector-java</artifactId>
@@ -125,8 +122,8 @@
125122
</filter>
126123
</filters>
127124
<transformers>
128-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
129-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
125+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
126+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
130127
<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
131128
<resources>
132129
<resource>MANIFEST.MF</resource>

‎src/main/java/org/killbill/billing/client/KillBillHttpClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
import com.fasterxml.jackson.core.JsonProcessingException;
5555
import com.fasterxml.jackson.databind.ObjectMapper;
56-
import com.fasterxml.jackson.datatype.joda.JodaModule;
56+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
5757

5858
public class KillBillHttpClient implements Closeable {
5959

@@ -172,7 +172,7 @@ public KillBillHttpClient(final String kbServerUrl,
172172
}
173173

174174
mapper = new ObjectMapper();
175-
mapper.registerModule(new JodaModule());
175+
mapper.registerModule(new JavaTimeModule());
176176
}
177177

178178
public KillBillHttpClient(final String kbServerUrl, final String username, final String password, final String apiKey, final String apiSecret) {

‎src/main/java/org/killbill/billing/client/api/gen/AccountApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.killbill.billing.client.model.gen.CustomField;
3333
import org.killbill.billing.client.model.gen.Invoice;
3434
import org.killbill.billing.client.model.gen.InvoicePayment;
35-
import org.joda.time.LocalDate;
35+
import java.time.LocalDate;
3636
import org.killbill.billing.client.model.gen.OverdueState;
3737
import org.killbill.billing.client.model.gen.Payment;
3838
import org.killbill.billing.client.model.gen.PaymentMethod;

‎src/main/java/org/killbill/billing/client/api/gen/BundleApi.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import org.killbill.billing.client.model.gen.BlockingState;
2727
import org.killbill.billing.client.model.gen.Bundle;
2828
import org.killbill.billing.client.model.gen.CustomField;
29-
import org.joda.time.LocalDate;
29+
import java.time.LocalDate;
3030
import org.killbill.billing.client.model.gen.Tag;
3131
import java.util.UUID;
3232
import org.killbill.billing.client.model.BlockingStates;
3333
import java.util.List;
3434
import java.util.Map;
35-
import org.joda.time.DateTime;
35+
import java.time.ZonedDateTime;
3636
import org.killbill.billing.client.model.CustomFields;
3737
import org.killbill.billing.client.model.Tags;
3838
import org.killbill.billing.util.api.AuditLevel;
@@ -94,7 +94,7 @@ public BlockingStates addBundleBlockingState(final UUID bundleId, final Blocking
9494
return httpClient.doPost(uri, body, BlockingStates.class, requestOptions);
9595
}
9696

97-
public BlockingStates addBundleBlockingState(final UUID bundleId, final BlockingState body, final DateTime requestedDate, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
97+
public BlockingStates addBundleBlockingState(final UUID bundleId, final BlockingState body, final ZonedDateTime requestedDate, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
9898
Preconditions.checkNotNull(bundleId, "Missing the required parameter 'bundleId' when calling addBundleBlockingState");
9999
Preconditions.checkNotNull(body, "Missing the required parameter 'body' when calling addBundleBlockingState");
100100

‎src/main/java/org/killbill/billing/client/api/gen/CatalogApi.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
import org.killbill.billing.client.model.gen.Catalog;
2626
import org.killbill.billing.client.model.gen.CatalogValidation;
27-
import org.joda.time.DateTime;
28-
import org.joda.time.LocalDate;
27+
import java.time.ZonedDateTime;
28+
import java.time.LocalDate;
2929
import org.killbill.billing.client.model.gen.Phase;
3030
import org.killbill.billing.client.model.gen.Plan;
3131
import org.killbill.billing.client.model.gen.PlanDetail;
@@ -134,7 +134,7 @@ public PlanDetails getAvailableBasePlans(final UUID accountId, final RequestOpti
134134
return httpClient.doGet(uri, PlanDetails.class, requestOptions);
135135
}
136136

137-
public Catalogs getCatalogJson(final DateTime requestedDate, final UUID accountId, final RequestOptions inputOptions) throws KillBillClientException {
137+
public Catalogs getCatalogJson(final ZonedDateTime requestedDate, final UUID accountId, final RequestOptions inputOptions) throws KillBillClientException {
138138

139139
final String uri = "/1.0/kb/catalog";
140140

@@ -171,7 +171,7 @@ public DateTimes getCatalogVersions(final UUID accountId, final RequestOptions i
171171
return httpClient.doGet(uri, DateTimes.class, requestOptions);
172172
}
173173

174-
public String getCatalogXml(final DateTime requestedDate, final UUID accountId, final RequestOptions inputOptions) throws KillBillClientException {
174+
public String getCatalogXml(final ZonedDateTime requestedDate, final UUID accountId, final RequestOptions inputOptions) throws KillBillClientException {
175175

176176
final String uri = "/1.0/kb/catalog/xml";
177177

‎src/main/java/org/killbill/billing/client/api/gen/InvoiceApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.killbill.billing.client.model.gen.InvoiceDryRun;
2929
import org.killbill.billing.client.model.gen.InvoiceItem;
3030
import org.killbill.billing.client.model.gen.InvoicePayment;
31-
import org.joda.time.LocalDate;
31+
import java.time.LocalDate;
3232
import org.killbill.billing.client.model.gen.Tag;
3333
import java.util.UUID;
3434
import java.util.Map;

‎src/main/java/org/killbill/billing/client/api/gen/SubscriptionApi.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
import org.killbill.billing.client.model.gen.BulkSubscriptionsBundle;
2828
import org.killbill.billing.client.model.gen.Bundle;
2929
import org.killbill.billing.client.model.gen.CustomField;
30-
import org.joda.time.LocalDate;
30+
import java.time.LocalDate;
3131
import org.killbill.billing.client.model.gen.Subscription;
3232
import org.killbill.billing.client.model.gen.Tag;
3333
import java.util.UUID;
3434
import org.killbill.billing.client.model.BlockingStates;
3535
import java.util.List;
3636
import java.util.Map;
37-
import org.joda.time.DateTime;
37+
import java.time.ZonedDateTime;
3838
import org.killbill.billing.entitlement.api.Entitlement.EntitlementActionPolicy;
3939
import org.killbill.billing.catalog.api.BillingActionPolicy;
4040
import org.killbill.billing.client.model.CustomFields;
@@ -98,7 +98,7 @@ public BlockingStates addSubscriptionBlockingState(final UUID subscriptionId, fi
9898
return httpClient.doPost(uri, body, BlockingStates.class, requestOptions);
9999
}
100100

101-
public BlockingStates addSubscriptionBlockingState(final UUID subscriptionId, final BlockingState body, final DateTime requestedDate, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
101+
public BlockingStates addSubscriptionBlockingState(final UUID subscriptionId, final BlockingState body, final ZonedDateTime requestedDate, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
102102
Preconditions.checkNotNull(subscriptionId, "Missing the required parameter 'subscriptionId' when calling addSubscriptionBlockingState");
103103
Preconditions.checkNotNull(body, "Missing the required parameter 'body' when calling addSubscriptionBlockingState");
104104

@@ -165,12 +165,12 @@ public void cancelSubscriptionPlan(final UUID subscriptionId, final LocalDate re
165165
httpClient.doDelete(uri, requestOptions);
166166
}
167167

168-
public void cancelSubscriptionPlan(final UUID subscriptionId, final DateTime requestedDate, final EntitlementActionPolicy entitlementPolicy, final BillingActionPolicy billingPolicy, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
168+
public void cancelSubscriptionPlan(final UUID subscriptionId, final ZonedDateTime requestedDate, final EntitlementActionPolicy entitlementPolicy, final BillingActionPolicy billingPolicy, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
169169
cancelSubscriptionPlan(subscriptionId, requestedDate, Boolean.valueOf(false), Long.valueOf(5), entitlementPolicy, billingPolicy, Boolean.valueOf(false), pluginProperty, inputOptions);
170170
}
171171

172172

173-
public void cancelSubscriptionPlan(final UUID subscriptionId, final DateTime requestedDate, final Boolean callCompletion, final Long callTimeoutSec, final EntitlementActionPolicy entitlementPolicy, final BillingActionPolicy billingPolicy, final Boolean useRequestedDateForBilling, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
173+
public void cancelSubscriptionPlan(final UUID subscriptionId, final ZonedDateTime requestedDate, final Boolean callCompletion, final Long callTimeoutSec, final EntitlementActionPolicy entitlementPolicy, final BillingActionPolicy billingPolicy, final Boolean useRequestedDateForBilling, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
174174
Preconditions.checkNotNull(subscriptionId, "Missing the required parameter 'subscriptionId' when calling cancelSubscriptionPlan");
175175

176176
final String uri = "/1.0/kb/subscriptions/{subscriptionId}"
@@ -244,11 +244,11 @@ public void changeSubscriptionPlan(final UUID subscriptionId, final Subscription
244244
httpClient.doPut(uri, body, requestOptions);
245245
}
246246

247-
public void changeSubscriptionPlan(final UUID subscriptionId, final Subscription body, final DateTime requestedDate, final BillingActionPolicy billingPolicy, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
247+
public void changeSubscriptionPlan(final UUID subscriptionId, final Subscription body, final ZonedDateTime requestedDate, final BillingActionPolicy billingPolicy, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
248248
changeSubscriptionPlan(subscriptionId, body, requestedDate, Boolean.valueOf(false), Long.valueOf(3), billingPolicy, pluginProperty, inputOptions);
249249
}
250250

251-
public void changeSubscriptionPlan(final UUID subscriptionId, final Subscription body, final DateTime requestedDate, final Boolean callCompletion, final Long callTimeoutSec, final BillingActionPolicy billingPolicy, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
251+
public void changeSubscriptionPlan(final UUID subscriptionId, final Subscription body, final ZonedDateTime requestedDate, final Boolean callCompletion, final Long callTimeoutSec, final BillingActionPolicy billingPolicy, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
252252
Preconditions.checkNotNull(subscriptionId, "Missing the required parameter 'subscriptionId' when calling changeSubscriptionPlan");
253253
Preconditions.checkNotNull(body, "Missing the required parameter 'body' when calling changeSubscriptionPlan");
254254

@@ -327,11 +327,11 @@ public Subscription createSubscription(final Subscription body, final LocalDate
327327
return httpClient.doPost(uri, body, Subscription.class, requestOptions);
328328
}
329329

330-
public Subscription createSubscription(final Subscription body, final DateTime entitlementDate, final DateTime billingDate, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
330+
public Subscription createSubscription(final Subscription body, final ZonedDateTime entitlementDate, final ZonedDateTime billingDate, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
331331
return createSubscription(body, entitlementDate, billingDate, Boolean.valueOf(true), Boolean.valueOf(false), Boolean.valueOf(false), Boolean.valueOf(false), Long.valueOf(3), pluginProperty, inputOptions);
332332
}
333333

334-
public Subscription createSubscription(final Subscription body, final DateTime entitlementDate, final DateTime billingDate, final Boolean renameKeyIfExistsAndUnused, final Boolean migrated, final Boolean skipResponse, final Boolean callCompletion, final Long callTimeoutSec, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
334+
public Subscription createSubscription(final Subscription body, final ZonedDateTime entitlementDate, final ZonedDateTime billingDate, final Boolean renameKeyIfExistsAndUnused, final Boolean migrated, final Boolean skipResponse, final Boolean callCompletion, final Long callTimeoutSec, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
335335
Preconditions.checkNotNull(body, "Missing the required parameter 'body' when calling createSubscription");
336336

337337
final String uri = "/1.0/kb/subscriptions";
@@ -455,11 +455,11 @@ public Bundle createSubscriptionWithAddOns(final Subscriptions body, final Local
455455
return httpClient.doPost(uri, body, Bundle.class, requestOptions);
456456
}
457457

458-
public Bundle createSubscriptionWithAddOns(final Subscriptions body, final DateTime entitlementDate, final DateTime billingDate, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
458+
public Bundle createSubscriptionWithAddOns(final Subscriptions body, final ZonedDateTime entitlementDate, final ZonedDateTime billingDate, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
459459
return createSubscriptionWithAddOns(body, entitlementDate, billingDate, Boolean.valueOf(false), Boolean.valueOf(false), Boolean.valueOf(true), Boolean.valueOf(false), Long.valueOf(3), pluginProperty, inputOptions);
460460
}
461461

462-
public Bundle createSubscriptionWithAddOns(final Subscriptions body, final DateTime entitlementDate, final DateTime billingDate, final Boolean migrated, final Boolean skipResponse, final Boolean renameKeyIfExistsAndUnused, final Boolean callCompletion, final Long callTimeoutSec, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
462+
public Bundle createSubscriptionWithAddOns(final Subscriptions body, final ZonedDateTime entitlementDate, final ZonedDateTime billingDate, final Boolean migrated, final Boolean skipResponse, final Boolean renameKeyIfExistsAndUnused, final Boolean callCompletion, final Long callTimeoutSec, final Map<String, String> pluginProperty, final RequestOptions inputOptions) throws KillBillClientException {
463463
Preconditions.checkNotNull(body, "Missing the required parameter 'body' when calling createSubscriptionWithAddOns");
464464

465465
final String uri = "/1.0/kb/subscriptions/createSubscriptionWithAddOns";

‎src/main/java/org/killbill/billing/client/api/gen/UsageApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import java.util.Objects;
2424

25-
import org.joda.time.LocalDate;
25+
import java.time.LocalDate;
2626
import org.killbill.billing.client.model.gen.RolledUpUsage;
2727
import org.killbill.billing.client.model.gen.SubscriptionUsageRecord;
2828
import java.util.UUID;

‎src/main/java/org/killbill/billing/client/model/CatalogVersions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import java.util.ArrayList;
2323

24-
import org.joda.time.DateTime;
24+
import java.time.ZonedDateTime;
2525

26-
public class CatalogVersions extends ArrayList<DateTime> {
26+
public class CatalogVersions extends ArrayList<ZonedDateTime> {
2727
}

‎src/main/java/org/killbill/billing/client/model/DateTimes.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import java.util.ArrayList;
2323

24-
import org.joda.time.DateTime;
24+
import java.time.ZonedDateTime;
2525

26-
public class DateTimes extends ArrayList<DateTime> {
26+
public class DateTimes extends ArrayList<ZonedDateTime> {
2727
}

0 commit comments

Comments
 (0)