CC-153 Rename CustomerCompanyData (#142)

Ryouzanpaku · web-flow · commit b0b8948acd7a · 2023-11-15T16:40:37.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,11 @@ Consists of internal refactorings and improvements.
 * Renamed `AbstractTransaction` -> `BaseTransaction`
 * Refactored `UrlUtil`: moved Resource URL construction logic to `Resource`-classes.
 * Every Unzer Payment Gateway resource implements `Resource` instead of `PaymentType`: `Customer`, `Basket`, `Payment`, etc.
+* Renamed `com.unzer.payment.CustomerCompanyData` to `CompanyInfo`
+* Renamed property and methods of `com.unzer.payment.Customer.Customer` to match class name:
+    * property `companyData`-> `companyInfo`
+    * method `getCompanyData()` -> `getCompanyInfo()`
+    * method `setCompanyData()` -> `setCompanyInfo()`
 
 ### Removed
 
diff --git a/src/main/java/com/unzer/payment/CompanyInfo.java b/src/main/java/com/unzer/payment/CompanyInfo.java
@@ -6,7 +6,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-public class CustomerCompanyData {
+public class CompanyInfo {
     private CompanyType companyType;
     private Owner owner;
     private RegistrationType registrationType;
@@ -17,7 +17,7 @@ public CompanyType getCompanyType() {
         return companyType;
     }
 
-    public CustomerCompanyData setCompanyType(CompanyType companyType) {
+    public CompanyInfo setCompanyType(CompanyType companyType) {
         this.companyType = companyType;
         return this;
     }
@@ -26,7 +26,7 @@ public Owner getOwner() {
         return owner;
     }
 
-    public CustomerCompanyData setOwner(Owner owner) {
+    public CompanyInfo setOwner(Owner owner) {
         this.owner = owner;
         return this;
     }
@@ -35,7 +35,7 @@ public RegistrationType getRegistrationType() {
         return registrationType;
     }
 
-    public CustomerCompanyData setRegistrationType(RegistrationType registrationType) {
+    public CompanyInfo setRegistrationType(RegistrationType registrationType) {
         this.registrationType = registrationType;
         return this;
     }
@@ -44,7 +44,7 @@ public String getCommercialRegisterNumber() {
         return commercialRegisterNumber;
     }
 
-    public CustomerCompanyData setCommercialRegisterNumber(String commercialRegisterNumber) {
+    public CompanyInfo setCommercialRegisterNumber(String commercialRegisterNumber) {
         this.commercialRegisterNumber = commercialRegisterNumber;
         return this;
     }
@@ -53,7 +53,7 @@ public CommercialSector getCommercialSector() {
         return commercialSector;
     }
 
-    public CustomerCompanyData setCommercialSector(CommercialSector commercialSector) {
+    public CompanyInfo setCommercialSector(CommercialSector commercialSector) {
         this.commercialSector = commercialSector;
         return this;
     }
diff --git a/src/main/java/com/unzer/payment/Customer.java b/src/main/java/com/unzer/payment/Customer.java
@@ -34,7 +34,7 @@ public class Customer extends BaseResource {
      */
     private Locale language;
 
-    private CustomerCompanyData companyData;
+    private CompanyInfo companyInfo;
 
     public Customer(String firstname, String lastname) {
         super();
@@ -146,12 +146,12 @@ public Customer setShippingAddress(Address shippingAddress) {
         return this;
     }
 
-    public CustomerCompanyData getCompanyData() {
-        return companyData;
+    public CompanyInfo getCompanyInfo() {
+        return companyInfo;
     }
 
-    public void setCompanyData(CustomerCompanyData companyData) {
-        this.companyData = companyData;
+    public void setCompanyInfo(CompanyInfo companyInfo) {
+        this.companyInfo = companyInfo;
     }
 
     public String getCompany() {
diff --git a/src/main/java/com/unzer/payment/communication/json/JsonCompanyInfo.java b/src/main/java/com/unzer/payment/communication/json/JsonCompanyInfo.java
@@ -1,15 +1,15 @@
 package com.unzer.payment.communication.json;
 
-import com.unzer.payment.CustomerCompanyData;
+import com.unzer.payment.CompanyInfo;
 
 public class JsonCompanyInfo {
 
     private String registrationType;
     private String commercialRegisterNumber;
     private String function;
     private String commercialSector;
-    private CustomerCompanyData.CompanyType companyType;
-    private CustomerCompanyData.Owner owner;
+    private CompanyInfo.CompanyType companyType;
+    private CompanyInfo.Owner owner;
 
     public String getRegistrationType() {
         return registrationType;
@@ -46,11 +46,11 @@ public void setCommercialSector(String commercialSector) {
         this.commercialSector = commercialSector;
     }
 
-    public CustomerCompanyData.CompanyType getCompanyType() {
+    public CompanyInfo.CompanyType getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(CustomerCompanyData.CompanyType companyType) {
+    public void setCompanyType(CompanyInfo.CompanyType companyType) {
         this.companyType = companyType;
     }
 }
diff --git a/src/main/java/com/unzer/payment/communication/mapper/ApiToSdkConverter.java b/src/main/java/com/unzer/payment/communication/mapper/ApiToSdkConverter.java
@@ -346,11 +346,11 @@ public ApiCustomer map(Customer src) {
 
         out.setBillingAddress(src.getBillingAddress());
         out.setShippingAddress(src.getShippingAddress());
-        out.setCompanyInfo(getCompanyInfo(src.getCompanyData(), src.getCompany()));
+        out.setCompanyInfo(getCompanyInfo(src.getCompanyInfo(), src.getCompany()));
         return out;
     }
 
-    private JsonCompanyInfo getCompanyInfo(CustomerCompanyData src, String company) {
+    private JsonCompanyInfo getCompanyInfo(CompanyInfo src, String company) {
         if (src == null) {
             return null;
         }
@@ -363,12 +363,12 @@ private JsonCompanyInfo getCompanyInfo(CustomerCompanyData src, String company)
         return out;
     }
 
-    private void mapRegisteredCompany(CustomerCompanyData src, JsonCompanyInfo out) {
+    private void mapRegisteredCompany(CompanyInfo src, JsonCompanyInfo out) {
         out.setRegistrationType("registered");
         out.setCommercialRegisterNumber(src.getCommercialRegisterNumber());
     }
 
-    private void mapUnregisteredCompany(CustomerCompanyData src, JsonCompanyInfo out) {
+    private void mapUnregisteredCompany(CompanyInfo src, JsonCompanyInfo out) {
         out.setFunction("OWNER");
         out.setRegistrationType("not_registered");
         if (src.getCommercialSector() != null) {
@@ -395,25 +395,25 @@ public Customer mapToBusinessObject(ApiCustomer src, Customer out) {
 
         out.setBillingAddress(src.getBillingAddress());
         out.setShippingAddress(src.getShippingAddress());
-        out.setCompanyData(getCompanyInfo(src.getCompanyInfo()));
+        out.setCompanyInfo(getCompanyInfo(src.getCompanyInfo()));
         return out;
     }
 
-    private CustomerCompanyData getCompanyInfo(JsonCompanyInfo src) {
+    private CompanyInfo getCompanyInfo(JsonCompanyInfo src) {
         if (src == null) {
             return null;
         }
         if (allFieldsNull(src)) {
             return null;
         }
-        CustomerCompanyData out = new CustomerCompanyData();
+        CompanyInfo out = new CompanyInfo();
         out.setCommercialRegisterNumber(src.getCommercialRegisterNumber());
         if (src.getCommercialSector() != null) {
             out.setCommercialSector(CommercialSector.valueOf(src.getCommercialSector()));
         }
         if (src.getRegistrationType() != null) {
             out.setRegistrationType(
-                    CustomerCompanyData.RegistrationType.valueOf(src.getRegistrationType().toUpperCase()));
+                    CompanyInfo.RegistrationType.valueOf(src.getRegistrationType().toUpperCase()));
         }
         return out;
     }
diff --git a/src/test/java/com/unzer/payment/business/AbstractPaymentTest.java b/src/test/java/com/unzer/payment/business/AbstractPaymentTest.java
@@ -290,42 +290,42 @@ protected Customer getMaximumUnknownCustomer(String customerId) {
     protected Customer getRegisterdMinimumBusinessCustomer() {
         Customer customer = getMinimumRegisteredCustomer();
         customer.setBillingAddress(getAddress());
-        customer.setCompanyData(getRegisteredCompanyData());
+        customer.setCompanyInfo(getRegisteredCompanyInfo());
         return customer;
     }
 
     protected Customer getRegisterdMaximumBusinessCustomer(String customerId) throws ParseException {
         Customer customer = getMaximumCustomer(customerId);
         customer.setCompany("Unzer E-Com GmbH");
-        getUnregisteredCompanyData();
-        customer.setCompanyData(getRegisteredCompanyData());
+        getUnregisteredCompanyInfo();
+        customer.setCompanyInfo(getRegisteredCompanyInfo());
         return customer;
     }
 
     protected Customer getUnRegisterdMinimumBusinessCustomer() throws ParseException {
         Customer customer = getMinimumCustomer();
         customer.setBillingAddress(getAddress());
 
-        customer.setCompanyData(getUnregisteredCompanyData());
+        customer.setCompanyInfo(getUnregisteredCompanyInfo());
         return customer;
     }
 
     protected Customer getUnRegisterdMaximumBusinessCustomer() throws ParseException {
         Customer customer = getMaximumCustomer(generateUuid());
-        customer.setCompanyData(getUnregisteredCompanyData());
+        customer.setCompanyInfo(getUnregisteredCompanyInfo());
         return customer;
     }
 
-    protected CustomerCompanyData getUnregisteredCompanyData() {
-        CustomerCompanyData business = new CustomerCompanyData();
+    protected CompanyInfo getUnregisteredCompanyInfo() {
+        CompanyInfo business = new CompanyInfo();
         business.setCommercialRegisterNumber("HRB337681 MANNHEIM");
         return business;
     }
 
-    protected CustomerCompanyData getRegisteredCompanyData() {
-        CustomerCompanyData customerBusinessData = new CustomerCompanyData();
-        customerBusinessData.setCommercialRegisterNumber("HRB337681 MANNHEIM");
-        return customerBusinessData;
+    protected CompanyInfo getRegisteredCompanyInfo() {
+        CompanyInfo companyInfo = new CompanyInfo();
+        companyInfo.setCommercialRegisterNumber("HRB337681 MANNHEIM");
+        return companyInfo;
     }
 
     protected Customer getFactoringOKCustomer(String customerId) throws ParseException {
@@ -404,7 +404,7 @@ private void assertProcessingEquals(Processing initProcessing, Processing proces
         assertEquals(initProcessing.getUniqueId(), processing.getUniqueId());
     }
 
-    protected void assertBusinessCustomerEquals(CustomerCompanyData customerExpected, CustomerCompanyData customer) {
+    protected void assertBusinessCustomerEquals(CompanyInfo customerExpected, CompanyInfo customer) {
         if (customerExpected == null && customer == null) return;
         assertEquals(customerExpected.getCommercialRegisterNumber(), customer.getCommercialRegisterNumber());
         assertEquals(customerExpected.getCommercialSector(), customer.getCommercialSector());
@@ -421,7 +421,7 @@ protected void assertCustomerEquals(Customer customerExpected, Customer customer
 
         assertAddressEquals(customerExpected.getBillingAddress(), customer.getBillingAddress());
         assertAddressEquals(customerExpected.getShippingAddress(), customer.getShippingAddress());
-        assertBusinessCustomerEquals(customerExpected.getCompanyData(), customer.getCompanyData());
+        assertBusinessCustomerEquals(customerExpected.getCompanyInfo(), customer.getCompanyInfo());
     }
 
     protected void assertAddressEquals(Address addressExpected, Address address) {
diff --git a/src/test/java/com/unzer/payment/business/BusinessCustomerTest.java b/src/test/java/com/unzer/payment/business/BusinessCustomerTest.java
@@ -2,7 +2,7 @@
 
 
 import com.unzer.payment.Customer;
-import com.unzer.payment.CustomerCompanyData;
+import com.unzer.payment.CompanyInfo;
 import com.unzer.payment.PaymentException;
 import com.unzer.payment.communication.HttpCommunicationException;
 import org.junit.jupiter.api.Disabled;
@@ -81,14 +81,14 @@ public void testUpdateCustomer() throws HttpCommunicationException, ParseExcepti
         assertNotNull(customer);
         assertNotNull(customer.getId());
         Customer customerToUpdate = new Customer("Unzer E-Com GmbH");
-        CustomerCompanyData company = getRegisteredCompanyData();
+        CompanyInfo company = getRegisteredCompanyInfo();
         company.setCommercialRegisterNumber("ABC993448 DÜSSELDORF");
-        customerToUpdate.setCompanyData(company);
+        customerToUpdate.setCompanyInfo(company);
         Customer updatedCustomer = getUnzer().updateCustomer(customer.getId(), customerToUpdate);
         assertEquals("Unzer E-Com GmbH", updatedCustomer.getCompany());
         Customer fetchedCustomer = getUnzer().fetchCustomer(customer.getId());
         assertEquals("Unzer E-Com GmbH", fetchedCustomer.getCompany());
-        assertEquals("ABC993448 DÜSSELDORF", fetchedCustomer.getCompanyData().getCommercialRegisterNumber());
+        assertEquals("ABC993448 DÜSSELDORF", fetchedCustomer.getCompanyInfo().getCommercialRegisterNumber());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`import java.text.SimpleDateFormat;`
`7`	`7`	`import java.util.Date;`
`8`	`8`
`9`		`-public class CustomerCompanyData {`
	`9`	`+public class CompanyInfo {`
`10`	`10`	`private CompanyType companyType;`
`11`	`11`	`private Owner owner;`
`12`	`12`	`private RegistrationType registrationType;`
`@@ -17,7 +17,7 @@ public CompanyType getCompanyType() {`
`17`	`17`	`return companyType;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public CustomerCompanyData setCompanyType(CompanyType companyType) {`
	`20`	`+ public CompanyInfo setCompanyType(CompanyType companyType) {`
`21`	`21`	`this.companyType = companyType;`
`22`	`22`	`return this;`
`23`	`23`	`}`
`@@ -26,7 +26,7 @@ public Owner getOwner() {`
`26`	`26`	`return owner;`
`27`	`27`	`}`
`28`	`28`
`29`		`- public CustomerCompanyData setOwner(Owner owner) {`
	`29`	`+ public CompanyInfo setOwner(Owner owner) {`
`30`	`30`	`this.owner = owner;`
`31`	`31`	`return this;`
`32`	`32`	`}`
`@@ -35,7 +35,7 @@ public RegistrationType getRegistrationType() {`
`35`	`35`	`return registrationType;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public CustomerCompanyData setRegistrationType(RegistrationType registrationType) {`
	`38`	`+ public CompanyInfo setRegistrationType(RegistrationType registrationType) {`
`39`	`39`	`this.registrationType = registrationType;`
`40`	`40`	`return this;`
`41`	`41`	`}`
`@@ -44,7 +44,7 @@ public String getCommercialRegisterNumber() {`
`44`	`44`	`return commercialRegisterNumber;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public CustomerCompanyData setCommercialRegisterNumber(String commercialRegisterNumber) {`
	`47`	`+ public CompanyInfo setCommercialRegisterNumber(String commercialRegisterNumber) {`
`48`	`48`	`this.commercialRegisterNumber = commercialRegisterNumber;`
`49`	`49`	`return this;`
`50`	`50`	`}`
`@@ -53,7 +53,7 @@ public CommercialSector getCommercialSector() {`
`53`	`53`	`return commercialSector;`
`54`	`54`	`}`
`55`	`55`
`56`		`- public CustomerCompanyData setCommercialSector(CommercialSector commercialSector) {`
	`56`	`+ public CompanyInfo setCommercialSector(CommercialSector commercialSector) {`
`57`	`57`	`this.commercialSector = commercialSector;`
`58`	`58`	`return this;`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -346,11 +346,11 @@ public ApiCustomer map(Customer src) {`
`346`	`346`
`347`	`347`	`out.setBillingAddress(src.getBillingAddress());`
`348`	`348`	`out.setShippingAddress(src.getShippingAddress());`
`349`		`- out.setCompanyInfo(getCompanyInfo(src.getCompanyData(), src.getCompany()));`
	`349`	`+ out.setCompanyInfo(getCompanyInfo(src.getCompanyInfo(), src.getCompany()));`
`350`	`350`	`return out;`
`351`	`351`	`}`
`352`	`352`
`353`		`- private JsonCompanyInfo getCompanyInfo(CustomerCompanyData src, String company) {`
	`353`	`+ private JsonCompanyInfo getCompanyInfo(CompanyInfo src, String company) {`
`354`	`354`	`if (src == null) {`
`355`	`355`	`return null;`
`356`	`356`	`}`
`@@ -363,12 +363,12 @@ private JsonCompanyInfo getCompanyInfo(CustomerCompanyData src, String company)`
`363`	`363`	`return out;`
`364`	`364`	`}`
`365`	`365`
`366`		`- private void mapRegisteredCompany(CustomerCompanyData src, JsonCompanyInfo out) {`
	`366`	`+ private void mapRegisteredCompany(CompanyInfo src, JsonCompanyInfo out) {`
`367`	`367`	`out.setRegistrationType("registered");`
`368`	`368`	`out.setCommercialRegisterNumber(src.getCommercialRegisterNumber());`
`369`	`369`	`}`
`370`	`370`
`371`		`- private void mapUnregisteredCompany(CustomerCompanyData src, JsonCompanyInfo out) {`
	`371`	`+ private void mapUnregisteredCompany(CompanyInfo src, JsonCompanyInfo out) {`
`372`	`372`	`out.setFunction("OWNER");`
`373`	`373`	`out.setRegistrationType("not_registered");`
`374`	`374`	`if (src.getCommercialSector() != null) {`
`@@ -395,25 +395,25 @@ public Customer mapToBusinessObject(ApiCustomer src, Customer out) {`
`395`	`395`
`396`	`396`	`out.setBillingAddress(src.getBillingAddress());`
`397`	`397`	`out.setShippingAddress(src.getShippingAddress());`
`398`		`- out.setCompanyData(getCompanyInfo(src.getCompanyInfo()));`
	`398`	`+ out.setCompanyInfo(getCompanyInfo(src.getCompanyInfo()));`
`399`	`399`	`return out;`
`400`	`400`	`}`
`401`	`401`
`402`		`- private CustomerCompanyData getCompanyInfo(JsonCompanyInfo src) {`
	`402`	`+ private CompanyInfo getCompanyInfo(JsonCompanyInfo src) {`
`403`	`403`	`if (src == null) {`
`404`	`404`	`return null;`
`405`	`405`	`}`
`406`	`406`	`if (allFieldsNull(src)) {`
`407`	`407`	`return null;`
`408`	`408`	`}`
`409`		`- CustomerCompanyData out = new CustomerCompanyData();`
	`409`	`+ CompanyInfo out = new CompanyInfo();`
`410`	`410`	`out.setCommercialRegisterNumber(src.getCommercialRegisterNumber());`
`411`	`411`	`if (src.getCommercialSector() != null) {`
`412`	`412`	`out.setCommercialSector(CommercialSector.valueOf(src.getCommercialSector()));`
`413`	`413`	`}`
`414`	`414`	`if (src.getRegistrationType() != null) {`
`415`	`415`	`out.setRegistrationType(`
`416`		`- CustomerCompanyData.RegistrationType.valueOf(src.getRegistrationType().toUpperCase()));`
	`416`	`+ CompanyInfo.RegistrationType.valueOf(src.getRegistrationType().toUpperCase()));`
`417`	`417`	`}`
`418`	`418`	`return out;`
`419`	`419`	`}`