Skip to content

Commit

Permalink
jaxrs: rename PaymentMethodPluginDetailJson#externalPaymentId to Paym…
Browse files Browse the repository at this point in the history 
…entMethodPluginDetailJson#externalPaymentMethodId

This fixes #109.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
  • Loading branch information
@pierre
pierre committed Jul 13, 2015
1 parent 2fe6f87 commit 4445b7b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions jaxrs/src/main/java/org/killbill/billing/jaxrs/json/PaymentMethodJson.java
View file
@@ -1,7 +1,7 @@
/* /*
* Copyright 2010-2013 Ning, Inc. * Copyright 2010-2013 Ning, Inc.
* Copyright 2014 Groupon, Inc * Copyright 2014-2015 Groupon, Inc
* Copyright 2014 The Billing Project, LLC * Copyright 2014-2015 The Billing Project, LLC
* *
* The Billing Project licenses this file to you under the Apache License, version 2.0 * The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the * (the "License"); you may not use this file except in compliance with the
Expand Down Expand Up @@ -141,7 +141,7 @@ public boolean isDefaultPaymentMethod() {


@Override @Override
public String getExternalPaymentMethodId() { public String getExternalPaymentMethodId() {
return pluginInfo != null ? pluginInfo.getExternalPaymentId() : null; return pluginInfo != null ? pluginInfo.getExternalPaymentMethodId() : null;
} }


@Override @Override
Expand Down Expand Up @@ -239,21 +239,21 @@ public int hashCode() {


public static class PaymentMethodPluginDetailJson { public static class PaymentMethodPluginDetailJson {


private final String externalPaymentId; private final String externalPaymentMethodId;
private final Boolean isDefaultPaymentMethod; private final Boolean isDefaultPaymentMethod;
private final List<PluginPropertyJson> properties; private final List<PluginPropertyJson> properties;


@JsonCreator @JsonCreator
public PaymentMethodPluginDetailJson(@JsonProperty("externalPaymentId") final String externalPaymentId, public PaymentMethodPluginDetailJson(@JsonProperty("externalPaymentMethodId") final String externalPaymentMethodId,
@JsonProperty("isDefaultPaymentMethod") final Boolean isDefaultPaymentMethod, @JsonProperty("isDefaultPaymentMethod") final Boolean isDefaultPaymentMethod,
@JsonProperty("properties") final List<PluginPropertyJson> properties) { @JsonProperty("properties") final List<PluginPropertyJson> properties) {
this.externalPaymentId = externalPaymentId; this.externalPaymentMethodId = externalPaymentMethodId;
this.isDefaultPaymentMethod = isDefaultPaymentMethod; this.isDefaultPaymentMethod = isDefaultPaymentMethod;
this.properties = properties; this.properties = properties;
} }


public String getExternalPaymentId() { public String getExternalPaymentMethodId() {
return externalPaymentId; return externalPaymentMethodId;
} }


public Boolean getIsDefaultPaymentMethod() { public Boolean getIsDefaultPaymentMethod() {
Expand All @@ -267,7 +267,7 @@ public List<PluginPropertyJson> getProperties() {
@Override @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("PaymentMethodPluginDetailJson{"); final StringBuilder sb = new StringBuilder("PaymentMethodPluginDetailJson{");
sb.append("externalPaymentId='").append(externalPaymentId).append('\''); sb.append("externalPaymentMethodId='").append(externalPaymentMethodId).append('\'');
sb.append(", isDefaultPaymentMethod=").append(isDefaultPaymentMethod); sb.append(", isDefaultPaymentMethod=").append(isDefaultPaymentMethod);
sb.append(", properties=").append(properties); sb.append(", properties=").append(properties);
sb.append('}'); sb.append('}');
Expand All @@ -285,7 +285,7 @@ public boolean equals(final Object o) {


final PaymentMethodPluginDetailJson that = (PaymentMethodPluginDetailJson) o; final PaymentMethodPluginDetailJson that = (PaymentMethodPluginDetailJson) o;


if (externalPaymentId != null ? !externalPaymentId.equals(that.externalPaymentId) : that.externalPaymentId != null) { if (externalPaymentMethodId != null ? !externalPaymentMethodId.equals(that.externalPaymentMethodId) : that.externalPaymentMethodId != null) {
return false; return false;
} }
if (isDefaultPaymentMethod != null ? !isDefaultPaymentMethod.equals(that.isDefaultPaymentMethod) : that.isDefaultPaymentMethod != null) { if (isDefaultPaymentMethod != null ? !isDefaultPaymentMethod.equals(that.isDefaultPaymentMethod) : that.isDefaultPaymentMethod != null) {
Expand All @@ -299,7 +299,7 @@ public boolean equals(final Object o) {


@Override @Override
public int hashCode() { public int hashCode() {
int result = externalPaymentId != null ? externalPaymentId.hashCode() : 0; int result = externalPaymentMethodId != null ? externalPaymentMethodId.hashCode() : 0;
result = 31 * result + (isDefaultPaymentMethod != null ? isDefaultPaymentMethod.hashCode() : 0); result = 31 * result + (isDefaultPaymentMethod != null ? isDefaultPaymentMethod.hashCode() : 0);
result = 31 * result + (properties != null ? properties.hashCode() : 0); result = 31 * result + (properties != null ? properties.hashCode() : 0);
return result; return result;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>killbill-oss-parent</artifactId> <artifactId>killbill-oss-parent</artifactId>
<groupId>org.kill-bill.billing</groupId> <groupId>org.kill-bill.billing</groupId>
<version>0.27</version> <version>0.28-SNAPSHOT</version>
</parent> </parent>
<artifactId>killbill</artifactId> <artifactId>killbill</artifactId>
<version>0.15.1-SNAPSHOT</version> <version>0.15.1-SNAPSHOT</version>
Expand Down

1 comment on commit 4445b7b

@sbrossie
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Please sign in to comment.