Rename TaxCode -> TaxId

6 files changed, 38 insertions, 38 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TaxCode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TaxId.java
index 39176d2428d..bd7a9402033 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TaxCode.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TaxId.java
@@ -8,14 +8,14 @@ import static ai.vespa.validation.Validation.requireLength;
 /**
  * @author olaa
  */
-public class TaxCode extends StringWrapper<TaxCode> {
+public class TaxId extends StringWrapper<TaxId> {
 
-    public TaxCode(String value) {
+    public TaxId(String value) {
         super(value);
         requireLength(value, "tax code length", 0, 64);
     }
 
-    public static TaxCode empty() {
-        return new TaxCode("");
+    public static TaxId empty() {
+        return new TaxId("");
     }
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantBilling.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantBilling.java
index ee23ae31183..6e3b26661e5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantBilling.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantBilling.java
@@ -10,20 +10,20 @@ public class TenantBilling {
 
     private final TenantContact contact;
     private final TenantAddress address;
-    private final TaxCode taxCode;
+    private final TaxId taxId;
     private final PurchaseOrder purchaseOrder;
     private final Email invoiceEmail;
 
-    public TenantBilling(TenantContact contact, TenantAddress address, TaxCode taxCode, PurchaseOrder purchaseOrder, Email invoiceEmail) {
+    public TenantBilling(TenantContact contact, TenantAddress address, TaxId taxId, PurchaseOrder purchaseOrder, Email invoiceEmail) {
         this.contact = Objects.requireNonNull(contact);
         this.address = Objects.requireNonNull(address);
-        this.taxCode = Objects.requireNonNull(taxCode);
+        this.taxId = Objects.requireNonNull(taxId);
         this.purchaseOrder = Objects.requireNonNull(purchaseOrder);
         this.invoiceEmail = Objects.requireNonNull(invoiceEmail);
     }
 
     public static TenantBilling empty() {
-        return new TenantBilling(TenantContact.empty(), TenantAddress.empty(), TaxCode.empty(), PurchaseOrder.empty(), Email.empty());
+        return new TenantBilling(TenantContact.empty(), TenantAddress.empty(), TaxId.empty(), PurchaseOrder.empty(), Email.empty());
     }
 
     public TenantContact contact() {
@@ -34,8 +34,8 @@ public class TenantBilling {
         return address;
     }
 
-    public TaxCode getTaxCode() {
-        return taxCode;
+    public TaxId getTaxId() {
+        return taxId;
     }
 
     public PurchaseOrder getPurchaseOrder() {
@@ -47,23 +47,23 @@ public class TenantBilling {
     }
 
     public TenantBilling withContact(TenantContact updatedContact) {
-        return new TenantBilling(updatedContact, this.address, this.taxCode, this.purchaseOrder, this.invoiceEmail);
+        return new TenantBilling(updatedContact, this.address, this.taxId, this.purchaseOrder, this.invoiceEmail);
     }
 
     public TenantBilling withAddress(TenantAddress updatedAddress) {
-        return new TenantBilling(this.contact, updatedAddress, this.taxCode, this.purchaseOrder, this.invoiceEmail);
+        return new TenantBilling(this.contact, updatedAddress, this.taxId, this.purchaseOrder, this.invoiceEmail);
     }
 
-    public TenantBilling withTaxCode(TaxCode updatedTaxCode) {
-        return new TenantBilling(this.contact, this.address, updatedTaxCode, this.purchaseOrder, this.invoiceEmail);
+    public TenantBilling withTaxId(TaxId updatedTaxId) {
+        return new TenantBilling(this.contact, this.address, updatedTaxId, this.purchaseOrder, this.invoiceEmail);
     }
 
     public TenantBilling withPurchaseOrder(PurchaseOrder updatedPurchaseOrder) {
-        return new TenantBilling(this.contact, this.address, this.taxCode, updatedPurchaseOrder, this.invoiceEmail);
+        return new TenantBilling(this.contact, this.address, this.taxId, updatedPurchaseOrder, this.invoiceEmail);
     }
 
     public TenantBilling withInvoiceEmail(Email updatedInvoiceEmail) {
-        return new TenantBilling(this.contact, this.address, this.taxCode, this.purchaseOrder, updatedInvoiceEmail);
+        return new TenantBilling(this.contact, this.address, this.taxId, this.purchaseOrder, updatedInvoiceEmail);
     }
 
     public boolean isEmpty() {
@@ -77,14 +77,14 @@ public class TenantBilling {
         TenantBilling that = (TenantBilling) o;
         return Objects.equals(contact, that.contact) &&
                 Objects.equals(address, that.address) &&
-                Objects.equals(taxCode, that.taxCode) &&
+                Objects.equals(taxId, that.taxId) &&
                 Objects.equals(purchaseOrder, that.purchaseOrder) &&
                 Objects.equals(invoiceEmail, that.invoiceEmail);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(contact, address, taxCode, purchaseOrder, invoiceEmail);
+        return Objects.hash(contact, address, taxId, purchaseOrder, invoiceEmail);
     }
 
     @Override
@@ -92,7 +92,7 @@ public class TenantBilling {
         return "TenantBilling{" +
                 "contact=" + contact +
                 ", address=" + address +
-                ", taxCode='" + taxCode + '\'' +
+                ", taxId='" + taxId + '\'' +
                 ", purchaseOrder='" + purchaseOrder + '\'' +
                 ", invoiceEmail=" + invoiceEmail +
                 '}';
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
index c733ccc0a5e..eae8f86f289 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
@@ -29,7 +29,7 @@ import com.yahoo.vespa.hosted.controller.tenant.DeletedTenant;
 import com.yahoo.vespa.hosted.controller.tenant.Email;
 import com.yahoo.vespa.hosted.controller.tenant.LastLoginInfo;
 import com.yahoo.vespa.hosted.controller.tenant.PurchaseOrder;
-import com.yahoo.vespa.hosted.controller.tenant.TaxCode;
+import com.yahoo.vespa.hosted.controller.tenant.TaxId;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import com.yahoo.vespa.hosted.controller.tenant.TenantAddress;
 import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
@@ -95,7 +95,7 @@ public class TenantSerializer {
     private static final String cloudAccountsField = "cloudAccounts";
     private static final String accountField = "account";
     private static final String templateVersionField = "templateVersion";
-    private static final String taxCodeField = "taxCode";
+    private static final String taxIdField = "taxId";
     private static final String purchaseOrderField = "purchaseOrder";
     private static final String invoiceEmailField = "invoiceEmail";
 
@@ -287,7 +287,7 @@ public class TenantSerializer {
     }
 
     private TenantBilling tenantInfoBillingContactFromSlime(Inspector billingObject) {
-        var taxCode = new TaxCode(billingObject.field(taxCodeField).asString());
+        var taxId = new TaxId(billingObject.field(taxIdField).asString());
         var purchaseOrder = new PurchaseOrder(billingObject.field(purchaseOrderField).asString());
         var invoiceEmail = new Email(billingObject.field(invoiceEmailField).asString(), false);
 
@@ -297,7 +297,7 @@ public class TenantSerializer {
                         new Email(billingObject.field("email").asString(), billingObject.field("emailVerified").asBool()),
                         billingObject.field("phone").asString()))
                 .withAddress(tenantInfoAddressFromSlime(billingObject.field("address")))
-                .withTaxCode(taxCode)
+                .withTaxId(taxId)
                 .withPurchaseOrder(purchaseOrder)
                 .withInvoiceEmail(invoiceEmail);
     }
@@ -361,7 +361,7 @@ public class TenantSerializer {
         billingCursor.setString("email", billingContact.contact().email().getEmailAddress());
         billingCursor.setBool("emailVerified", billingContact.contact().email().isVerified());
         billingCursor.setString("phone", billingContact.contact().phone());
-        billingCursor.setString(taxCodeField, billingContact.getTaxCode().value());
+        billingCursor.setString(taxIdField, billingContact.getTaxId().value());
         billingCursor.setString(purchaseOrderField, billingContact.getPurchaseOrder().value());
         billingCursor.setString(invoiceEmailField, billingContact.getInvoiceEmail().getEmailAddress());
         toSlime(billingContact.address(), billingCursor);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index c108040c7a1..5548928b9d0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -128,7 +128,7 @@ import com.yahoo.vespa.hosted.controller.tenant.Email;
 import com.yahoo.vespa.hosted.controller.tenant.LastLoginInfo;
 import com.yahoo.vespa.hosted.controller.tenant.PendingMailVerification;
 import com.yahoo.vespa.hosted.controller.tenant.PurchaseOrder;
-import com.yahoo.vespa.hosted.controller.tenant.TaxCode;
+import com.yahoo.vespa.hosted.controller.tenant.TaxId;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import com.yahoo.vespa.hosted.controller.tenant.TenantAddress;
 import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
@@ -696,7 +696,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
             contact.setString("email", billingContact.contact().email().getEmailAddress());
             contact.setBool("emailVerified", billingContact.contact().email().isVerified());
             contact.setString("phone", billingContact.contact().phone());
-            root.setString("taxCode", billingContact.getTaxCode().value());
+            root.setString("taxId", billingContact.getTaxId().value());
             root.setString("purchaseOrder", billingContact.getPurchaseOrder().value());
             root.setString("invoiceEmail", billingContact.getInvoiceEmail().getEmailAddress());
 
@@ -714,14 +714,14 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
 
         var mergedContact = updateBillingContact(inspector.field("contact"), cloudTenant.name(), contact);
         var mergedAddress = updateTenantInfoAddress(inspector.field("address"), billing.address());
-        var mergedTaxCode = optional("taxCode", inspector).map(TaxCode::new).orElse(billing.getTaxCode());
+        var mergedTaxId = optional("taxId", inspector).map(TaxId::new).orElse(billing.getTaxId());
         var mergedPurchaseOrder = optional("purchaseOrder", inspector).map(PurchaseOrder::new).orElse(billing.getPurchaseOrder());
         var mergedInvoiceEmail = optional("invoiceEmail", inspector).map(mail -> new Email(mail, false)).orElse(billing.getInvoiceEmail());
 
         var mergedBilling = info.billingContact()
                 .withContact(mergedContact)
                 .withAddress(mergedAddress)
-                .withTaxCode(mergedTaxCode)
+                .withTaxId(mergedTaxId)
                 .withPurchaseOrder(mergedPurchaseOrder)
                 .withInvoiceEmail(mergedInvoiceEmail);
 
@@ -802,7 +802,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         billingCursor.setString("email", billingContact.contact().email().getEmailAddress());
         billingCursor.setBool("emailVerified", billingContact.contact().email().isVerified());
         billingCursor.setString("phone", billingContact.contact().phone());
-        billingCursor.setString("taxCode", billingContact.getTaxCode().value());
+        billingCursor.setString("taxId", billingContact.getTaxId().value());
         billingCursor.setString("purchaseOrder", billingContact.getPurchaseOrder().value());
         billingCursor.setString("invoiceEmail", billingContact.getInvoiceEmail().getEmailAddress());
         toSlime(billingContact.address(), billingCursor);
@@ -934,13 +934,13 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
     private TenantBilling updateTenantInfoBillingContact(Inspector insp, TenantName tenantName, TenantBilling oldContact) {
         if (!insp.valid()) return oldContact;
 
-        var taxCode = optional("taxCode", insp).map(TaxCode::new).orElse(oldContact.getTaxCode());
+        var taxId = optional("taxId", insp).map(TaxId::new).orElse(oldContact.getTaxId());
         var purchaseOrder = optional("purchaseOrder", insp).map(PurchaseOrder::new).orElse(oldContact.getPurchaseOrder());
         var invoiceEmail = optional("invoiceEmail", insp).map(mail -> new Email(mail, false)).orElse(oldContact.getInvoiceEmail());
         return TenantBilling.empty()
                 .withContact(updateBillingContact(insp, tenantName, oldContact.contact()))
                 .withAddress(updateTenantInfoAddress(insp.field("address"), oldContact.address()))
-                .withTaxCode(taxCode)
+                .withTaxId(taxId)
                 .withPurchaseOrder(purchaseOrder)
                 .withInvoiceEmail(invoiceEmail);
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java
index bab5aec8cf7..4912c9ae407 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java
@@ -25,7 +25,7 @@ import com.yahoo.vespa.hosted.controller.tenant.DeletedTenant;
 import com.yahoo.vespa.hosted.controller.tenant.Email;
 import com.yahoo.vespa.hosted.controller.tenant.LastLoginInfo;
 import com.yahoo.vespa.hosted.controller.tenant.PurchaseOrder;
-import com.yahoo.vespa.hosted.controller.tenant.TaxCode;
+import com.yahoo.vespa.hosted.controller.tenant.TaxId;
 import com.yahoo.vespa.hosted.controller.tenant.TenantAddress;
 import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
 import com.yahoo.vespa.hosted.controller.tenant.TenantContact;
@@ -238,7 +238,7 @@ public class TenantSerializerTest {
                                 .withAddress("Central Station")
                                 .withRegion("Irish Sea"))
                         .withPurchaseOrder(new PurchaseOrder("PO42"))
-                        .withTaxCode(new TaxCode("1234L"))
+                        .withTaxId(new TaxId("1234L"))
                         .withInvoiceEmail(new Email("billing@mycomp.any", false))
                 );
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
index 1b6425a324a..32f0247b3bc 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
@@ -106,7 +106,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
                         "emailVerified":false,
                         "phone":""
                     },
-                    "taxCode":"",
+                    "taxId":"",
                     "purchaseOrder":"",
                     "invoiceEmail":""
                 }
@@ -122,7 +122,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
                         "email":"foo@example",
                         "phone":"phone"
                     },
-                    "taxCode":"1234L",
+                    "taxId":"1234L",
                     "purchaseOrder":"PO9001",
                     "invoiceEmail":"billing@mycomp.any",
                     "address": {
@@ -147,7 +147,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
                         "emailVerified": false,
                         "phone":"phone"
                     },
-                    "taxCode":"1234L",
+                    "taxId":"1234L",
                     "purchaseOrder":"PO9001",
                     "invoiceEmail":"billing@mycomp.any",
                     "address": {
@@ -231,7 +231,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
                         "name":"billingName",
                         "email":"","emailVerified":false,
                         "phone":"",
-                        "taxCode":"",
+                        "taxId":"",
                         "purchaseOrder":"",
                         "invoiceEmail":""
                     },
@@ -262,7 +262,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
                         "email":"foo@example",
                         "emailVerified":false,
                         "phone":"phone",
-                        "taxCode":"",
+                        "taxId":"",
                         "purchaseOrder":"",
                         "invoiceEmail":"",
                         "address": {