From 065b658a0e9566d0317a6b62fdd25415438c8a87 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Fri, 22 May 2020 16:52:12 +0200 Subject: [PATCH 1/7] Bulk import users --- .../java/com/cloudesire/platform/apiclient/api/BulkApi.java | 4 ++++ .../java/com/cloudesire/platform/apiclient/api/UserApi.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java index 200a0a1db..d7e8a42d8 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java @@ -51,4 +51,8 @@ public interface BulkApi @Multipart @PUT( "bulk/resellerCatalog/{id}" ) Call saveResellerCatalog( @Path( "id" ) int id, @Part MultipartBody.Part payload ); + + @Multipart + @PUT( "bulk/user" ) + Call saveUsers( @Part MultipartBody.Part file ); } diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/UserApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/UserApi.java index bbcfd9acb..47c95ad67 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/UserApi.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/UserApi.java @@ -4,10 +4,10 @@ import com.cloudesire.platform.apiclient.dto.model.dto.MyUserDTO; import com.cloudesire.platform.apiclient.dto.model.dto.PasswordRecoveryDTO; import com.cloudesire.platform.apiclient.dto.model.dto.PasswordResetDTO; -import com.cloudesire.platform.apiclient.dto.model.dto.StripePaymentMethodDTO; +import com.cloudesire.platform.apiclient.dto.model.dto.PaymentMethodDTO; import com.cloudesire.platform.apiclient.dto.model.dto.SepaDataDTO; +import com.cloudesire.platform.apiclient.dto.model.dto.StripePaymentMethodDTO; import com.cloudesire.platform.apiclient.dto.model.dto.StripeTokenDTO; -import com.cloudesire.platform.apiclient.dto.model.dto.PaymentMethodDTO; import com.cloudesire.platform.apiclient.dto.model.dto.request.UserActivationDTO; import com.cloudesire.platform.apiclient.dto.model.enums.UserRole; import com.cloudesire.platform.apiclient.dto.model.patch.UserPatchDTO; From e95f31f9152e47e35005d67bb26ab46c5528515f Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Mon, 25 May 2020 09:28:46 +0200 Subject: [PATCH 2/7] Split CSVs --- .../dto/model/dto/csv/BaseUserCsvDTO.java | 203 ++++++++++++++++++ .../dto/model/dto/csv/CatalogUserCsvDTO.java | 8 + .../dto/model/dto/csv/MyUserCsvDTO.java | 196 +---------------- 3 files changed, 213 insertions(+), 194 deletions(-) create mode 100644 cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/BaseUserCsvDTO.java create mode 100644 cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/BaseUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/BaseUserCsvDTO.java new file mode 100644 index 000000000..8271f1cf0 --- /dev/null +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/BaseUserCsvDTO.java @@ -0,0 +1,203 @@ +package com.cloudesire.platform.apiclient.dto.model.dto.csv; + +import com.cloudesire.platform.apiclient.dto.model.dto.DTO; + +abstract class BaseUserCsvDTO extends DTO +{ + private String name; + + private String surname; + + private String phone; + + private String email; + + private String pec; + + // region Auto-generated code + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public String getSurname() + { + return surname; + } + + public void setSurname( String surname ) + { + this.surname = surname; + } + + public String getPhone() + { + return phone; + } + + public void setPhone( String phone ) + { + this.phone = phone; + } + + public String getEmail() + { + return email; + } + + public void setEmail( String email ) + { + this.email = email; + } + + public String getPec() + { + return pec; + } + + public void setPec( String pec ) + { + this.pec = pec; + } + // endregion + + abstract static class BaseCompany + { + private String name; + + private String vat; + + private String country; + + private String address; + + private String city; + + private String state; + + private String zip; + + private String geocallId; + + private String sdiCode; + + private String pec; + + private String type; + + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public String getVat() + { + return vat; + } + + public void setVat( String vat ) + { + this.vat = vat; + } + + public String getCountry() + { + return country; + } + + public void setCountry( String country ) + { + this.country = country; + } + + public String getAddress() + { + return address; + } + + public void setAddress( String address ) + { + this.address = address; + } + + public String getCity() + { + return city; + } + + public void setCity( String city ) + { + this.city = city; + } + + public String getState() + { + return state; + } + + public void setState( String state ) + { + this.state = state; + } + + public String getZip() + { + return zip; + } + + public void setZip( String zip ) + { + this.zip = zip; + } + + public String getGeocallId() + { + return geocallId; + } + + public void setGeocallId( String geocallId ) + { + this.geocallId = geocallId; + } + + public String getSdiCode() + { + return sdiCode; + } + + public void setSdiCode( String sdiCode ) + { + this.sdiCode = sdiCode; + } + + public String getPec() + { + return pec; + } + + public void setPec( String pec ) + { + this.pec = pec; + } + + public String getType() + { + return type; + } + + public void setType( String type ) + { + this.type = type; + } + } +} diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java new file mode 100644 index 000000000..26e20d137 --- /dev/null +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java @@ -0,0 +1,8 @@ +package com.cloudesire.platform.apiclient.dto.model.dto.csv; + +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +@JsonPropertyOrder( { "name", "surname", "phone", "email", "pec" } ) +public class CatalogUserCsvDTO extends BaseUserCsvDTO +{ +} diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/MyUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/MyUserCsvDTO.java index ff6f82113..06056f1a0 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/MyUserCsvDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/MyUserCsvDTO.java @@ -1,24 +1,13 @@ package com.cloudesire.platform.apiclient.dto.model.dto.csv; -import com.cloudesire.platform.apiclient.dto.model.dto.DTO; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonUnwrapped; import java.util.Date; @JsonPropertyOrder( { "name", "surname", "phone", "email", "pec", "geocallId", "creationDate", "active", "activationDate" } ) -public class MyUserCsvDTO extends DTO +public class MyUserCsvDTO extends BaseUserCsvDTO { - private String name; - - private String surname; - - private String phone; - - private String email; - - private String pec; - private String geocallId; private Date creationDate; @@ -31,56 +20,6 @@ public class MyUserCsvDTO extends DTO private Company company; // region Auto-generated code - public String getName() - { - return name; - } - - public void setName( String name ) - { - this.name = name; - } - - public String getSurname() - { - return surname; - } - - public void setSurname( String surname ) - { - this.surname = surname; - } - - public String getPhone() - { - return phone; - } - - public void setPhone( String phone ) - { - this.phone = phone; - } - - public String getEmail() - { - return email; - } - - public void setEmail( String email ) - { - this.email = email; - } - - public String getPec() - { - return pec; - } - - public void setPec( String pec ) - { - this.pec = pec; - } - public String getGeocallId() { return geocallId; @@ -135,138 +74,7 @@ public void setCompany( Company company ) @JsonPropertyOrder( { "name", "vat", "country", "address", "city", "state", "zip", "geocallId", "sdiCode", "pec", "type" } ) - public static class Company + public static class Company extends BaseCompany { - private String name; - - private String vat; - - private String country; - - private String address; - - private String city; - - private String state; - - private String zip; - - private String geocallId; - - private String sdiCode; - - private String pec; - - private String type; - - public String getName() - { - return name; - } - - public void setName( String name ) - { - this.name = name; - } - - public String getVat() - { - return vat; - } - - public void setVat( String vat ) - { - this.vat = vat; - } - - public String getCountry() - { - return country; - } - - public void setCountry( String country ) - { - this.country = country; - } - - public String getAddress() - { - return address; - } - - public void setAddress( String address ) - { - this.address = address; - } - - public String getCity() - { - return city; - } - - public void setCity( String city ) - { - this.city = city; - } - - public String getState() - { - return state; - } - - public void setState( String state ) - { - this.state = state; - } - - public String getZip() - { - return zip; - } - - public void setZip( String zip ) - { - this.zip = zip; - } - - public String getGeocallId() - { - return geocallId; - } - - public void setGeocallId( String geocallId ) - { - this.geocallId = geocallId; - } - - public String getSdiCode() - { - return sdiCode; - } - - public void setSdiCode( String sdiCode ) - { - this.sdiCode = sdiCode; - } - - public String getPec() - { - return pec; - } - - public void setPec( String pec ) - { - this.pec = pec; - } - - public String getType() - { - return type; - } - - public void setType( String type ) - { - this.type = type; - } } } From 4fe2a3eb44212189279f6ed6ff465500a3ac3943 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Mon, 25 May 2020 11:40:15 +0200 Subject: [PATCH 3/7] Add address --- .../dto/model/dto/csv/CatalogUserCsvDTO.java | 105 +++++++++++++++++- .../platform/apiclient/api/BulkApi.java | 5 + 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java index 26e20d137..5b4265542 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java @@ -1,8 +1,111 @@ package com.cloudesire.platform.apiclient.dto.model.dto.csv; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonUnwrapped; -@JsonPropertyOrder( { "name", "surname", "phone", "email", "pec" } ) +@JsonPropertyOrder( { "userName", "name", "surname", "email", "pec", "phone" } ) public class CatalogUserCsvDTO extends BaseUserCsvDTO { + private String userName; + + @JsonUnwrapped( prefix = "address." ) + private Address address; + + public String getUserName() + { + return userName; + } + + public void setUserName( String userName ) + { + this.userName = userName; + } + + public Address getAddress() + { + return address; + } + + public void setAddress( Address address ) + { + this.address = address; + } + + @JsonPropertyOrder( { + "country", "countryCode", "state", "city", "address", "zipCode" + } ) + public static class Address + { + private String country; + + private String countryCode; + + private String state; + + private String city; + + private String address; + + private String zipCode; + + public String getCountry() + { + return country; + } + + public void setCountry( String country ) + { + this.country = country; + } + + public String getCountryCode() + { + return countryCode; + } + + public void setCountryCode( String countryCode ) + { + this.countryCode = countryCode; + } + + public String getState() + { + return state; + } + + public void setState( String state ) + { + this.state = state; + } + + public String getCity() + { + return city; + } + + public void setCity( String city ) + { + this.city = city; + } + + public String getAddress() + { + return address; + } + + public void setAddress( String address ) + { + this.address = address; + } + + public String getZipCode() + { + return zipCode; + } + + public void setZipCode( String zipCode ) + { + this.zipCode = zipCode; + } + } } diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java index d7e8a42d8..14aecc6e5 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java @@ -36,6 +36,11 @@ public interface BulkApi @Streaming Call getResellerCatalog( @Path( "id" ) int id ); + @GET( "bulk/users" ) + @Headers( { "Accept:text/csv" } ) + @Streaming + Call getUsers( @QueryMap Map pageRequest ); + @Multipart @PUT( "bulk/cloudPricings" ) Call saveCloudPricings( @Part MultipartBody.Part payload ); From 8f3cef511c244f855b2c978d55a06dffa8c00460 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Mon, 25 May 2020 12:34:38 +0200 Subject: [PATCH 4/7] Add fields --- .../dto/model/dto/csv/CatalogUserCsvDTO.java | 65 ++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java index 5b4265542..7e4465073 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java @@ -3,11 +3,24 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonUnwrapped; -@JsonPropertyOrder( { "userName", "name", "surname", "email", "pec", "phone" } ) +@JsonPropertyOrder( { + "userName", "name", "surname", "email", "pec", "phone", "password", "language", "enabled", "acceptedTerms", + "fiscalCode" +} ) public class CatalogUserCsvDTO extends BaseUserCsvDTO { private String userName; + private String password; + + private String language; + + private Boolean enabled; + + private Boolean acceptedTerms; + + private String fiscalCode; + @JsonUnwrapped( prefix = "address." ) private Address address; @@ -21,6 +34,56 @@ public void setUserName( String userName ) this.userName = userName; } + public String getPassword() + { + return password; + } + + public void setPassword( String password ) + { + this.password = password; + } + + public String getLanguage() + { + return language; + } + + public void setLanguage( String language ) + { + this.language = language; + } + + public Boolean getEnabled() + { + return enabled; + } + + public void setEnabled( Boolean enabled ) + { + this.enabled = enabled; + } + + public Boolean getAcceptedTerms() + { + return acceptedTerms; + } + + public void setAcceptedTerms( Boolean acceptedTerms ) + { + this.acceptedTerms = acceptedTerms; + } + + public String getFiscalCode() + { + return fiscalCode; + } + + public void setFiscalCode( String fiscalCode ) + { + this.fiscalCode = fiscalCode; + } + public Address getAddress() { return address; From b9420b92b3e5320ab62c3ad18ef729b728da4d5a Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Wed, 27 May 2020 16:02:57 +0200 Subject: [PATCH 5/7] Add companyName --- .../dto/model/dto/csv/CatalogUserCsvDTO.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java index 7e4465073..8f1817ae6 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java @@ -4,11 +4,13 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; @JsonPropertyOrder( { - "userName", "name", "surname", "email", "pec", "phone", "password", "language", "enabled", "acceptedTerms", - "fiscalCode" + "companyName", "userName", "name", "surname", "email", "pec", "phone", "password", "language", "enabled", + "acceptedTerms", "fiscalCode" } ) public class CatalogUserCsvDTO extends BaseUserCsvDTO { + private String companyName; + private String userName; private String password; @@ -24,6 +26,16 @@ public class CatalogUserCsvDTO extends BaseUserCsvDTO @JsonUnwrapped( prefix = "address." ) private Address address; + public String getCompanyName() + { + return companyName; + } + + public void setCompanyName( String companyName ) + { + this.companyName = companyName; + } + public String getUserName() { return userName; From 2d62f12cb8668263c0907206decb1f3be0b3576e Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Thu, 4 Jun 2020 17:23:13 +0200 Subject: [PATCH 6/7] Renamerino --- .../dto/csv/{CatalogUserCsvDTO.java => CustomerCsvDTO.java} | 2 +- .../java/com/cloudesire/platform/apiclient/api/BulkApi.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/{CatalogUserCsvDTO.java => CustomerCsvDTO.java} (98%) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java similarity index 98% rename from cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java rename to cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java index 8f1817ae6..ad15c73e5 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CatalogUserCsvDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java @@ -7,7 +7,7 @@ "companyName", "userName", "name", "surname", "email", "pec", "phone", "password", "language", "enabled", "acceptedTerms", "fiscalCode" } ) -public class CatalogUserCsvDTO extends BaseUserCsvDTO +public class CustomerCsvDTO extends BaseUserCsvDTO { private String companyName; diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java index 14aecc6e5..44bf8cc81 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/BulkApi.java @@ -43,11 +43,11 @@ public interface BulkApi @Multipart @PUT( "bulk/cloudPricings" ) - Call saveCloudPricings( @Part MultipartBody.Part payload ); + Call saveCloudPricings( @Part MultipartBody.Part file ); @Multipart @PUT( "bulk/distributorCatalog/{id}" ) - Call saveDistributorCatalog( @Path( "id" ) int id, @Part MultipartBody.Part payload ); + Call saveDistributorCatalog( @Path( "id" ) int id, @Part MultipartBody.Part file ); @Multipart @PUT( "bulk/plans" ) @@ -55,7 +55,7 @@ public interface BulkApi @Multipart @PUT( "bulk/resellerCatalog/{id}" ) - Call saveResellerCatalog( @Path( "id" ) int id, @Part MultipartBody.Part payload ); + Call saveResellerCatalog( @Path( "id" ) int id, @Part MultipartBody.Part file ); @Multipart @PUT( "bulk/user" ) From a3d4138b0258c2f911401a04ba96e446618ddfb0 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Fri, 5 Jun 2020 16:02:09 +0200 Subject: [PATCH 7/7] Retrieve company by tax code --- .../dto/model/dto/csv/CustomerCsvDTO.java | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java index ad15c73e5..74b51efc8 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/csv/CustomerCsvDTO.java @@ -4,13 +4,11 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; @JsonPropertyOrder( { - "companyName", "userName", "name", "surname", "email", "pec", "phone", "password", "language", "enabled", - "acceptedTerms", "fiscalCode" + "userName", "name", "surname", "email", "pec", "phone", "password", "language", "enabled", "acceptedTerms", + "fiscalCode", "companyName", "taxCode" } ) public class CustomerCsvDTO extends BaseUserCsvDTO { - private String companyName; - private String userName; private String password; @@ -23,18 +21,12 @@ public class CustomerCsvDTO extends BaseUserCsvDTO private String fiscalCode; - @JsonUnwrapped( prefix = "address." ) - private Address address; + private String companyName; - public String getCompanyName() - { - return companyName; - } + private String taxCode; - public void setCompanyName( String companyName ) - { - this.companyName = companyName; - } + @JsonUnwrapped( prefix = "address." ) + private Address address; public String getUserName() { @@ -106,6 +98,26 @@ public void setAddress( Address address ) this.address = address; } + public String getCompanyName() + { + return companyName; + } + + public void setCompanyName( String companyName ) + { + this.companyName = companyName; + } + + public String getTaxCode() + { + return taxCode; + } + + public void setTaxCode( String taxCode ) + { + this.taxCode = taxCode; + } + @JsonPropertyOrder( { "country", "countryCode", "state", "city", "address", "zipCode" } )