CA-4834 Merges feature/First-Name-Last-Name into develop

Author: rjdavis3

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

@@ -19,7 +19,6 @@ public class ShopifyAddressUpdateRequest {
 	private String firstName;
 	@XmlElement(name = "last_name")
 	private String lastname;
-	private String name;
 	private String company;
 	private String address1;
 	private String address2;
@@ -51,14 +50,6 @@ public void setLastname(final String lastname) {
 		this.lastname = lastname;
 	}
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(final String name) {
-		this.name = name;
-	}
-
 	public String getCompany() {
 		return company;
 	}

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

@@ -31,12 +31,8 @@ public static interface CompanyStep {
 		LatitudeStep withCompany(final String company);
 	}
 
-	public static interface NameStep {
-		CompanyStep withName(final String name);
-	}
-
 	public static interface LastNameStep {
-		NameStep withLastName(final String lastName);
+		CompanyStep withLastName(final String lastName);
 	}
 
 	public static interface FirstNameStep {
@@ -93,7 +89,7 @@ private ShopifyOrderShippingAddressUpdateRequest(final Steps steps) {
 	}
 
 	private static class Steps implements IdStep, Address1Step, Address2Step, CityStep, ProvinceStep, ProvinceCodeStep,
-			ZipCodeStep, CountryStep, CountryCodeStep, PhoneStep, LatitudeStep, CompanyStep, LongitudeStep, NameStep,
+			ZipCodeStep, CountryStep, CountryCodeStep, PhoneStep, LatitudeStep, CompanyStep, LongitudeStep,
 			LastNameStep, FirstNameStep, BuildStep {
 		private String id;
 		private final ShopifyAddressUpdateRequest shippingAddress = new ShopifyAddressUpdateRequest();
@@ -110,7 +106,7 @@ public LastNameStep withFirstName(final String firstName) {
 		}
 
 		@Override
-		public NameStep withLastName(final String lastName) {
+		public CompanyStep withLastName(final String lastName) {
 			this.shippingAddress.setLastname(lastName);
 			return this;
 		}
@@ -181,12 +177,6 @@ public Address1Step withId(final String id) {
 			return this;
 		}
 
-		@Override
-		public CompanyStep withName(final String name) {
-			this.shippingAddress.setName(name);
-			return this;
-		}
-
 		@Override
 		public ProvinceCodeStep withProvince(final String province) {
 			this.shippingAddress.setProvince(province);

src/test/java/com/shopify/ShopifySdkDriver.java

@@ -563,8 +563,7 @@ public void givenSomeValuesWhenUpdatingAnOrderThenExpectValuesToBeUpdatedOnOrder
 				.newBuilder().withId("1124214472765").withAddress1("Testing From SDK Driver2").withAddress2("Suite 100")
 				.withCity("Scranton").withProvince("Pennsylvania").withProvinceCode("PA").withZip("18503")
 				.withCountry("United States").withCountryCode("US").withPhone("9829374293874").withFirstName("Ryan")
-				.withLastName("Kazokas").withName("Ryan Kazokas").withCompany("ChannelApe").withLatitude(null)
-				.withLongitude(null).build();
+				.withLastName("Kazokas").withCompany("ChannelApe").withLatitude(null).withLongitude(null).build();
 
 		final ShopifyOrder updateOrder = shopifySdk.updateOrderShippingAddress(shopifyOrderUpdateRequest);
 		assertEquals("Testing From SDK Driver2", updateOrder.getShippingAddress().getAddress1());

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

@@ -1932,7 +1932,7 @@ public void givenSomeValidAccessTokenAndSubdomainAndValidRequestWhenUpdatingOrde
 				.newBuilder().withId(someShopifyOrderId).withAddress1("224 Wyoming Ave").withAddress2("Suite 100")
 				.withCity("Scranton").withProvince("PEnnsylvania").withProvinceCode("PA").withZip("18503")
 				.withCountry("USA").withCountryCode("US").withPhone("123").withFirstName("Ryan").withLastName("Kazokas")
-				.withName("Ryan Kazokas").withCompany("ChannelApe").withLatitude(new BigDecimal(410.44444))
+				.withCompany("ChannelApe").withLatitude(new BigDecimal(410.44444))
 				.withLongitude(new BigDecimal(123.442)).build();
 
 		final String expectedResponseBodyString = getJsonString(ShopifyOrderRoot.class, shopifyOrderRoot);
@@ -1959,8 +1959,7 @@ public void givenSomeValidAccessTokenAndSubdomainAndValidRequestWhenUpdatingOrde
 				actualRequestBody.getContent().get("order").get("shipping_address").get("first_name").asText());
 		assertEquals("Kazokas",
 				actualRequestBody.getContent().get("order").get("shipping_address").get("last_name").asText());
-		assertEquals("Ryan Kazokas",
-				actualRequestBody.getContent().get("order").get("shipping_address").get("name").asText());
+
 		assertEquals("USA",
 				actualRequestBody.getContent().get("order").get("shipping_address").get("country").asText());
 		assertEquals("US",

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

@@ -13,7 +13,6 @@ public class ShopifyAddressUpdateRequestTest {
 	private static final String SOME_PHONE = "3874928734234";
 	private static final BigDecimal SOME_LONGITUDE = new BigDecimal(485.8323);
 	private static final BigDecimal SOME_LATITUDE = new BigDecimal(41.489);
-	private static final String SOME_NAME = "Ryan Kazokas";
 	private static final String SOME_LAST_NAME = "Kazokas";
 	private static final String SOME_FIRST_NAME = "Ryan";
 	private static final String SOME_COUNTRY_CODE = "US";
@@ -35,7 +34,6 @@ public void givenSomeValuesWhenBuildingShopifyAddressUpdateRequestThenExpectCorr
 		shopifyAddressUpdateRequest.setCountryCode(SOME_COUNTRY_CODE);
 		shopifyAddressUpdateRequest.setFirstName(SOME_FIRST_NAME);
 		shopifyAddressUpdateRequest.setLastname(SOME_LAST_NAME);
-		shopifyAddressUpdateRequest.setName(SOME_NAME);
 		shopifyAddressUpdateRequest.setLatitude(SOME_LATITUDE);
 		shopifyAddressUpdateRequest.setLongitude(SOME_LONGITUDE);
 		shopifyAddressUpdateRequest.setPhone(SOME_PHONE);