diff --git a/README.md b/README.md index af56d75..1ebf77e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This library consists of helper methods that call the VOL backend API and is to be used as a toolkit of support libraries in the [VOL Functional test suite.](https://github.com/dvsa/vol-functional-tests) ## Requirements -- Java 17 +- Java 21 - Maven 3.6.3 or greater diff --git a/pom.xml b/pom.xml index dc42998..4326451 100644 --- a/pom.xml +++ b/pom.xml @@ -36,8 +36,8 @@ 0.13.0 - 2.25.3 - 2.25.3 + 2.25.4 + 2.25.4 5.0.0.RELEASE diff --git a/src/main/java/apiCalls/Utils/volBuilders/TrackingBuilder.java b/src/main/java/apiCalls/Utils/volBuilders/TrackingBuilder.java index a28d31d..3b52786 100644 --- a/src/main/java/apiCalls/Utils/volBuilders/TrackingBuilder.java +++ b/src/main/java/apiCalls/Utils/volBuilders/TrackingBuilder.java @@ -25,9 +25,9 @@ "transportManagersStatus", "typeOfLicenceStatus", "declarationsInternalStatus", + "vehiclesDeclarationsStatus", "vehiclesPsvStatus", "vehiclesStatus", - "taxiPhvStatus", "vehiclesSizeStatus", "psvOperateSmallStatus", "psvOperateLargeStatus", @@ -39,6 +39,7 @@ "psvMainOccupationUndertakingsStatus" }) public class TrackingBuilder { + @JsonProperty("id") private String id; @JsonProperty("version") @@ -56,7 +57,7 @@ public class TrackingBuilder { @JsonProperty("convictionsPenaltiesStatus") private String convictionsPenaltiesStatus; @JsonProperty("discsStatus") - private Object discsStatus; + private String discsStatus; @JsonProperty("financialEvidenceStatus") private String financialEvidenceStatus; @JsonProperty("financialHistoryStatus") @@ -75,13 +76,14 @@ public class TrackingBuilder { private String typeOfLicenceStatus; @JsonProperty("declarationsInternalStatus") private String declarationsInternalStatus; + @JsonProperty("vehiclesDeclarationsStatus") + private String vehiclesDeclarationsStatus; @JsonProperty("vehiclesPsvStatus") - private Object vehiclesPsvStatus; + private String vehiclesPsvStatus; @JsonProperty("vehiclesStatus") private String vehiclesStatus; @JsonProperty("taxiPhvStatus") private String taxiPhvStatus; - @JsonProperty("vehiclesSizeStatus") private String vehiclesSizeStatus; @JsonProperty("psvOperateSmallStatus") @@ -101,456 +103,167 @@ public class TrackingBuilder { @JsonProperty("psvMainOccupationUndertakingsStatus") private String psvMainOccupationUndertakingsStatus; + public String getId() { return id; } + public void setId(String id) { this.id = id; } + public TrackingBuilder withId(String id) { this.id = id; return this; } - @JsonProperty("id") - public String getId() { - return id; - } - - @JsonProperty("id") - public void setId(String id) { - this.id = id; - } - - public TrackingBuilder withId(String id) { - this.id = id; - return this; - } - - @JsonProperty("version") - public int getVersion() { - return version; - } - - @JsonProperty("version") - public void setVersion(int version) { - this.version = version; - } - - public TrackingBuilder withVersion(int version) { - this.version = version; - return this; - } + public int getVersion() { return version; } + public void setVersion(int version) { this.version = version; } + public TrackingBuilder withVersion(int version) { this.version = version; return this; } - @JsonProperty("addressesStatus") - public String getAddressesStatus() { - return addressesStatus; - } + public String getAddressesStatus() { return addressesStatus; } + public void setAddressesStatus(String addressesStatus) { this.addressesStatus = addressesStatus; } + public TrackingBuilder withAddressesStatus(String addressesStatus) { this.addressesStatus = addressesStatus; return this; } - @JsonProperty("addressesStatus") - public void setAddressesStatus(String addressesStatus) { - this.addressesStatus = addressesStatus; - } + public String getBusinessDetailsStatus() { return businessDetailsStatus; } + public void setBusinessDetailsStatus(String businessDetailsStatus) { this.businessDetailsStatus = businessDetailsStatus; } + public TrackingBuilder withBusinessDetailsStatus(String businessDetailsStatus) { this.businessDetailsStatus = businessDetailsStatus; return this; } - public TrackingBuilder withAddressesStatus(String addressesStatus) { - this.addressesStatus = addressesStatus; - return this; - } + public String getBusinessTypeStatus() { return businessTypeStatus; } + public void setBusinessTypeStatus(String businessTypeStatus) { this.businessTypeStatus = businessTypeStatus; } + public TrackingBuilder withBusinessTypeStatus(String businessTypeStatus) { this.businessTypeStatus = businessTypeStatus; return this; } - @JsonProperty("businessDetailsStatus") - public String getBusinessDetailsStatus() { - return businessDetailsStatus; - } + public String getCommunityLicencesStatus() { return communityLicencesStatus; } + public void setCommunityLicencesStatus(String communityLicencesStatus) { this.communityLicencesStatus = communityLicencesStatus; } + public TrackingBuilder withCommunityLicencesStatus(String communityLicencesStatus) { this.communityLicencesStatus = communityLicencesStatus; return this; } - @JsonProperty("businessDetailsStatus") - public void setBusinessDetailsStatus(String businessDetailsStatus) { - this.businessDetailsStatus = businessDetailsStatus; - } + public String getConditionsUndertakingsStatus() { return conditionsUndertakingsStatus; } + public void setConditionsUndertakingsStatus(String conditionsUndertakingsStatus) { this.conditionsUndertakingsStatus = conditionsUndertakingsStatus; } + public TrackingBuilder withConditionsUndertakingsStatus(String conditionsUndertakingsStatus) { this.conditionsUndertakingsStatus = conditionsUndertakingsStatus; return this; } - public TrackingBuilder withBusinessDetailsStatus(String businessDetailsStatus) { - this.businessDetailsStatus = businessDetailsStatus; + public String getConvictionsPenaltiesStatus() { return convictionsPenaltiesStatus; } + public void setConvictionsPenaltiesStatus(String convictionsPenaltiesStatus) { this.convictionsPenaltiesStatus = convictionsPenaltiesStatus; } + public TrackingBuilder withConvictionsPenaltiesStatus(String convictionsPenaltiesStatus) { this.convictionsPenaltiesStatus = convictionsPenaltiesStatus; return this; } + + public String getDiscsStatus() { return discsStatus; } + public void setDiscsStatus(String discsStatus) { this.discsStatus = discsStatus; } + public TrackingBuilder withDiscsStatus(String discsStatus) { this.discsStatus = discsStatus; return this; } + + public String getFinancialEvidenceStatus() { return financialEvidenceStatus; } + public void setFinancialEvidenceStatus(String financialEvidenceStatus) { this.financialEvidenceStatus = financialEvidenceStatus; } + public TrackingBuilder withFinancialEvidenceStatus(String financialEvidenceStatus) { this.financialEvidenceStatus = financialEvidenceStatus; return this; } + + public String getFinancialHistoryStatus() { return financialHistoryStatus; } + public void setFinancialHistoryStatus(String financialHistoryStatus) { this.financialHistoryStatus = financialHistoryStatus; } + public TrackingBuilder withFinancialHistoryStatus(String financialHistoryStatus) { this.financialHistoryStatus = financialHistoryStatus; return this; } + + public String getLicenceHistoryStatus() { return licenceHistoryStatus; } + public void setLicenceHistoryStatus(String licenceHistoryStatus) { this.licenceHistoryStatus = licenceHistoryStatus; } + public TrackingBuilder withLicenceHistoryStatus(String licenceHistoryStatus) { this.licenceHistoryStatus = licenceHistoryStatus; return this; } + + public String getOperatingCentresStatus() { return operatingCentresStatus; } + public void setOperatingCentresStatus(String operatingCentresStatus) { this.operatingCentresStatus = operatingCentresStatus; } + public TrackingBuilder withOperatingCentresStatus(String operatingCentresStatus) { this.operatingCentresStatus = operatingCentresStatus; return this; } + + public String getPeopleStatus() { return peopleStatus; } + public void setPeopleStatus(String peopleStatus) { this.peopleStatus = peopleStatus; } + public TrackingBuilder withPeopleStatus(String peopleStatus) { this.peopleStatus = peopleStatus; return this; } + + public String getSafetyStatus() { return safetyStatus; } + public void setSafetyStatus(String safetyStatus) { this.safetyStatus = safetyStatus; } + public TrackingBuilder withSafetyStatus(String safetyStatus) { this.safetyStatus = safetyStatus; return this; } + + public String getTaxiPhvStatus() { return taxiPhvStatus; } + public void setTaxiPhvStatus(String taxiPhvStatus) { this.taxiPhvStatus = taxiPhvStatus; } + public TrackingBuilder withTaxiPhvStatus(String taxiPhvStatus) { this.taxiPhvStatus = taxiPhvStatus; return this; } + + public String getTransportManagersStatus() { return transportManagersStatus; } + public void setTransportManagersStatus(String transportManagersStatus) { this.transportManagersStatus = transportManagersStatus; } + public TrackingBuilder withTransportManagersStatus(String transportManagersStatus) { this.transportManagersStatus = transportManagersStatus; return this; } + + public String getTypeOfLicenceStatus() { return typeOfLicenceStatus; } + public void setTypeOfLicenceStatus(String typeOfLicenceStatus) { this.typeOfLicenceStatus = typeOfLicenceStatus; } + public TrackingBuilder withTypeOfLicenceStatus(String typeOfLicenceStatus) { this.typeOfLicenceStatus = typeOfLicenceStatus; return this; } + + public String getDeclarationsInternalStatus() { return declarationsInternalStatus; } + public void setDeclarationsInternalStatus(String declarationsInternalStatus) { this.declarationsInternalStatus = declarationsInternalStatus; } + public TrackingBuilder withDeclarationsInternalStatus(String declarationsInternalStatus) { this.declarationsInternalStatus = declarationsInternalStatus; return this; } + + public String getVehiclesDeclarationsStatus() { return vehiclesDeclarationsStatus; } + public void setVehiclesDeclarationsStatus(String vehiclesDeclarationsStatus) { this.vehiclesDeclarationsStatus = vehiclesDeclarationsStatus; } + public TrackingBuilder withVehiclesDeclarationsStatus(String vehiclesDeclarationsStatus) { this.vehiclesDeclarationsStatus = vehiclesDeclarationsStatus; return this; } + + public String getVehiclesPsvStatus() { return vehiclesPsvStatus; } + public void setVehiclesPsvStatus(String vehiclesPsvStatus) { this.vehiclesPsvStatus = vehiclesPsvStatus; } + public TrackingBuilder withVehiclesPsvStatus(String vehiclesPsvStatus) { this.vehiclesPsvStatus = vehiclesPsvStatus; return this; } + + public String getVehiclesStatus() { return vehiclesStatus; } + public void setVehiclesStatus(String vehiclesStatus) { this.vehiclesStatus = vehiclesStatus; } + public TrackingBuilder withVehiclesStatus(String vehiclesStatus) { this.vehiclesStatus = vehiclesStatus; return this; } + + public String getVehiclesSizeStatus() { return vehiclesSizeStatus; } + public void setVehiclesSizeStatus(String vehiclesSizeStatus) { this.vehiclesSizeStatus = vehiclesSizeStatus; } + public TrackingBuilder withVehiclesSizeStatus(String vehiclesSizeStatus) { this.vehiclesSizeStatus = vehiclesSizeStatus; return this; } + + public String getPsvOperateSmallStatus() { return psvOperateSmallStatus; } + public void setPsvOperateSmallStatus(String psvOperateSmallStatus) { this.psvOperateSmallStatus = psvOperateSmallStatus; } + public TrackingBuilder withPsvOperateSmallStatus(String psvOperateSmallStatus) { this.psvOperateSmallStatus = psvOperateSmallStatus; return this; } + + public String getPsvOperateLargeStatus() { return psvOperateLargeStatus; } + public void setPsvOperateLargeStatus(String psvOperateLargeStatus) { this.psvOperateLargeStatus = psvOperateLargeStatus; } + public TrackingBuilder withPsvOperateLargeStatus(String psvOperateLargeStatus) { this.psvOperateLargeStatus = psvOperateLargeStatus; return this; } + + public String getPsvSmallConditionsStatus() { return psvSmallConditionsStatus; } + public void setPsvSmallConditionsStatus(String psvSmallConditionsStatus) { this.psvSmallConditionsStatus = psvSmallConditionsStatus; } + public TrackingBuilder withPsvSmallConditionsStatus(String psvSmallConditionsStatus) { this.psvSmallConditionsStatus = psvSmallConditionsStatus; return this; } + + public String getPsvOperateNoveltyStatus() { return psvOperateNoveltyStatus; } + public void setPsvOperateNoveltyStatus(String psvOperateNoveltyStatus) { this.psvOperateNoveltyStatus = psvOperateNoveltyStatus; } + public TrackingBuilder withPsvOperateNoveltyStatus(String psvOperateNoveltyStatus) { this.psvOperateNoveltyStatus = psvOperateNoveltyStatus; return this; } + + public String getPsvSmallPartWrittenStatus() { return psvSmallPartWrittenStatus; } + public void setPsvSmallPartWrittenStatus(String psvSmallPartWrittenStatus) { this.psvSmallPartWrittenStatus = psvSmallPartWrittenStatus; } + public TrackingBuilder withPsvSmallPartWrittenStatus(String psvSmallPartWrittenStatus) { this.psvSmallPartWrittenStatus = psvSmallPartWrittenStatus; return this; } + + public String getPsvDocumentaryEvidenceSmallStatus() { return psvDocumentaryEvidenceSmallStatus; } + public void setPsvDocumentaryEvidenceSmallStatus(String psvDocumentaryEvidenceSmallStatus) { this.psvDocumentaryEvidenceSmallStatus = psvDocumentaryEvidenceSmallStatus; } + public TrackingBuilder withPsvDocumentaryEvidenceSmallStatus(String psvDocumentaryEvidenceSmallStatus) { this.psvDocumentaryEvidenceSmallStatus = psvDocumentaryEvidenceSmallStatus; return this; } + + public String getPsvDocumentaryEvidenceLargeStatus() { return psvDocumentaryEvidenceLargeStatus; } + public void setPsvDocumentaryEvidenceLargeStatus(String psvDocumentaryEvidenceLargeStatus) { this.psvDocumentaryEvidenceLargeStatus = psvDocumentaryEvidenceLargeStatus; } + public TrackingBuilder withPsvDocumentaryEvidenceLargeStatus(String psvDocumentaryEvidenceLargeStatus) { this.psvDocumentaryEvidenceLargeStatus = psvDocumentaryEvidenceLargeStatus; return this; } + + public String getPsvMainOccupationUndertakingsStatus() { return psvMainOccupationUndertakingsStatus; } + public void setPsvMainOccupationUndertakingsStatus(String psvMainOccupationUndertakingsStatus) { this.psvMainOccupationUndertakingsStatus = psvMainOccupationUndertakingsStatus; } + public TrackingBuilder withPsvMainOccupationUndertakingsStatus(String psvMainOccupationUndertakingsStatus) { this.psvMainOccupationUndertakingsStatus = psvMainOccupationUndertakingsStatus; return this; } + + /** + * Sets all tracking statuses to the given value. + * Useful for granting where all sections need to be marked as accepted. + */ + public TrackingBuilder withAllStatuses(String status) { + this.addressesStatus = status; + this.businessDetailsStatus = status; + this.businessTypeStatus = status; + this.communityLicencesStatus = status; + this.conditionsUndertakingsStatus = status; + this.convictionsPenaltiesStatus = status; + this.discsStatus = status; + this.financialEvidenceStatus = status; + this.financialHistoryStatus = status; + this.licenceHistoryStatus = status; + this.operatingCentresStatus = status; + this.peopleStatus = status; + this.safetyStatus = status; + this.taxiPhvStatus = status; + this.transportManagersStatus = status; + this.typeOfLicenceStatus = status; + this.declarationsInternalStatus = status; + this.vehiclesDeclarationsStatus = status; + this.vehiclesPsvStatus = status; + this.vehiclesStatus = status; + this.vehiclesSizeStatus = status; + this.psvOperateSmallStatus = status; + this.psvOperateLargeStatus = status; + this.psvSmallConditionsStatus = status; + this.psvOperateNoveltyStatus = status; + this.psvSmallPartWrittenStatus = status; + this.psvDocumentaryEvidenceSmallStatus = status; + this.psvDocumentaryEvidenceLargeStatus = status; + this.psvMainOccupationUndertakingsStatus = status; return this; } - @JsonProperty("businessTypeStatus") - public String getBusinessTypeStatus() { - return businessTypeStatus; - } - - @JsonProperty("businessTypeStatus") - public void setBusinessTypeStatus(String businessTypeStatus) { - this.businessTypeStatus = businessTypeStatus; - } - - public TrackingBuilder withBusinessTypeStatus(String businessTypeStatus) { - this.businessTypeStatus = businessTypeStatus; - return this; - } - - @JsonProperty("communityLicencesStatus") - public String getCommunityLicencesStatus() { - return communityLicencesStatus; - } - - @JsonProperty("communityLicencesStatus") - public void setCommunityLicencesStatus(String communityLicencesStatus) { - this.communityLicencesStatus = communityLicencesStatus; - } - - public TrackingBuilder withCommunityLicencesStatus(String communityLicencesStatus) { - this.communityLicencesStatus = communityLicencesStatus; - return this; - } - - @JsonProperty("conditionsUndertakingsStatus") - public String getConditionsUndertakingsStatus() { - return conditionsUndertakingsStatus; - } - - @JsonProperty("conditionsUndertakingsStatus") - public void setConditionsUndertakingsStatus(String conditionsUndertakingsStatus) { - this.conditionsUndertakingsStatus = conditionsUndertakingsStatus; - } - - public TrackingBuilder withConditionsUndertakingsStatus(String conditionsUndertakingsStatus) { - this.conditionsUndertakingsStatus = conditionsUndertakingsStatus; - return this; - } - - @JsonProperty("convictionsPenaltiesStatus") - public String getConvictionsPenaltiesStatus() { - return convictionsPenaltiesStatus; - } - - @JsonProperty("convictionsPenaltiesStatus") - public void setConvictionsPenaltiesStatus(String convictionsPenaltiesStatus) { - this.convictionsPenaltiesStatus = convictionsPenaltiesStatus; - } - - public TrackingBuilder withConvictionsPenaltiesStatus(String convictionsPenaltiesStatus) { - this.convictionsPenaltiesStatus = convictionsPenaltiesStatus; - return this; - } - - @JsonProperty("discsStatus") - public Object getDiscsStatus() { - return discsStatus; - } - - @JsonProperty("discsStatus") - public void setDiscsStatus(Object discsStatus) { - this.discsStatus = discsStatus; - } - - public TrackingBuilder withDiscsStatus(Object discsStatus) { - this.discsStatus = discsStatus; - return this; - } - - @JsonProperty("financialEvidenceStatus") - public String getFinancialEvidenceStatus() { - return financialEvidenceStatus; - } - - @JsonProperty("financialEvidenceStatus") - public void setFinancialEvidenceStatus(String financialEvidenceStatus) { - this.financialEvidenceStatus = financialEvidenceStatus; - } - - public TrackingBuilder withFinancialEvidenceStatus(String financialEvidenceStatus) { - this.financialEvidenceStatus = financialEvidenceStatus; - return this; - } - - @JsonProperty("financialHistoryStatus") - public String getFinancialHistoryStatus() { - return financialHistoryStatus; - } - - @JsonProperty("financialHistoryStatus") - public void setFinancialHistoryStatus(String financialHistoryStatus) { - this.financialHistoryStatus = financialHistoryStatus; - } - - public TrackingBuilder withFinancialHistoryStatus(String financialHistoryStatus) { - this.financialHistoryStatus = financialHistoryStatus; - return this; - } - - @JsonProperty("licenceHistoryStatus") - public String getLicenceHistoryStatus() { - return licenceHistoryStatus; - } - - @JsonProperty("licenceHistoryStatus") - public void setLicenceHistoryStatus(String licenceHistoryStatus) { - this.licenceHistoryStatus = licenceHistoryStatus; - } - - public TrackingBuilder withLicenceHistoryStatus(String licenceHistoryStatus) { - this.licenceHistoryStatus = licenceHistoryStatus; - return this; - } - - @JsonProperty("operatingCentresStatus") - public String getOperatingCentresStatus() { - return operatingCentresStatus; - } - - @JsonProperty("operatingCentresStatus") - public void setOperatingCentresStatus(String operatingCentresStatus) { - this.operatingCentresStatus = operatingCentresStatus; - } - - public TrackingBuilder withOperatingCentresStatus(String operatingCentresStatus) { - this.operatingCentresStatus = operatingCentresStatus; - return this; - } - - @JsonProperty("peopleStatus") - public String getPeopleStatus() { - return peopleStatus; - } - - @JsonProperty("peopleStatus") - public void setPeopleStatus(String peopleStatus) { - this.peopleStatus = peopleStatus; - } - - public TrackingBuilder withPeopleStatus(String peopleStatus) { - this.peopleStatus = peopleStatus; - return this; - } - - @JsonProperty("safetyStatus") - public String getSafetyStatus() { - return safetyStatus; - } - - @JsonProperty("safetyStatus") - public void setSafetyStatus(String safetyStatus) { - this.safetyStatus = safetyStatus; - } - - public TrackingBuilder withSafetyStatus(String safetyStatus) { - this.safetyStatus = safetyStatus; - return this; - } - - @JsonProperty("taxiPhvStatus") - public String getTaxiPhvStatus() { - return taxiPhvStatus; - } - - @JsonProperty("taxiPhvStatus") - public void setTaxiPhvStatus(String taxiPhvStatus) { - this.taxiPhvStatus = taxiPhvStatus; - } - - public TrackingBuilder withTaxiPhvStatus(String taxiPhvStatus) { - this.taxiPhvStatus = taxiPhvStatus; - return this; - } - - @JsonProperty("transportManagersStatus") - public String getTransportManagersStatus() { - return transportManagersStatus; - } - - @JsonProperty("transportManagersStatus") - public void setTransportManagersStatus(String transportManagersStatus) { - this.transportManagersStatus = transportManagersStatus; - } - - public TrackingBuilder withTransportManagersStatus(String transportManagersStatus) { - this.transportManagersStatus = transportManagersStatus; - return this; - } - - @JsonProperty("typeOfLicenceStatus") - public String getTypeOfLicenceStatus() { - return typeOfLicenceStatus; - } - - @JsonProperty("typeOfLicenceStatus") - public void setTypeOfLicenceStatus(String typeOfLicenceStatus) { - this.typeOfLicenceStatus = typeOfLicenceStatus; - } - - public TrackingBuilder withTypeOfLicenceStatus(String typeOfLicenceStatus) { - this.typeOfLicenceStatus = typeOfLicenceStatus; - return this; - } - - @JsonProperty("declarationsInternalStatus") - public String getDeclarationsInternalStatus() { - return declarationsInternalStatus; - } - - @JsonProperty("declarationsInternalStatus") - public void setDeclarationsInternalStatus(String declarationsInternalStatus) { - this.declarationsInternalStatus = declarationsInternalStatus; - } - - public TrackingBuilder withDeclarationsInternalStatus(String declarationsInternalStatus) { - this.declarationsInternalStatus = declarationsInternalStatus; - return this; - } - - @JsonProperty("vehiclesPsvStatus") - public Object getVehiclesPsvStatus() { - return vehiclesPsvStatus; - } - - @JsonProperty("vehiclesPsvStatus") - public void setVehiclesPsvStatus(Object vehiclesPsvStatus) { - this.vehiclesPsvStatus = vehiclesPsvStatus; - } - - public TrackingBuilder withVehiclesPsvStatus(Object vehiclesPsvStatus) { - this.vehiclesPsvStatus = vehiclesPsvStatus; - return this; - } - - @JsonProperty("vehiclesStatus") - public String getVehiclesStatus() { - return vehiclesStatus; - } - - @JsonProperty("vehiclesStatus") - public void setVehiclesStatus(String vehiclesStatus) { - this.vehiclesStatus = vehiclesStatus; - } - - public TrackingBuilder withVehiclesStatus(String vehiclesStatus) { - this.vehiclesStatus = vehiclesStatus; - return this; - } - - @JsonProperty("vehiclesSizeStatus") - public String getVehiclesSizeStatus() { - return vehiclesSizeStatus; - } - - @JsonProperty("vehiclesSizeStatus") - public void setVehiclesSizeStatus(String vehiclesSizeStatus) { - this.vehiclesSizeStatus = vehiclesSizeStatus; - } - - public TrackingBuilder withVehiclesSizeStatus(String vehiclesSizeStatus) { - this.vehiclesSizeStatus = vehiclesSizeStatus; - return this; - } - - @JsonProperty("psvOperateSmallStatus") - public String getPsvOperateSmallStatus() { - return psvOperateSmallStatus; - } - - @JsonProperty("psvOperateSmallStatus") - public void setPsvOperateSmallStatus(String psvOperateSmallStatus) { - this.psvOperateSmallStatus = psvOperateSmallStatus; - } - - public TrackingBuilder withPsvOperateSmallStatus(String psvOperateSmallStatus) { - this.psvOperateSmallStatus = psvOperateSmallStatus; - return this; - } - - @JsonProperty("psvOperateLargeStatus") - public String getPsvOperateLargeStatus() { - return psvOperateLargeStatus; - } - - @JsonProperty("psvOperateLargeStatus") - public void setPsvOperateLargeStatus(String psvOperateLargeStatus) { - this.psvOperateLargeStatus = psvOperateLargeStatus; - } - - public TrackingBuilder withPsvOperateLargeStatus(String psvOperateLargeStatus) { - this.psvOperateLargeStatus = psvOperateLargeStatus; - return this; - } - - @JsonProperty("psvSmallConditionsStatus") - public String getPsvSmallConditionsStatus() { - return psvSmallConditionsStatus; - } - - @JsonProperty("psvSmallConditionsStatus") - public void setPsvSmallConditionsStatus(String psvSmallConditionsStatus) { - this.psvSmallConditionsStatus = psvSmallConditionsStatus; - } - - public TrackingBuilder withPsvSmallConditionsStatus(String psvSmallConditionsStatus) { - this.psvSmallConditionsStatus = psvSmallConditionsStatus; - return this; - } - - @JsonProperty("psvOperateNoveltyStatus") - public String getPsvOperateNoveltyStatus() { - return psvOperateNoveltyStatus; - } - - @JsonProperty("psvOperateNoveltyStatus") - public void setPsvOperateNoveltyStatus(String psvOperateNoveltyStatus) { - this.psvOperateNoveltyStatus = psvOperateNoveltyStatus; - } - - public TrackingBuilder withPsvOperateNoveltyStatus(String psvOperateNoveltyStatus) { - this.psvOperateNoveltyStatus = psvOperateNoveltyStatus; - return this; - } - - @JsonProperty("psvSmallPartWrittenStatus") - public String getPsvSmallPartWrittenStatus() { - return psvSmallPartWrittenStatus; - } - - @JsonProperty("psvSmallPartWrittenStatus") - public void setPsvSmallPartWrittenStatus(String psvSmallPartWrittenStatus) { - this.psvSmallPartWrittenStatus = psvSmallPartWrittenStatus; - } - - public TrackingBuilder withPsvSmallPartWrittenStatus(String psvSmallPartWrittenStatus) { - this.psvSmallPartWrittenStatus = psvSmallPartWrittenStatus; - return this; - } - - @JsonProperty("psvDocumentaryEvidenceSmallStatus") - public String getPsvDocumentaryEvidenceSmallStatus() { - return psvDocumentaryEvidenceSmallStatus; - } - - @JsonProperty("psvDocumentaryEvidenceSmallStatus") - public void setPsvDocumentaryEvidenceSmallStatus(String psvDocumentaryEvidenceSmallStatus) { - this.psvDocumentaryEvidenceSmallStatus = psvDocumentaryEvidenceSmallStatus; - } - - public TrackingBuilder withPsvDocumentaryEvidenceSmallStatus(String psvDocumentaryEvidenceSmallStatus) { - this.psvDocumentaryEvidenceSmallStatus = psvDocumentaryEvidenceSmallStatus; - return this; - } - - @JsonProperty("psvDocumentaryEvidenceLargeStatus") - public String getPsvDocumentaryEvidenceLargeStatus() { - return psvDocumentaryEvidenceLargeStatus; - } - - @JsonProperty("psvDocumentaryEvidenceLargeStatus") - public void setPsvDocumentaryEvidenceLargeStatus(String psvDocumentaryEvidenceLargeStatus) { - this.psvDocumentaryEvidenceLargeStatus = psvDocumentaryEvidenceLargeStatus; - } - - public TrackingBuilder withPsvDocumentaryEvidenceLargeStatus(String psvDocumentaryEvidenceLargeStatus) { - this.psvDocumentaryEvidenceLargeStatus = psvDocumentaryEvidenceLargeStatus; - return this; - } - - @JsonProperty("psvMainOccupationUndertakingsStatus") - public String getPsvMainOccupationUndertakingsStatus() { - return psvMainOccupationUndertakingsStatus; - } - - @JsonProperty("psvMainOccupationUndertakingsStatus") - public void setPsvMainOccupationUndertakingsStatus(String psvMainOccupationUndertakingsStatus) { - this.psvMainOccupationUndertakingsStatus = psvMainOccupationUndertakingsStatus; - } - - public TrackingBuilder withPsvMainOccupationUndertakingsStatus(String psvMainOccupationUndertakingsStatus) { - this.psvMainOccupationUndertakingsStatus = psvMainOccupationUndertakingsStatus; - return this; - } @Override public String toString() { return "TrackingBuilder{" + @@ -562,28 +275,29 @@ public String toString() { ", communityLicencesStatus='" + communityLicencesStatus + '\'' + ", conditionsUndertakingsStatus='" + conditionsUndertakingsStatus + '\'' + ", convictionsPenaltiesStatus='" + convictionsPenaltiesStatus + '\'' + - ", discsStatus=" + discsStatus + + ", discsStatus='" + discsStatus + '\'' + ", financialEvidenceStatus='" + financialEvidenceStatus + '\'' + ", financialHistoryStatus='" + financialHistoryStatus + '\'' + ", licenceHistoryStatus='" + licenceHistoryStatus + '\'' + ", operatingCentresStatus='" + operatingCentresStatus + '\'' + ", peopleStatus='" + peopleStatus + '\'' + ", safetyStatus='" + safetyStatus + '\'' + + ", taxiPhvStatus='" + taxiPhvStatus + '\'' + ", transportManagersStatus='" + transportManagersStatus + '\'' + ", typeOfLicenceStatus='" + typeOfLicenceStatus + '\'' + ", declarationsInternalStatus='" + declarationsInternalStatus + '\'' + - ", vehiclesPsvStatus=" + vehiclesPsvStatus + + ", vehiclesDeclarationsStatus='" + vehiclesDeclarationsStatus + '\'' + + ", vehiclesPsvStatus='" + vehiclesPsvStatus + '\'' + ", vehiclesStatus='" + vehiclesStatus + '\'' + - ", taxiPhvStatus='" + taxiPhvStatus + '\'' + - ", vehiclesSizeStatus=" + vehiclesSizeStatus + - ", psvOperateSmallStatus=" + psvOperateSmallStatus + - ", psvOperateLargeStatus=" + psvOperateLargeStatus + - ", psvSmallConditionsStatus=" + psvSmallConditionsStatus + - ", psvOperateNoveltyStatus=" + psvOperateNoveltyStatus + - ", psvSmallPartWrittenStatus=" + psvSmallPartWrittenStatus + - ", psvDocumentaryEvidenceSmallStatus=" + psvDocumentaryEvidenceSmallStatus + - ", psvDocumentaryEvidenceLargeStatus=" + psvDocumentaryEvidenceLargeStatus + - ", psvMainOccupationUndertakingsStatus=" + psvMainOccupationUndertakingsStatus + + ", vehiclesSizeStatus='" + vehiclesSizeStatus + '\'' + + ", psvOperateSmallStatus='" + psvOperateSmallStatus + '\'' + + ", psvOperateLargeStatus='" + psvOperateLargeStatus + '\'' + + ", psvSmallConditionsStatus='" + psvSmallConditionsStatus + '\'' + + ", psvOperateNoveltyStatus='" + psvOperateNoveltyStatus + '\'' + + ", psvSmallPartWrittenStatus='" + psvSmallPartWrittenStatus + '\'' + + ", psvDocumentaryEvidenceSmallStatus='" + psvDocumentaryEvidenceSmallStatus + '\'' + + ", psvDocumentaryEvidenceLargeStatus='" + psvDocumentaryEvidenceLargeStatus + '\'' + + ", psvMainOccupationUndertakingsStatus='" + psvMainOccupationUndertakingsStatus + '\'' + '}'; } } \ No newline at end of file diff --git a/src/main/java/apiCalls/actions/GrantLicence.java b/src/main/java/apiCalls/actions/GrantLicence.java index e7ab812..366e804 100644 --- a/src/main/java/apiCalls/actions/GrantLicence.java +++ b/src/main/java/apiCalls/actions/GrantLicence.java @@ -8,6 +8,7 @@ import apiCalls.Utils.generic.BaseAPI; import apiCalls.Utils.generic.Headers; import apiCalls.Utils.generic.Utils; +import apiCalls.enums.TrackingStatus; import io.restassured.response.ValidatableResponse; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpStatus; @@ -73,7 +74,7 @@ public synchronized ValidatableResponse grantLicence() throws HttpException { public synchronized void createOverview() throws HttpException { var overviewResource = ApiUrl.build(env, "application/%s/overview/".formatted(application.getApplicationId())).toString(); - var status = "1"; + var status = TrackingStatus.ACCEPTED.asString(); var overrideOption = "Y"; var transportArea = "D"; var trackingId = fetchApplicationInformation(application.getApplicationId(), "applicationTracking.id", null); @@ -86,33 +87,7 @@ public synchronized void createOverview() throws HttpException { var tracking = new TrackingBuilder() .withId(trackingId) .withVersion(applicationTrackingVersion) - .withAddressesStatus(status) - .withBusinessDetailsStatus(status) - .withBusinessTypeStatus(status) - .withCommunityLicencesStatus(status) - .withConditionsUndertakingsStatus(status) - .withConvictionsPenaltiesStatus(status) - .withFinancialEvidenceStatus(status) - .withFinancialHistoryStatus(status) - .withLicenceHistoryStatus(status) - .withOperatingCentresStatus(status) - .withPeopleStatus(status) - .withSafetyStatus(status) - .withTransportManagersStatus(status) - .withTypeOfLicenceStatus(status) - .withDeclarationsInternalStatus(status) - .withVehiclesStatus(status) - .withVehiclesPsvStatus(status) - .withTaxiPhvStatus(status) - .withVehiclesSizeStatus(status) - .withPsvOperateSmallStatus(status) - .withPsvOperateLargeStatus(status) - .withPsvSmallConditionsStatus(status) - .withPsvOperateNoveltyStatus(status) - .withPsvSmallPartWrittenStatus(status) - .withPsvDocumentaryEvidenceSmallStatus(status) - .withPsvDocumentaryEvidenceLargeStatus(status) - .withPsvMainOccupationUndertakingsStatus(status); + .withAllStatuses(status); var overview = new OverviewBuilder() diff --git a/src/main/java/apiCalls/enums/BusinessType.java b/src/main/java/apiCalls/enums/BusinessType.java index d54ee96..fbcb114 100644 --- a/src/main/java/apiCalls/enums/BusinessType.java +++ b/src/main/java/apiCalls/enums/BusinessType.java @@ -7,13 +7,13 @@ public enum BusinessType { LIMITED_PARTNERSHIP("org_t_llp"), OTHER(" org_t_pa"); - private final String businessTypes; + private final String value; - private BusinessType(String businessTypes){ - this.businessTypes = businessTypes; + BusinessType(String value) { + this.value = value; } public String asString() { - return businessTypes; + return value; } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/EnforcementArea.java b/src/main/java/apiCalls/enums/EnforcementArea.java index 4c7a299..fed690c 100644 --- a/src/main/java/apiCalls/enums/EnforcementArea.java +++ b/src/main/java/apiCalls/enums/EnforcementArea.java @@ -1,8 +1,5 @@ package apiCalls.enums; -import java.util.HashMap; -import java.util.Map; - public enum EnforcementArea { NORTH_EAST("EA-B"), NORTH_WEST("EA-C"), @@ -14,19 +11,21 @@ public enum EnforcementArea { SCOTLAND("EA-A"), NORTHERN_IRELAND("EA-N"); - private final String codes; + private final String code; - private EnforcementArea(String codes) { - this.codes = codes.toUpperCase(); + EnforcementArea(String code) { + this.code = code.toUpperCase(); } public String value() { - return codes; + return code; } + /** + * @deprecated Use {@link #values()} instead. + */ + @Deprecated(forRemoval = true) public static EnforcementArea[] enforcementAreaList() { - return new EnforcementArea[]{EnforcementArea.NORTH_EAST, EnforcementArea.NORTH_WEST, EnforcementArea.MIDLANDS, - EnforcementArea.EAST, EnforcementArea.WALES, EnforcementArea.WEST, EnforcementArea.LONDON, - EnforcementArea.SCOTLAND, EnforcementArea.NORTHERN_IRELAND}; + return values(); } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/FinancialStandingRateVehicleType.java b/src/main/java/apiCalls/enums/FinancialStandingRateVehicleType.java index 5035380..984ab71 100644 --- a/src/main/java/apiCalls/enums/FinancialStandingRateVehicleType.java +++ b/src/main/java/apiCalls/enums/FinancialStandingRateVehicleType.java @@ -1,7 +1,5 @@ package apiCalls.enums; -import org.jetbrains.annotations.NotNull; - import java.util.Arrays; public enum FinancialStandingRateVehicleType { @@ -9,18 +7,20 @@ public enum FinancialStandingRateVehicleType { HGV("fin_sta_veh_typ_hgv"), LGV("fin_sta_veh_typ_lgv"); - private final String vehicleTypes; + private final String value; - FinancialStandingRateVehicleType(String vehicleTypes){ - this.vehicleTypes = vehicleTypes; + FinancialStandingRateVehicleType(String value) { + this.value = value; } public String asString() { - return vehicleTypes; + return value; } - public static FinancialStandingRateVehicleType getEnum(@NotNull String name) { - return Arrays.stream(FinancialStandingRateVehicleType.values()).filter(status -> status.asString().equalsIgnoreCase(name)) - .findFirst().orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: ".concat(name))); + public static FinancialStandingRateVehicleType getEnum(String name) { + return Arrays.stream(values()) + .filter(type -> type.asString().equalsIgnoreCase(name)) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: " + name)); } } diff --git a/src/main/java/apiCalls/enums/LicenceType.java b/src/main/java/apiCalls/enums/LicenceType.java index 40e8a9c..89a728e 100644 --- a/src/main/java/apiCalls/enums/LicenceType.java +++ b/src/main/java/apiCalls/enums/LicenceType.java @@ -1,7 +1,5 @@ package apiCalls.enums; -import org.jetbrains.annotations.NotNull; - import java.util.Arrays; public enum LicenceType { @@ -10,18 +8,20 @@ public enum LicenceType { STANDARD_INTERNATIONAL("ltyp_si"), SPECIAL_RESTRICTED("ltyp_sr"); - private final String licenceTypes; + private final String value; - private LicenceType(String licenceTypes){ - this.licenceTypes = licenceTypes; + LicenceType(String value) { + this.value = value; } public String asString() { - return licenceTypes; + return value; } - public static LicenceType getEnum(@NotNull String name) { - return Arrays.stream(LicenceType.values()).filter(status -> status.asString().equalsIgnoreCase(name)) - .findFirst().orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: ".concat(name))); + public static LicenceType getEnum(String name) { + return Arrays.stream(values()) + .filter(type -> type.asString().equalsIgnoreCase(name)) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: " + name)); } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/OperatorType.java b/src/main/java/apiCalls/enums/OperatorType.java index 8fbf9aa..866c4d4 100644 --- a/src/main/java/apiCalls/enums/OperatorType.java +++ b/src/main/java/apiCalls/enums/OperatorType.java @@ -1,25 +1,25 @@ package apiCalls.enums; -import org.jetbrains.annotations.NotNull; - import java.util.Arrays; public enum OperatorType { GOODS("lcat_gv"), PUBLIC("lcat_psv"); - private final String operatorTypes; + private final String value; - private OperatorType(String operatorType) { - this.operatorTypes = operatorType; + OperatorType(String value) { + this.value = value; } public String asString() { - return operatorTypes; + return value; } - public static OperatorType getEnum(@NotNull String name) { - return Arrays.stream(OperatorType.values()).filter(status -> status.asString().equalsIgnoreCase(name)) - .findFirst().orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: ".concat(name))); + public static OperatorType getEnum(String name) { + return Arrays.stream(values()) + .filter(type -> type.asString().equalsIgnoreCase(name)) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: " + name)); } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/Realm.java b/src/main/java/apiCalls/enums/Realm.java index cec469c..ddcfa9e 100644 --- a/src/main/java/apiCalls/enums/Realm.java +++ b/src/main/java/apiCalls/enums/Realm.java @@ -4,13 +4,13 @@ public enum Realm { SELF_SERVE("selfserve"), INTERNAL("internal"); - private final String serviceType; + private final String value; - private Realm(String serviceType){ - this.serviceType = serviceType; + Realm(String value) { + this.value = value; } public String asString() { - return serviceType; + return value; } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/TrackingStatus.java b/src/main/java/apiCalls/enums/TrackingStatus.java new file mode 100644 index 0000000..bcff359 --- /dev/null +++ b/src/main/java/apiCalls/enums/TrackingStatus.java @@ -0,0 +1,23 @@ +package apiCalls.enums; + +/** + * Tracking status values for application section completion. + * Matches the valid values defined in olcs-transfer ApplicationTracking partial + * (InArray validator with haystack: "0", "1", "2", "3"). + */ +public enum TrackingStatus { + NOT_STARTED("0"), + ACCEPTED("1"), + IN_PROGRESS("2"), + UPDATED("3"); + + private final String value; + + TrackingStatus(String value) { + this.value = value; + } + + public String asString() { + return value; + } +} diff --git a/src/main/java/apiCalls/enums/TrafficArea.java b/src/main/java/apiCalls/enums/TrafficArea.java index 1fd1e88..5f6bd89 100644 --- a/src/main/java/apiCalls/enums/TrafficArea.java +++ b/src/main/java/apiCalls/enums/TrafficArea.java @@ -1,133 +1,69 @@ package apiCalls.enums; import org.apache.commons.lang3.RandomStringUtils; -import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; import java.util.regex.Pattern; public enum TrafficArea { - NORTH_EAST("B"), - NORTH_WEST("C"), - MIDLANDS("D"), - EAST("F"), - WALES("G"), - WEST("H"), - LONDON("K"), - SCOTLAND("M"), - NORTHERN_IRELAND("N"); - - private final String trafficAreas; - static Random random = new Random(); + NORTH_EAST("B", "BD", 24), + NORTH_WEST("C", "M", 50), + MIDLANDS("D", "B", 98), + EAST("F", "IP", 33), + WALES("G", "CF", 48), + WEST("H", "OX", 49), + LONDON("K", "E", 20), + SCOTLAND("M", "EH", 55), + NORTHERN_IRELAND("N", "BT", 94); + + private final String value; + private final String postcodePrefix; + private final int maxDistrict; private static final Pattern POSTCODE_VALIDATION_PATTERN = Pattern.compile("^[a-zA-Z0-9 ]+$"); private static final int MAX_POSTCODE_GENERATION_ATTEMPTS = 3; - private TrafficArea(String trafficAreas) { - this.trafficAreas = trafficAreas; + TrafficArea(String value, String postcodePrefix, int maxDistrict) { + this.value = value; + this.postcodePrefix = postcodePrefix; + this.maxDistrict = maxDistrict; } public String value() { - return trafficAreas; + return value; } public static String getPostCode(TrafficArea trafficArea) { - String postCode; - int attempts = 0; - - while (attempts < MAX_POSTCODE_GENERATION_ATTEMPTS) { - postCode = generatePostCodeInternal(trafficArea); - + for (int attempt = 1; attempt <= MAX_POSTCODE_GENERATION_ATTEMPTS; attempt++) { + var postCode = trafficArea.generatePostCode(); if (isValidPostcode(postCode)) { return postCode; } - - attempts++; - System.err.println(String.format( - "Generated postcode '%s' failed validation (attempt %d/%d). Retrying...", - postCode, attempts, MAX_POSTCODE_GENERATION_ATTEMPTS - )); + System.err.println("Generated postcode '%s' failed validation (attempt %d/%d). Retrying..." + .formatted(postCode, attempt, MAX_POSTCODE_GENERATION_ATTEMPTS)); } - - throw new IllegalStateException( - String.format("Failed to generate valid postcode for %s after %d attempts", - trafficArea, MAX_POSTCODE_GENERATION_ATTEMPTS) - ); + throw new IllegalStateException("Failed to generate valid postcode for %s after %d attempts" + .formatted(trafficArea, MAX_POSTCODE_GENERATION_ATTEMPTS)); } public static boolean isValidPostcode(String postcode) { - if (postcode == null || postcode.isEmpty()) { - return false; - } - return POSTCODE_VALIDATION_PATTERN.matcher(postcode).matches(); + return postcode != null && !postcode.isEmpty() && POSTCODE_VALIDATION_PATTERN.matcher(postcode).matches(); } - private static String generatePostCodeInternal(TrafficArea trafficArea) { - String postCode; - switch (trafficArea) { - case NORTH_EAST: - int district = random.nextInt(24) + 1; - int sector = random.nextInt(9) + 1; - postCode = String.format("BD%d %d%s", district, sector, randomString()); - break; - case NORTH_WEST: - district = random.nextInt(50) + 1; - sector = random.nextInt(9) + 1; - postCode = String.format("M%d %d%s", district, sector, randomString()); - break; - case MIDLANDS: - district = random.nextInt(98) + 1; - sector = random.nextInt(9) + 1; - postCode = String.format("B%d %d%s", district, sector, randomString()); - break; - case EAST: - district = random.nextInt(33) + 1; - sector = random.nextInt(9) + 1; - postCode = String.format("IP%d %d%s", district, sector, randomString()); - break; - case WALES: - district = random.nextInt(48) + 1; - sector = random.nextInt(9) + 1; - postCode = String.format("CF%d %d%s", district, sector, randomString()); - break; - case WEST: - district = random.nextInt(49) + 1; - sector = random.nextInt(9) + 1; - postCode = String.format("OX%d %d%s", district, sector, randomString()); - break; - case LONDON: - district = random.nextInt(20) + 1; - sector = random.nextInt(9) + 1; - postCode = String.format("E%d %d%s", district, sector, randomString()); - break; - case SCOTLAND: - district = random.nextInt(55) + 1; - sector = random.nextInt(9) + 1; - postCode = String.format("EH%d %d%s", district, sector, randomString()); - break; - case NORTHERN_IRELAND: - district = random.nextInt(94) + 1; - sector = random.nextInt(9) + 1; - postCode = String.format("BT%d %d%s", district, sector, randomString()); - break; - default: - throw new IllegalStateException("Unexpected value: " + trafficArea); - } - return postCode; + private String generatePostCode() { + var random = ThreadLocalRandom.current(); + int district = random.nextInt(maxDistrict) + 1; + int sector = random.nextInt(9) + 1; + return "%s%d %d%s".formatted(postcodePrefix, district, sector, randomString()); } public static String randomString() { return RandomStringUtils.randomAlphabetic(2).toUpperCase(); } - public static int randomTwoDigitInt() { - return random.nextInt(99); - } - - public static int randomOneDigitInt() { - return random.nextInt(9); - } - + /** + * @deprecated Use {@link #values()} instead. + */ + @Deprecated(forRemoval = true) public static TrafficArea[] trafficAreaList() { - return new TrafficArea[]{TrafficArea.NORTH_EAST, TrafficArea.NORTH_WEST, TrafficArea.MIDLANDS, - TrafficArea.EAST, TrafficArea.WALES, TrafficArea.WEST, TrafficArea.LONDON, - TrafficArea.SCOTLAND, TrafficArea.NORTHERN_IRELAND}; + return values(); } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/TransportManagerType.java b/src/main/java/apiCalls/enums/TransportManagerType.java index 5baac67..0035216 100644 --- a/src/main/java/apiCalls/enums/TransportManagerType.java +++ b/src/main/java/apiCalls/enums/TransportManagerType.java @@ -4,13 +4,13 @@ public enum TransportManagerType { INTERNAL("tm_t_e"), EXTERNAL("tm_t_i"); - private final String transportManagerType; + private final String value; - private TransportManagerType(String transportManagerType){ - this.transportManagerType = transportManagerType; + TransportManagerType(String value) { + this.value = value; } - public String asString(){ - return transportManagerType; + public String asString() { + return value; } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/UserRoles.java b/src/main/java/apiCalls/enums/UserRoles.java index e4a3fa8..62686b9 100644 --- a/src/main/java/apiCalls/enums/UserRoles.java +++ b/src/main/java/apiCalls/enums/UserRoles.java @@ -8,13 +8,13 @@ public enum UserRoles { INTERNAL_CASE_WORKER("internal-case-worker"), INTERNAL("internal"); - private final String userRoles; + private final String value; - private UserRoles(String userRoles) { - this.userRoles = userRoles; + UserRoles(String value) { + this.value = value; } public String asString() { - return userRoles; + return value; } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/UserTitle.java b/src/main/java/apiCalls/enums/UserTitle.java index b77cd46..512ebf7 100644 --- a/src/main/java/apiCalls/enums/UserTitle.java +++ b/src/main/java/apiCalls/enums/UserTitle.java @@ -5,13 +5,13 @@ public enum UserTitle { MRS("title_mrs"), MS("title_ms"); - private final String userTitles; + private final String value; - private UserTitle(String userTitles) { - this.userTitles = userTitles; + UserTitle(String value) { + this.value = value; } public String asString() { - return this.userTitles; + return value; } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/UserType.java b/src/main/java/apiCalls/enums/UserType.java index 74c1e59..3c99edb 100644 --- a/src/main/java/apiCalls/enums/UserType.java +++ b/src/main/java/apiCalls/enums/UserType.java @@ -4,13 +4,13 @@ public enum UserType { INTERNAL("internal"), EXTERNAL("selfserve"); - private final String userTypes; + private final String value; - private UserType(String userType) { - this.userTypes = userType; + UserType(String value) { + this.value = value; } public String asString() { - return userTypes; + return value; } } \ No newline at end of file diff --git a/src/main/java/apiCalls/enums/VehicleType.java b/src/main/java/apiCalls/enums/VehicleType.java index 1ec5fd7..8899f60 100644 --- a/src/main/java/apiCalls/enums/VehicleType.java +++ b/src/main/java/apiCalls/enums/VehicleType.java @@ -4,13 +4,13 @@ public enum VehicleType { MIXED_FLEET("app_veh_type_mixed"), LGV_ONLY_FLEET("app_veh_type_lgv"); - private final String vehicleTypes; + private final String value; - private VehicleType(String vehicleTypes){ - this.vehicleTypes = vehicleTypes; + VehicleType(String value) { + this.value = value; } public String asString() { - return vehicleTypes; + return value; } } \ No newline at end of file