From 49540550282e02ff4cf5c8bc8d53ba5a1f9d7c50 Mon Sep 17 00:00:00 2001 From: Rich Spitkovsky Date: Wed, 1 May 2019 14:40:44 -0400 Subject: [PATCH 1/2] added registry_type to LineItem --- .../samples/orderClient/SimpleClient.java | 53 ++++++++++--------- .../java/com/riskified/models/LineItem.java | 9 +++- .../com/riskified/models/RegistryType.java | 15 ++++++ 3 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 riskified-sdk/src/main/java/com/riskified/models/RegistryType.java diff --git a/riskified-sample/src/main/java/com/riskified/samples/orderClient/SimpleClient.java b/riskified-sample/src/main/java/com/riskified/samples/orderClient/SimpleClient.java index 07546ff..e843bff 100644 --- a/riskified-sample/src/main/java/com/riskified/samples/orderClient/SimpleClient.java +++ b/riskified-sample/src/main/java/com/riskified/samples/orderClient/SimpleClient.java @@ -17,7 +17,7 @@ public static void main(String[] arg) throws FieldBadFormatException { try { // Riskified client parameters can be set in the constructor, like this: - // RiskifiedClient client = new RiskifiedClient("", "", Environment.SANDBOX); + // RiskifiedClient client = new RiskifiedClient("", "", Environment.SANDBOX); // Or according 'riskified_sdk.properties' configuration file, like this: RiskifiedClient client = new RiskifiedClient(); @@ -33,18 +33,18 @@ public static void main(String[] arg) throws FieldBadFormatException { System.out.println("category: " + resCreateOrder.getOrder().getCategory()); } catch (RiskifiedError e) { - printError(e); + printError(e); } catch (HttpResponseException e) { - printError(e); + printError(e); } catch (ClientProtocolException e) { - printError(e); + printError(e); } catch (IOException e) { - printError(e); + printError(e); } } - + private static void printError(Exception e) { - System.out.println("[Sample failed]"); + System.out.println("[Sample failed]"); e.printStackTrace(); } @@ -73,7 +73,8 @@ private static Order generateOrder() { order.setCustomer(customer); LineItem lineItem = new LineItem(200, 4, "ACME Spring", "AAA2"); - + lineItem.setRegistryType(RegistryType.other); + TravelLineItem travelLineItem = new TravelLineItem(340, 1, "Flight from Israel to France", "211", "B11", 1, 1); travelLineItem.setDeparturePortCode("LLBG"); travelLineItem.setDepartureCountryCode("IL"); @@ -87,7 +88,7 @@ private static Order generateOrder() { travelLineItem.setCarrierCode("AF"); travelLineItem.setCarrierName("Air France"); travelLineItem.setRequiresShipping(false); - + order.setLineItems(Arrays.asList(new LineItem(100, 1, "ACME Widget", "101"), lineItem, travelLineItem)); Passenger passenger = new Passenger("john","smith"); @@ -100,20 +101,24 @@ private static Order generateOrder() { passenger.setDocumentIssueDate(getDate(1988, Calendar.MARCH, 5)); passenger.setDocumentExpirationDate(getDate(2020, Calendar.MARCH, 5)); passenger.setPassengerType("Adult"); - + order.setPassengers(Arrays.asList(passenger)); - + Seller seller = new Seller(customer); seller.setPriceNegotiated(true); seller.setStartingPrice(400); - - + + order.setDiscountCodes(Arrays.asList(new DiscountCode(19.95, "12"))); order.setShippingLines(Arrays.asList(new ShippingLine(123, "free"))); + List paymentDetailsList = new ArrayList(); + paymentDetailsList.add(new CreditCardPaymentDetails("370002", "y", "n", "xxxx-xxxx-xxxx-1234", "VISA")); + order.setPaymentDetails(new CreditCardPaymentDetails("370002", "y", "n", "xxxx-xxxx-xxxx-1234", "VISA")); + Address address = new Address("John", "Doe", "108 Main Street", "NYC", "1234567", "United States"); address.setCompany("Kansas Computers"); address.setCountryCode("US"); @@ -136,22 +141,22 @@ private static Order generateOrder() { Custom custom = new Custom("D2C"); order.setCustom(custom); - + return order; } private static Date getDate(int year, int month, int day) { - return getDate(year, month, day, 0, 0, 0); + return getDate(year, month, day, 0, 0, 0); } - + private static Date getDate(int year, int month, int day, int hour, int minute, int second) { - Calendar cal = Calendar.getInstance(); - cal.set(Calendar.YEAR, year); - cal.set(Calendar.MONTH, month); - cal.set(Calendar.DAY_OF_MONTH, day); - cal.set(Calendar.HOUR_OF_DAY, hour); - cal.set(Calendar.MINUTE, minute); - cal.set(Calendar.SECOND, second); - return cal.getTime(); + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR, year); + cal.set(Calendar.MONTH, month); + cal.set(Calendar.DAY_OF_MONTH, day); + cal.set(Calendar.HOUR_OF_DAY, hour); + cal.set(Calendar.MINUTE, minute); + cal.set(Calendar.SECOND, second); + return cal.getTime(); } } diff --git a/riskified-sdk/src/main/java/com/riskified/models/LineItem.java b/riskified-sdk/src/main/java/com/riskified/models/LineItem.java index 27382dc..631777b 100644 --- a/riskified-sdk/src/main/java/com/riskified/models/LineItem.java +++ b/riskified-sdk/src/main/java/com/riskified/models/LineItem.java @@ -34,6 +34,7 @@ public class LineItem implements IValidated { private String size; private Date deliveredAt; private String deliveredTo; + private RegistryType registryType; public LineItem(double price, int quantity, String title) { @@ -284,6 +285,12 @@ public void setDeliveredTo(String deliveredTo) { this.deliveredTo = deliveredTo; } - + public RegistryType getRegistryType() { return registryType; } + + public void setRegistryType(RegistryType registryType) { this.registryType = registryType; } + + + + } diff --git a/riskified-sdk/src/main/java/com/riskified/models/RegistryType.java b/riskified-sdk/src/main/java/com/riskified/models/RegistryType.java new file mode 100644 index 0000000..54a255b --- /dev/null +++ b/riskified-sdk/src/main/java/com/riskified/models/RegistryType.java @@ -0,0 +1,15 @@ + +package com.riskified.models; + +import com.google.gson.annotations.SerializedName; + +public enum RegistryType { + + @SerializedName("wedding") + wedding, + @SerializedName("baby") + baby, + @SerializedName("other") + other + +} \ No newline at end of file From 1381034ef5a32b799a65bb425fddd2755d6c5079 Mon Sep 17 00:00:00 2001 From: Rich Spitkovsky <44982954+rich-spitkovsky-riskified@users.noreply.github.com> Date: Wed, 1 May 2019 14:43:04 -0400 Subject: [PATCH 2/2] Update SimpleClient.java --- .../java/com/riskified/samples/orderClient/SimpleClient.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/riskified-sample/src/main/java/com/riskified/samples/orderClient/SimpleClient.java b/riskified-sample/src/main/java/com/riskified/samples/orderClient/SimpleClient.java index e843bff..7b3f5b9 100644 --- a/riskified-sample/src/main/java/com/riskified/samples/orderClient/SimpleClient.java +++ b/riskified-sample/src/main/java/com/riskified/samples/orderClient/SimpleClient.java @@ -113,9 +113,6 @@ private static Order generateOrder() { order.setShippingLines(Arrays.asList(new ShippingLine(123, "free"))); - List paymentDetailsList = new ArrayList(); - paymentDetailsList.add(new CreditCardPaymentDetails("370002", "y", "n", "xxxx-xxxx-xxxx-1234", "VISA")); - order.setPaymentDetails(new CreditCardPaymentDetails("370002", "y", "n", "xxxx-xxxx-xxxx-1234", "VISA"));