Skip to content

Commit

Permalink
Merge branch 'main' into remove_bouncycastle
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/com/gr4vy/api/model/Transaction.java
#	src/main/java/com/gr4vy/api/model/TransactionPaymentMethodRequest.java
  • Loading branch information
steve-gr4vy committed Sep 11, 2024
2 parents c07477c + 25f775e commit 2c9848a
Show file tree
Hide file tree
Showing 16 changed files with 323 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ src/main/java/com/gr4vy/api/model/ThreeDSecureSummary.java
src/main/java/com/gr4vy/api/model/ThreeDSecureV2.java
src/main/java/com/gr4vy/api/model/TokenizedRequest.java
src/main/java/com/gr4vy/api/model/Transaction.java
src/main/java/com/gr4vy/api/model/TransactionBuyerRequest.java
src/main/java/com/gr4vy/api/model/TransactionCaptureRequest.java
src/main/java/com/gr4vy/api/model/TransactionCardRequest.java
src/main/java/com/gr4vy/api/model/TransactionCheckoutSessionRequest.java
Expand Down Expand Up @@ -590,6 +591,7 @@ src/test/java/com/gr4vy/api/model/ThreeDSecureSuccessEventTest.java
src/test/java/com/gr4vy/api/model/ThreeDSecureSummaryTest.java
src/test/java/com/gr4vy/api/model/ThreeDSecureV2Test.java
src/test/java/com/gr4vy/api/model/TokenizedRequestTest.java
src/test/java/com/gr4vy/api/model/TransactionBuyerRequestTest.java
src/test/java/com/gr4vy/api/model/TransactionCaptureRequestTest.java
src/test/java/com/gr4vy/api/model/TransactionCardRequestTest.java
src/test/java/com/gr4vy/api/model/TransactionCheckoutSessionRequestTest.java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import com.gr4vy.api.model.CartItem;
import com.gr4vy.api.model.TransactionBuyerRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;
Expand All @@ -43,6 +44,10 @@ public class CheckoutSessionCreateRequest {
@SerializedName(SERIALIZED_NAME_METADATA)
private Map<String, String> metadata = null;

public static final String SERIALIZED_NAME_BUYER = "buyer";
@SerializedName(SERIALIZED_NAME_BUYER)
private TransactionBuyerRequest buyer;


public CheckoutSessionCreateRequest cartItems(List<CartItem> cartItems) {

Expand Down Expand Up @@ -106,6 +111,29 @@ public void setMetadata(Map<String, String> metadata) {
}


public CheckoutSessionCreateRequest buyer(TransactionBuyerRequest buyer) {

this.buyer = buyer;
return this;
}

/**
* Get buyer
* @return buyer
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")

public TransactionBuyerRequest getBuyer() {
return buyer;
}


public void setBuyer(TransactionBuyerRequest buyer) {
this.buyer = buyer;
}


@Override
public boolean equals(Object o) {
if (this == o) {
Expand All @@ -116,12 +144,13 @@ public boolean equals(Object o) {
}
CheckoutSessionCreateRequest checkoutSessionCreateRequest = (CheckoutSessionCreateRequest) o;
return Objects.equals(this.cartItems, checkoutSessionCreateRequest.cartItems) &&
Objects.equals(this.metadata, checkoutSessionCreateRequest.metadata);
Objects.equals(this.metadata, checkoutSessionCreateRequest.metadata) &&
Objects.equals(this.buyer, checkoutSessionCreateRequest.buyer);
}

@Override
public int hashCode() {
return Objects.hash(cartItems, metadata);
return Objects.hash(cartItems, metadata, buyer);
}

@Override
Expand All @@ -130,6 +159,7 @@ public String toString() {
sb.append("class CheckoutSessionCreateRequest {\n");
sb.append(" cartItems: ").append(toIndentedString(cartItems)).append("\n");
sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n");
sb.append(" buyer: ").append(toIndentedString(buyer)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gr4vy/api/model/PaymentMethod.java
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,14 @@ public enum MethodEnum {

GOOGLEPAY("googlepay"),

GOOGLEPAY_PAN_ONLY("googlepay_pan_only"),

GOPAY("gopay"),

GRABPAY("grabpay"),

ID("id"),

IDEAL("ideal"),

KAKAOPAY("kakaopay"),
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gr4vy/api/model/PaymentMethodSnapshot.java
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,14 @@ public enum MethodEnum {

GOOGLEPAY("googlepay"),

GOOGLEPAY_PAN_ONLY("googlepay_pan_only"),

GOPAY("gopay"),

GRABPAY("grabpay"),

ID("id"),

IDEAL("ideal"),

KAKAOPAY("kakaopay"),
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gr4vy/api/model/PaymentMethodTokenized.java
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,14 @@ public enum MethodEnum {

GOOGLEPAY("googlepay"),

GOOGLEPAY_PAN_ONLY("googlepay_pan_only"),

GOPAY("gopay"),

GRABPAY("grabpay"),

ID("id"),

IDEAL("ideal"),

KAKAOPAY("kakaopay"),
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gr4vy/api/model/PaymentOption.java
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,14 @@ public enum MethodEnum {

GOOGLEPAY("googlepay"),

GOOGLEPAY_PAN_ONLY("googlepay_pan_only"),

GOPAY("gopay"),

GRABPAY("grabpay"),

ID("id"),

IDEAL("ideal"),

KAKAOPAY("kakaopay"),
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gr4vy/api/model/PaymentService.java
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,14 @@ public enum MethodEnum {

GOOGLEPAY("googlepay"),

GOOGLEPAY_PAN_ONLY("googlepay_pan_only"),

GOPAY("gopay"),

GRABPAY("grabpay"),

ID("id"),

IDEAL("ideal"),

KAKAOPAY("kakaopay"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,14 @@ public enum MethodEnum {

GOOGLEPAY("googlepay"),

GOOGLEPAY_PAN_ONLY("googlepay_pan_only"),

GOPAY("gopay"),

GRABPAY("grabpay"),

ID("id"),

IDEAL("ideal"),

KAKAOPAY("kakaopay"),
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gr4vy/api/model/PaymentServiceSnapshot.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,14 @@ public enum MethodEnum {

GOOGLEPAY("googlepay"),

GOOGLEPAY_PAN_ONLY("googlepay_pan_only"),

GOPAY("gopay"),

GRABPAY("grabpay"),

ID("id"),

IDEAL("ideal"),

KAKAOPAY("kakaopay"),
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gr4vy/api/model/Transaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,14 @@ public enum MethodEnum {

GOOGLEPAY("googlepay"),

GOOGLEPAY_PAN_ONLY("googlepay_pan_only"),

GOPAY("gopay"),

GRABPAY("grabpay"),

ID("id"),

IDEAL("ideal"),

KAKAOPAY("kakaopay"),
Expand Down
187 changes: 187 additions & 0 deletions src/main/java/com/gr4vy/api/model/TransactionBuyerRequest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
/*
* Gr4vy API
* Welcome to the Gr4vy API reference documentation. Our API is still very much a work in product and subject to change.
*
* The version of the OpenAPI document: 1.1.0-beta
* Contact: code@gr4vy.com
*
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech
* Do not edit the class manually.
*/


package com.gr4vy.api.model;

import java.util.Objects;
import java.util.Arrays;
import com.google.gson.TypeAdapter;
import com.google.gson.annotations.JsonAdapter;
import com.google.gson.annotations.SerializedName;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import com.gr4vy.api.model.BillingDetailsRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.IOException;

/**
* Guest buyer details.
*/
@ApiModel(description = "Guest buyer details.")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class TransactionBuyerRequest {
public static final String SERIALIZED_NAME_EXTERNAL_IDENTIFIER = "external_identifier";
@SerializedName(SERIALIZED_NAME_EXTERNAL_IDENTIFIER)
private String externalIdentifier;

public static final String SERIALIZED_NAME_DISPLAY_NAME = "display_name";
@SerializedName(SERIALIZED_NAME_DISPLAY_NAME)
private String displayName;

public static final String SERIALIZED_NAME_BILLING_DETAILS = "billing_details";
@SerializedName(SERIALIZED_NAME_BILLING_DETAILS)
private BillingDetailsRequest billingDetails;

public static final String SERIALIZED_NAME_SHIPPING_DETAILS = "shipping_details";
@SerializedName(SERIALIZED_NAME_SHIPPING_DETAILS)
private BillingDetailsRequest shippingDetails;


public TransactionBuyerRequest externalIdentifier(String externalIdentifier) {

this.externalIdentifier = externalIdentifier;
return this;
}

/**
* An external identifier that can be used to match the buyer against your own records. This value needs to be unique for all buyers.
* @return externalIdentifier
**/
@javax.annotation.Nullable
@ApiModelProperty(example = "user-789123", value = "An external identifier that can be used to match the buyer against your own records. This value needs to be unique for all buyers.")

public String getExternalIdentifier() {
return externalIdentifier;
}


public void setExternalIdentifier(String externalIdentifier) {
this.externalIdentifier = externalIdentifier;
}


public TransactionBuyerRequest displayName(String displayName) {

this.displayName = displayName;
return this;
}

/**
* A unique name for this buyer which is used in the Gr4vy admin panel to give a buyer a human readable name.
* @return displayName
**/
@javax.annotation.Nullable
@ApiModelProperty(example = "John L.", value = "A unique name for this buyer which is used in the Gr4vy admin panel to give a buyer a human readable name.")

public String getDisplayName() {
return displayName;
}


public void setDisplayName(String displayName) {
this.displayName = displayName;
}


public TransactionBuyerRequest billingDetails(BillingDetailsRequest billingDetails) {

this.billingDetails = billingDetails;
return this;
}

/**
* The optional billing details for the a buyer.
* @return billingDetails
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "The optional billing details for the a buyer.")

public BillingDetailsRequest getBillingDetails() {
return billingDetails;
}


public void setBillingDetails(BillingDetailsRequest billingDetails) {
this.billingDetails = billingDetails;
}


public TransactionBuyerRequest shippingDetails(BillingDetailsRequest shippingDetails) {

this.shippingDetails = shippingDetails;
return this;
}

/**
* The optional shipping details for the buyer.
* @return shippingDetails
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "The optional shipping details for the buyer.")

public BillingDetailsRequest getShippingDetails() {
return shippingDetails;
}


public void setShippingDetails(BillingDetailsRequest shippingDetails) {
this.shippingDetails = shippingDetails;
}


@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
TransactionBuyerRequest transactionBuyerRequest = (TransactionBuyerRequest) o;
return Objects.equals(this.externalIdentifier, transactionBuyerRequest.externalIdentifier) &&
Objects.equals(this.displayName, transactionBuyerRequest.displayName) &&
Objects.equals(this.billingDetails, transactionBuyerRequest.billingDetails) &&
Objects.equals(this.shippingDetails, transactionBuyerRequest.shippingDetails);
}

@Override
public int hashCode() {
return Objects.hash(externalIdentifier, displayName, billingDetails, shippingDetails);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class TransactionBuyerRequest {\n");
sb.append(" externalIdentifier: ").append(toIndentedString(externalIdentifier)).append("\n");
sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n");
sb.append(" billingDetails: ").append(toIndentedString(billingDetails)).append("\n");
sb.append(" shippingDetails: ").append(toIndentedString(shippingDetails)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}

}

Loading

0 comments on commit 2c9848a

Please sign in to comment.