Merge branch 'release/2.5.0'

Author: ryankazokas

.github/workflows/maven-feature-hotfix.yml

@@ -4,7 +4,8 @@
 name: Shopify SDK Build Feature/Hotfix Branch
 
 on:
-  push:
+  pull_request:
+  push: 
     branches:
     - '**'
     - '!master'

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.channelape</groupId>
 	<artifactId>shopify-sdk</artifactId>
-	<version>2.4.3</version>
+	<version>2.5.0</version>
 
 	<name>Shopify SDK</name>
 	<description>Java SDK for Shopify REST API.</description>

src/main/java/com/shopify/model/ShopifyLineItem.java

@@ -44,6 +44,8 @@ public class ShopifyLineItem {
 	private String fulfillmentService;
 	@XmlElement(name = "tax_lines")
 	private List<ShopifyTaxLine> taxLines = new LinkedList<>();
+	@XmlElement(name = "properties")
+	private List<ShopifyProperty> properties = new LinkedList<>();
 
 	public String getId() {
 		return id;
@@ -205,4 +207,12 @@ public void setTaxLines(final List<ShopifyTaxLine> taxLines) {
 		this.taxLines = taxLines;
 	}
 
+	public List<ShopifyProperty> getProperties() {
+		return properties;
+	}
+
+	public void setProperties(final List<ShopifyProperty> properties) {
+		this.properties = properties;
+	}
+
 }

src/main/java/com/shopify/model/ShopifyOrder.java

@@ -99,6 +99,7 @@ public class ShopifyOrder {
 	private List<ShopifyShippingLine> shippingLines = new LinkedList<>();
 	@XmlElement(name = "tax_lines")
 	private List<ShopifyTaxLine> taxLines = new LinkedList<>();
+
 	@XmlElement(name = "note_attributes")
 	private List<ShopifyAttribute> noteAttributes = new LinkedList<>();
 	private List<ShopifyRefund> refunds = new LinkedList<>();

src/main/java/com/shopify/model/ShopifyProperty.java

@@ -0,0 +1,27 @@
+package com.shopify.model;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class ShopifyProperty {
+
+	private String name;
+	private String value;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

src/test/java/com/shopify/ShopifySdkTest.java

@@ -91,6 +91,7 @@
 import com.shopify.model.ShopifyProductUpdateRequest;
 import com.shopify.model.ShopifyProducts;
 import com.shopify.model.ShopifyProductsRoot;
+import com.shopify.model.ShopifyProperty;
 import com.shopify.model.ShopifyRecurringApplicationCharge;
 import com.shopify.model.ShopifyRecurringApplicationChargeCreationRequest;
 import com.shopify.model.ShopifyRecurringApplicationChargeRoot;
@@ -395,6 +396,12 @@ public void givenSomePageAndCreatedAtMinAndCreatedAtMaxOrdersWhenRetrievingOrder
 				"Some Tax Line2");
 		shopifyLineItem1
 				.setTaxLines(new LinkedList<>(Arrays.asList(shopifyTaxLine1LineItem1, shopifyTaxLine1LineItem2)));
+
+		final ShopifyProperty shopifyProperty1 = buildShopifyProperty("message", "Some new message");
+		final ShopifyProperty shopifyProperty2 = buildShopifyProperty("from", "From family");
+		final ShopifyProperty shopifyProperty3 = buildShopifyProperty("to", "To family member");
+		shopifyLineItem1
+				.setProperties(new LinkedList<>(Arrays.asList(shopifyProperty1, shopifyProperty2, shopifyProperty3)));
 		shopifyOrder1.setLineItems(Arrays.asList(shopifyLineItem1));
 
 		final ShopifyFulfillment shopifyFulfillment = new ShopifyFulfillment();
@@ -498,6 +505,19 @@ public void givenSomePageAndCreatedAtMinAndCreatedAtMaxOrdersWhenRetrievingOrder
 				shopifyOrders.get(0).getLineItems().get(0).getTaxLines().get(1).getPrice());
 		assertEquals(shopifyTaxLine1LineItem2.getTitle(),
 				shopifyOrders.get(0).getLineItems().get(0).getTaxLines().get(1).getTitle());
+		assertEquals(shopifyProperty1.getName(),
+				shopifyOrders.get(0).getLineItems().get(0).getProperties().get(0).getName());
+		assertEquals(shopifyProperty1.getValue(),
+				shopifyOrders.get(0).getLineItems().get(0).getProperties().get(0).getValue());
+		assertEquals(shopifyProperty2.getName(),
+				shopifyOrders.get(0).getLineItems().get(0).getProperties().get(1).getName());
+		assertEquals(shopifyProperty2.getValue(),
+				shopifyOrders.get(0).getLineItems().get(0).getProperties().get(1).getValue());
+		assertEquals(shopifyProperty3.getName(),
+				shopifyOrders.get(0).getLineItems().get(0).getProperties().get(2).getName());
+		assertEquals(shopifyProperty3.getValue(),
+				shopifyOrders.get(0).getLineItems().get(0).getProperties().get(2).getValue());
+
 		assertEquals(shopifyOrder1.getFulfillments().get(0).getId(),
 				shopifyOrders.get(0).getFulfillments().get(0).getId());
 		assertTrue(shopifyOrder1.getFulfillments().get(0).getCreatedAt()
@@ -3700,4 +3720,11 @@ private ShopifyTaxLine buildTaxLine(final BigDecimal price, final BigDecimal rat
 		shopifyTaxLine1LineItem1.setTitle(title);
 		return shopifyTaxLine1LineItem1;
 	}
+
+	private ShopifyProperty buildShopifyProperty(final String name, final String value) {
+		final ShopifyProperty shopifyProperty = new ShopifyProperty();
+		shopifyProperty.setName(name);
+		shopifyProperty.setValue(value);
+		return shopifyProperty;
+	}
 }

src/test/java/com/shopify/model/ShopifyLineItemTest.java

@@ -1,6 +1,7 @@
 package com.shopify.model;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
@@ -11,6 +12,7 @@
 public class ShopifyLineItemTest {
 
 	private static final LinkedList<ShopifyTaxLine> SOME_TAX_LINES = new LinkedList<>();
+	private static final LinkedList<ShopifyProperty> SOME_PROPERTIES = new LinkedList<>();
 	private static final BigDecimal SOME_PRICE = BigDecimal.valueOf(41.55);
 
 	@Test
@@ -31,6 +33,7 @@ public void givenSomeValuesWhenBuildingLineItemsThenExpectLineItemValuesToBeCorr
 		shopifyLineItem.setTaxable(true);
 		shopifyLineItem.setTitle("Some_Title");
 		shopifyLineItem.setTaxLines(SOME_TAX_LINES);
+		shopifyLineItem.setProperties(SOME_PROPERTIES);
 		shopifyLineItem.setTotalDiscount(SOME_PRICE);
 		shopifyLineItem.setVariantId("1234");
 		shopifyLineItem.setVariantInventoryManagement("shopify");
@@ -55,6 +58,7 @@ public void givenSomeValuesWhenBuildingLineItemsThenExpectLineItemValuesToBeCorr
 		assertEquals("shopify", shopifyLineItem.getVariantInventoryManagement());
 		assertEquals("some-title", shopifyLineItem.getVariantTitle());
 		assertEquals("some-vendor", shopifyLineItem.getVendor());
+		assertSame(SOME_PROPERTIES, shopifyLineItem.getProperties());
 
 	}