From f5ff01617228e88929fefa7a5ee505f92e6f2262 Mon Sep 17 00:00:00 2001 From: James Barnett Date: Thu, 16 Nov 2023 13:58:53 +0000 Subject: [PATCH] Update dependencies Gradle 7.2 -> 8.3 Spring boot 2.6.2 -> 3.1.5 Springdoc 1.6.4 -> 2.2.0 PDFBox 2.0.13 -> 2.0.30 Batik 1.10 -> 1.17 Commons IO 2.6 -> 2.7 Jsoup 1.11.3 -> 1.16.2 Guava 27.1 -> 32.1.3 Bucket4j starter 0.5.2 -> 0.9.1 --- build.gradle | 31 +++++++++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../AirConditionersApiController.java | 4 +-- .../AirConditionersInternetLabelApiForm.java | 2 +- .../dishwashers/DishwashersApiController.java | 4 +-- .../DishwashersInternetLabelApiForm.java | 2 +- .../DomesticOvenInternetLabelApiForm.java | 2 +- .../DomesticOvensApiController.java | 4 +-- .../categories/lamps/LampsApiController.java | 4 +-- .../LampsNewStyleInternetLabelApiForm.java | 2 +- .../LampsOldStyleInternetLabelApiForm.java | 2 +- .../lamps/LampsPostSeptember2021ApiForm.java | 8 ++--- .../lamps/LampsPreSeptember2021ApiForm.java | 6 ++-- .../LocalSpaceHeatersApiController.java | 4 +-- ...LocalSpaceHeatersInternetLabelApiForm.java | 2 +- .../ProRefrigeratedCabinetsApiController.java | 4 +-- ...rigeratedCabinetsInternetLabelApiForm.java | 2 +- .../rangehoods/RangeHoodsApiController.java | 4 +-- .../RangeHoodsInternetLabelApiForm.java | 2 +- .../RefrigeratingAppliancesApiController.java | 4 +-- ...eratingAppliancesInternetLapelApiForm.java | 2 +- .../BeverageCoolersInternetLabelApiForm.java | 2 +- .../DisplayCabinetsInternetLabelApiForm.java | 2 +- .../IceCreamFreezersInternetLabelApiForm.java | 2 +- ...RefrigeratorsDirectSalesApiController.java | 4 +-- ...ratorsDirectSalesInternetLabelApiForm.java | 2 +- .../VendingMachinesInternetLabelApiForm.java | 2 +- .../SolidFuelBoilersApiController.java | 4 +-- .../SolidFuelBoilersInternetLabelApiForm.java | 2 +- .../SpaceHeaterApiController.java | 4 +-- .../SpaceHeatersInternetLabelApiForm.java | 2 +- .../televisions/TelevisionsApiController.java | 4 +-- .../TelevisionsInternetLabelApiForm.java | 2 +- .../TumbleDryerApiController.java | 4 +-- .../TumbleDryerInternetLabelApiForm.java | 2 +- .../VentilationUnitsApiController.java | 4 +-- .../VentilationUnitsInternetLabelApiForm.java | 2 +- .../WashingMachinesApiController.java | 4 +-- .../WashingMachinesInternetLabelApiForm.java | 2 +- .../waterheaters/ClimateConditionApiForm.java | 6 ++-- .../ConventionalWaterHeaterApiForm.java | 8 ++--- .../HeatPumpWaterHeatersApiForm.java | 8 ++--- .../SolarWaterHeatersApiForm.java | 8 ++--- .../WaterHeatersApiController.java | 4 +-- .../WaterHeatersInternetLabelApiForm.java | 2 +- ...WaterSolarPackageInternetLabelApiForm.java | 2 +- .../els/api/common/ApiControllerAdvice.java | 2 +- .../common/ApiDocumentationController.java | 2 +- .../els/api/common/ApiValuesFromEnum.java | 4 +-- .../common/ApiValuesFromEnumValidator.java | 4 +-- .../ApiValuesFromLegislationCategory.java | 4 +-- ...aluesFromLegislationCategoryValidator.java | 4 +-- .../common/ApiValuesFromLoadProfileList.java | 4 +-- ...ApiValuesFromLoadProfileListValidator.java | 4 +-- .../common/ApiValuesFromRatingClassRange.java | 4 +-- ...piValuesFromRatingClassRangeValidator.java | 4 +-- .../api/common/BaseInternetLabelApiForm.java | 6 ++-- .../common/RescaledInternetLabelApiForm.java | 2 +- .../beis/els/api/openapi/OpenApiConfig.java | 4 +-- .../openapi/OpenApiPropertyCustomiser.java | 2 +- .../beis/els/api/openapi/OpenApiService.java | 6 ++-- .../controller/AirConditionersController.java | 2 +- .../model/ColderClimateGroup.java | 2 +- .../CoolingDuctedAirConditionersForm.java | 8 ++--- .../CoolingDuctlessAirConditionersForm.java | 8 ++--- .../HeatingDuctedAirConditionersForm.java | 8 ++--- .../HeatingDuctlessAirConditionersForm.java | 8 ++--- .../model/MultipleClimateGroupForm.java | 6 ++-- .../ReversibleDuctedAirConditionersForm.java | 8 ++--- ...ReversibleDuctlessAirConditionersForm.java | 8 ++--- .../model/WarmerClimateGroup.java | 2 +- .../common/LabelFormatConstraint.java | 4 +-- .../common/LabelFormatValidator.java | 4 +-- .../common/StandardTemplateForm20Char.java | 2 +- .../common/StandardTemplateForm30Char.java | 2 +- .../common/StandardTemplateForm40Char.java | 2 +- .../common/StandardTemplateForm50Char.java | 2 +- .../controller/DishwashersController.java | 2 +- .../dishwashers/model/DishwashersForm.java | 10 +++--- .../controller/DomesticOvensController.java | 2 +- .../model/DomesticOvensForm.java | 8 ++--- .../domesticovens/model/FanOvenGroup.java | 2 +- .../domesticovens/model/GasOvensForm.java | 4 +-- .../model/InternetLabellingForm.java | 4 +-- .../lamps/controller/LampsController.java | 2 +- .../els/categories/lamps/model/LampsForm.java | 8 ++--- .../lamps/model/LampsFormNoSupplierModel.java | 8 ++--- .../LampsFormNoSupplierModelConsumption.java | 4 +-- .../lamps/model/LampsFormPackagingArrow.java | 4 +-- .../LocalSpaceHeatersController.java | 2 +- .../model/HeatTransferGroup.java | 2 +- .../model/LocalSpaceHeatersForm.java | 8 ++--- .../ProRefrigeratedCabinetsController.java | 2 +- .../model/FreezerGroup.java | 2 +- .../model/FridgeGroup.java | 2 +- .../model/ProRefrigeratedCabinetsForm.java | 8 ++--- .../controller/RangeHoodsController.java | 2 +- .../rangehoods/model/LightingSystemGroup.java | 2 +- .../rangehoods/model/RangeHoodsForm.java | 8 ++--- .../RefrigeratingAppliancesController.java | 2 +- .../model/FreezerGroup.java | 2 +- .../model/FridgeGroup.java | 2 +- .../model/FridgesFreezersForm.java | 10 +++--- .../model/WineStorageAppliancesForm.java | 10 +++--- .../RefrigeratorsDirectSalesController.java | 2 +- .../model/BeverageCoolersForm.java | 10 +++--- .../model/DisplayCabinetsForm.java | 10 +++--- .../model/FreezerGroup.java | 2 +- .../model/FridgeGroup.java | 2 +- .../model/IceCreamFreezersForm.java | 10 +++--- .../model/VendingMachinesForm.java | 10 +++--- .../SolidFuelBoilersController.java | 2 +- .../model/SolidFuelBoilerPackagesForm.java | 6 ++-- .../model/SolidFuelBoilersForm.java | 8 ++--- .../controller/SpaceHeatersController.java | 2 +- .../BoilerCombinationCalculatorForm.java | 6 ++-- .../model/BoilerCombinationHeatersForm.java | 10 +++--- .../model/BoilerPackagesCalculatorForm.java | 4 +-- .../model/BoilerSpaceHeatersForm.java | 8 ++--- .../model/CogenerationSpaceHeatersForm.java | 8 ++--- .../model/CombinationHeaterPackagesForm.java | 6 ++-- .../HeatPumpCombinationCalculatorForm.java | 6 ++-- .../model/HeatPumpCombinationHeatersForm.java | 10 +++--- .../model/HeatPumpPackagesCalculatorForm.java | 4 +-- .../model/HeatPumpSpaceHeatersForm.java | 6 ++-- ...owTemperatureHeatPumpSpaceHeatersForm.java | 10 +++--- .../SpaceHeaterPackagesCalculatorForm.java | 4 +-- .../model/SpaceHeaterPackagesForm.java | 6 ++-- .../spaceheaters/model/StorageTankGroup.java | 2 +- .../model/SupplementaryBoilerGroup.java | 2 +- .../model/SupplementaryHeatPumpGroup.java | 2 +- .../model/TemperatureControlGroup.java | 2 +- .../controller/TelevisionController.java | 2 +- .../televisions/model/TelevisionsForm.java | 8 ++--- .../controller/TumbleDryersController.java | 2 +- .../model/CondenserTumbleDryersForm.java | 2 +- .../tumbledryers/model/TumbleDryersForm.java | 8 ++--- .../VentilationUnitsController.java | 2 +- .../model/VentilationUnitsForm.java | 8 ++--- .../controller/WashingMachinesController.java | 2 +- .../model/WasherDryerForm.java | 10 +++--- .../model/WashingMachinesForm.java | 10 +++--- .../controller/WaterHeatersController.java | 2 +- .../model/ClimateConditionForm.java | 4 +-- .../model/ConventionalWaterHeatersForm.java | 8 ++--- .../model/HeatPumpWaterHeatersForm.java | 10 +++--- .../model/HotWaterStorageTanksForm.java | 8 ++--- .../model/SolarWaterHeatersForm.java | 6 ++-- .../WaterSolarPackagesCalculatorForm.java | 6 ++-- .../model/WaterSolarPackagesForm.java | 6 ++-- .../els/controller/CategoryController.java | 2 +- .../mvc/FormAnnotationHandlerInterceptor.java | 8 ++--- .../uk/gov/beis/els/mvc/HttpHeaderFilter.java | 8 ++--- .../ResponseBufferSizeHandlerInterceptor.java | 4 +-- .../els/service/Bucket4JRequestService.java | 2 +- src/main/resources/application.properties | 2 +- .../ApiValuesFromEnumValidatorTest.java | 8 ++--- ...sFromLegislationCategoryValidatorTest.java | 8 ++--- ...aluesFromLoadProfileListValidatorTest.java | 8 ++--- ...luesFromRatingClassRangeValidatorTest.java | 8 ++--- ...ation-bucket4j-integration-test.properties | 4 +-- 161 files changed, 387 insertions(+), 378 deletions(-) diff --git a/build.gradle b/build.gradle index 008151b8..64265788 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,16 @@ plugins { - id 'org.springframework.boot' version '2.6.2' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id 'java' + id 'java' + id 'org.springframework.boot' version '3.1.5' + id 'io.spring.dependency-management' version '1.1.3' id 'jacoco' } group = 'uk.gov.beis' version = 'SNAPSHOT' -sourceCompatibility = 1.8 + +java { + sourceCompatibility = '17' +} repositories { mavenCentral() @@ -17,21 +20,24 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-freemarker' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springdoc:springdoc-openapi-ui:1.6.4' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' implementation 'com.github.librepdf:openpdf:1.2.10' - implementation 'org.apache.pdfbox:pdfbox:2.0.13' + implementation 'org.apache.pdfbox:pdfbox:2.0.30' implementation 'com.openhtmltopdf:openhtmltopdf-core:0.0.1-RC17' implementation 'com.openhtmltopdf:openhtmltopdf-pdfbox:0.0.1-RC17' implementation 'com.openhtmltopdf:openhtmltopdf-svg-support:0.0.1-RC17' + implementation 'org.apache.xmlgraphics:batik-transcoder:1.17' // shade older 1.10 provided by openhtmltopdf-svg-support to fix CVEs implementation 'org.apache.commons:commons-lang3:3.7' - implementation 'commons-io:commons-io:2.6' - implementation 'org.jsoup:jsoup:1.11.3' - implementation 'com.google.guava:guava:27.1-jre' + implementation 'commons-io:commons-io:2.7' + implementation 'org.jsoup:jsoup:1.16.2' + implementation 'com.google.guava:guava:32.1.3-jre' implementation 'io.nayuki:qrcodegen:1.6.0' implementation 'io.pivotal.cfenv:java-cfenv:2.4.2' + implementation 'org.slf4j:slf4j-api:2.0.7' + //Bucket4j dependencies - implementation 'com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:0.5.2' + implementation 'com.giffing.bucket4j.spring.boot.starter:bucket4j-spring-boot-starter:0.9.1' implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'javax.cache:cache-api' implementation 'com.github.ben-manes.caffeine:caffeine:2.8.2' @@ -39,4 +45,9 @@ dependencies { testImplementation 'junit:junit:4.12' testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +configurations.implementation { + // Exclude snakeyaml as it has critical vulns, and Spring only uses it to parse .yaml config files which we don't have. + exclude group:"org.yaml", module: "snakeyaml" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d2c8acb0..5ef33f4d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip diff --git a/src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersApiController.java b/src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersApiController.java index e289c17a..60cfb240 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,7 +21,7 @@ @RestController @RequestMapping("${api.v1.base_path}/air-conditioners") -@Tag(name = "Air conditioners") +@Tag(name = "Air conditioners", description = "Generate labels for air conditioners") public class AirConditionersApiController { private final AirConditionersService airConditionersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersInternetLabelApiForm.java index 1b45e693..af3ed210 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/airconditioners/AirConditionersInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.airconditioners; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersApiController.java b/src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersApiController.java index 0dd827bd..311551e2 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,7 +16,7 @@ @RestController @RequestMapping("${api.v1.base_path}/dishwasher") -@Tag(name = "Dishwashers") +@Tag(name = "Dishwashers", description = "Generate labels for dishwashers") public class DishwashersApiController { private final DishwashersService dishwashersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersInternetLabelApiForm.java index e570f5e8..660f4be1 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/dishwashers/DishwashersInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.dishwashers; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.dishwashers.service.DishwashersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvenInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvenInternetLabelApiForm.java index d1708705..18cc9017 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvenInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvenInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.domesticovens; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.domesticovens.service.DomesticOvensService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvensApiController.java b/src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvensApiController.java index 0127cade..9105a06a 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvensApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/domesticovens/DomesticOvensApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,7 +16,7 @@ @RestController @RequestMapping("${api.v1.base_path}/domestic-ovens") -@Tag(name = "Domestic ovens") +@Tag(name = "Domestic ovens", description = "Generate labels for domestic ovens") public class DomesticOvensApiController { private final DomesticOvensService domesticOvensService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsApiController.java b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsApiController.java index c9df0abf..ad0a6454 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -18,7 +18,7 @@ @RestController @RequestMapping("${api.v1.base_path}/lamps") -@Tag(name = "Lamps and light sources") +@Tag(name = "Lamps and light sources", description = "Generate labels for lamps and light sources") public class LampsApiController { private final LampsService lampsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsNewStyleInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsNewStyleInternetLabelApiForm.java index 7ae00f54..0089b22d 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsNewStyleInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsNewStyleInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.lamps; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.lamps.service.LampsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsOldStyleInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsOldStyleInternetLabelApiForm.java index c14bc88d..d2b1bb42 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsOldStyleInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsOldStyleInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.lamps; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.lamps.service.LampsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPostSeptember2021ApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPostSeptember2021ApiForm.java index 71efae56..377f1ec0 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPostSeptember2021ApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPostSeptember2021ApiForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.api.categories.lamps; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPreSeptember2021ApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPreSeptember2021ApiForm.java index cdb0105b..05d7e92e 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPreSeptember2021ApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/lamps/LampsPreSeptember2021ApiForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.api.categories.lamps; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; import uk.gov.beis.els.categories.lamps.service.LampsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersApiController.java b/src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersApiController.java index 6768bfd0..4017cee8 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,7 +16,7 @@ @RestController @RequestMapping("${api.v1.base_path}/local-space-heaters") -@Tag(name = "Local space heaters") +@Tag(name = "Local space heaters", description = "Generate labels for local space heaters") public class LocalSpaceHeatersApiController { private final LocalSpaceHeatersService localSpaceHeatersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersInternetLabelApiForm.java index d4dea254..b5ab411f 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/localspaceheaters/LocalSpaceHeatersInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.localspaceheaters; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.localspaceheaters.service.LocalSpaceHeatersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsApiController.java b/src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsApiController.java index 7e11c755..6684b670 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,7 +16,7 @@ @RestController @RequestMapping("${api.v1.base_path}/professional-refrigerated-storage-cabinets") -@Tag(name = "Professional refrigerated storage cabinets") +@Tag(name = "Professional refrigerated storage cabinets", description = "Generate labels for professional refrigerated storage cabinets") public class ProRefrigeratedCabinetsApiController { private final ProRefrigeratedCabinetsService proRefrigeratedCabinetsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsInternetLabelApiForm.java index ed68e568..0a499cda 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/prorefrigeratedcabinets/ProRefrigeratedCabinetsInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.prorefrigeratedcabinets; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.prorefrigeratedcabinets.service.ProRefrigeratedCabinetsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsApiController.java b/src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsApiController.java index 649e7b23..ccfa05a5 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,7 +16,7 @@ @RestController @RequestMapping("${api.v1.base_path}/range-hoods") -@Tag(name = "Range hoods") +@Tag(name = "Range hoods", description = "Generate labels for range hoods") public class RangeHoodsApiController { private final RangeHoodsService rangeHoodsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsInternetLabelApiForm.java index 1cd2116f..9c415a6a 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/rangehoods/RangeHoodsInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.rangehoods; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.rangehoods.service.RangeHoodsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesApiController.java b/src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesApiController.java index 473b2fd2..aaee536f 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -17,7 +17,7 @@ @RestController @RequestMapping("${api.v1.base_path}/household-refrigerating-appliances") -@Tag(name = "Household refrigerating appliances") +@Tag(name = "Household refrigerating appliances", description = "Generate labels for household refrigerating appliances") public class RefrigeratingAppliancesApiController { private final RefrigeratingAppliancesService refrigeratingAppliancesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesInternetLapelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesInternetLapelApiForm.java index ba657aba..410e5942 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesInternetLapelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/refrigeratingappliances/RefrigeratingAppliancesInternetLapelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.refrigeratingappliances; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.refrigeratingappliances.service.RefrigeratingAppliancesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/BeverageCoolersInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/BeverageCoolersInternetLabelApiForm.java index 4682538e..a137927b 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/BeverageCoolersInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/BeverageCoolersInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.refrigeratordirectsales; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/DisplayCabinetsInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/DisplayCabinetsInternetLabelApiForm.java index 932f32e1..0efd33ea 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/DisplayCabinetsInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/DisplayCabinetsInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.refrigeratordirectsales; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/IceCreamFreezersInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/IceCreamFreezersInternetLabelApiForm.java index 842abc1a..9e3853d9 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/IceCreamFreezersInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/IceCreamFreezersInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.refrigeratordirectsales; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesApiController.java b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesApiController.java index 050adca9..46d4856b 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,7 +19,7 @@ @RestController @RequestMapping("${api.v1.base_path}/refrigerators-direct-sales") -@Tag(name = "Refrigerators with a direct sales function") +@Tag(name = "Refrigerators with a direct sales function", description = "Generate labels for refrigerators with a direct sales function") public class RefrigeratorsDirectSalesApiController { private final RefrigeratorsDirectSalesService refrigeratorsDirectSalesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesInternetLabelApiForm.java index 70e14eb1..7daae767 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/RefrigeratorsDirectSalesInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.refrigeratordirectsales; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/VendingMachinesInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/VendingMachinesInternetLabelApiForm.java index 3d38b39e..555ff609 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/VendingMachinesInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/refrigeratordirectsales/VendingMachinesInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.refrigeratordirectsales; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.refrigeratorsdirectsales.service.RefrigeratorsDirectSalesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/solidfuelboilers/SolidFuelBoilersApiController.java b/src/main/java/uk/gov/beis/els/api/categories/solidfuelboilers/SolidFuelBoilersApiController.java index 274c67a6..330e515b 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/solidfuelboilers/SolidFuelBoilersApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/solidfuelboilers/SolidFuelBoilersApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -17,7 +17,7 @@ @RestController @RequestMapping("${api.v1.base_path}/solid-fuel-boilers") -@Tag(name = "Solid fuel boilers") +@Tag(name = "Solid fuel boilers", description = "Generate labels for solid fuel boilers") public class SolidFuelBoilersApiController { private final SolidFuelBoilersService solidFuelBoilersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/solidfuelboilers/SolidFuelBoilersInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/solidfuelboilers/SolidFuelBoilersInternetLabelApiForm.java index c65ef445..ed771701 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/solidfuelboilers/SolidFuelBoilersInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/solidfuelboilers/SolidFuelBoilersInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.solidfuelboilers; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.solidfuelboilers.service.SolidFuelBoilersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/spaceheaters/SpaceHeaterApiController.java b/src/main/java/uk/gov/beis/els/api/categories/spaceheaters/SpaceHeaterApiController.java index d8ca1d7e..f53a4b0d 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/spaceheaters/SpaceHeaterApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/spaceheaters/SpaceHeaterApiController.java @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import java.util.ArrayList; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -32,7 +32,7 @@ @RestController @RequestMapping("${api.v1.base_path}/space-heaters") -@Tag(name = "Space heaters") +@Tag(name = "Space heaters", description = "Generate labels for space heaters") public class SpaceHeaterApiController { private final SpaceHeatersService spaceHeatersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/spaceheaters/SpaceHeatersInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/spaceheaters/SpaceHeatersInternetLabelApiForm.java index 56f16273..d1bd88bf 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/spaceheaters/SpaceHeatersInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/spaceheaters/SpaceHeatersInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.spaceheaters; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.spaceheaters.service.SpaceHeatersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/televisions/TelevisionsApiController.java b/src/main/java/uk/gov/beis/els/api/categories/televisions/TelevisionsApiController.java index 9cb3cf36..8174645c 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/televisions/TelevisionsApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/televisions/TelevisionsApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,7 +16,7 @@ @RestController @RequestMapping("${api.v1.base_path}/televisions") -@Tag(name = "Televisions") +@Tag(name = "Televisions", description = "Generate labels for televisions") public class TelevisionsApiController { private final TelevisionsService televisionsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/televisions/TelevisionsInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/televisions/TelevisionsInternetLabelApiForm.java index d217f634..ba8cbeb9 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/televisions/TelevisionsInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/televisions/TelevisionsInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.televisions; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.televisions.service.TelevisionsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/tumbledryers/TumbleDryerApiController.java b/src/main/java/uk/gov/beis/els/api/categories/tumbledryers/TumbleDryerApiController.java index 7a0a1d25..70b4081f 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/tumbledryers/TumbleDryerApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/tumbledryers/TumbleDryerApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -17,7 +17,7 @@ @RestController @RequestMapping("${api.v1.base_path}/tumble-dryers") -@Tag(name = "Tumble dryers") +@Tag(name = "Tumble dryers", description = "Generate labels for tumble dryers") public class TumbleDryerApiController { private final TumbleDryersService tumbleDryersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/tumbledryers/TumbleDryerInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/tumbledryers/TumbleDryerInternetLabelApiForm.java index a3ddb36f..e876808f 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/tumbledryers/TumbleDryerInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/tumbledryers/TumbleDryerInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.tumbledryers; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.tumbledryers.service.TumbleDryersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/ventilationunits/VentilationUnitsApiController.java b/src/main/java/uk/gov/beis/els/api/categories/ventilationunits/VentilationUnitsApiController.java index 75b697fc..ed3b0551 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/ventilationunits/VentilationUnitsApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/ventilationunits/VentilationUnitsApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,7 +16,7 @@ @RestController @RequestMapping("${api.v1.base_path}/ventilation-units") -@Tag(name = "Ventilation units") +@Tag(name = "Ventilation units", description = "Generate labels for ventilation units") public class VentilationUnitsApiController { private final VentilationUnitsService ventilationUnitsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/ventilationunits/VentilationUnitsInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/ventilationunits/VentilationUnitsInternetLabelApiForm.java index 9ea83248..acecd6f0 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/ventilationunits/VentilationUnitsInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/ventilationunits/VentilationUnitsInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.ventilationunits; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.ventilationunits.service.VentilationUnitsService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/washingmachines/WashingMachinesApiController.java b/src/main/java/uk/gov/beis/els/api/categories/washingmachines/WashingMachinesApiController.java index 98f8a0f1..b384f12b 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/washingmachines/WashingMachinesApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/washingmachines/WashingMachinesApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -17,7 +17,7 @@ @RestController @RequestMapping("${api.v1.base_path}/washing-machines") -@Tag(name = "Washing machines and washer-dryers") +@Tag(name = "Washing machines and washer-dryers", description = "Generate labels for washing machines and washer-dryers") public class WashingMachinesApiController { private final WashingMachinesService washingMachinesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/washingmachines/WashingMachinesInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/washingmachines/WashingMachinesInternetLabelApiForm.java index afb95c82..b4ac6d73 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/washingmachines/WashingMachinesInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/washingmachines/WashingMachinesInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.washingmachines; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.RescaledInternetLabelApiForm; import uk.gov.beis.els.categories.washingmachines.service.WashingMachinesService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/ClimateConditionApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/ClimateConditionApiForm.java index 3fe48209..3ceaa9fa 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/ClimateConditionApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/ClimateConditionApiForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.api.categories.waterheaters; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; import uk.gov.beis.els.categories.waterheaters.model.EnergyConsumptionUnit; diff --git a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/ConventionalWaterHeaterApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/ConventionalWaterHeaterApiForm.java index 7065bff0..e490318c 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/ConventionalWaterHeaterApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/ConventionalWaterHeaterApiForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.api.categories.waterheaters; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; diff --git a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/HeatPumpWaterHeatersApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/HeatPumpWaterHeatersApiForm.java index 987ddfdb..4f40c1c3 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/HeatPumpWaterHeatersApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/HeatPumpWaterHeatersApiForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.api.categories.waterheaters; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; diff --git a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/SolarWaterHeatersApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/SolarWaterHeatersApiForm.java index ca00bd95..b258fa8f 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/SolarWaterHeatersApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/SolarWaterHeatersApiForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.api.categories.waterheaters; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; diff --git a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterHeatersApiController.java b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterHeatersApiController.java index d6d7f38d..b5b007cc 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterHeatersApiController.java +++ b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterHeatersApiController.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,7 +19,7 @@ @RestController @RequestMapping("${api.v1.base_path}/water-heaters") -@Tag(name = "Water heaters") +@Tag(name = "Water heaters", description = "Generate labels for water heaters") public class WaterHeatersApiController { private final WaterHeatersService waterHeatersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterHeatersInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterHeatersInternetLabelApiForm.java index 64e9ebc3..3718ecfc 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterHeatersInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterHeatersInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.waterheaters; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.waterheaters.service.WaterHeatersService; diff --git a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterSolarPackageInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterSolarPackageInternetLabelApiForm.java index 2726fcce..8489d170 100644 --- a/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterSolarPackageInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/categories/waterheaters/WaterSolarPackageInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.categories.waterheaters; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.BaseInternetLabelApiForm; import uk.gov.beis.els.categories.waterheaters.service.WaterHeatersService; diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiControllerAdvice.java b/src/main/java/uk/gov/beis/els/api/common/ApiControllerAdvice.java index 7cd47297..d8f03a6d 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiControllerAdvice.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiControllerAdvice.java @@ -3,7 +3,7 @@ import java.time.Instant; import java.util.List; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.MethodArgumentNotValidException; diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiDocumentationController.java b/src/main/java/uk/gov/beis/els/api/common/ApiDocumentationController.java index feb2884f..41aa17c2 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiDocumentationController.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiDocumentationController.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.api.common; +import jakarta.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromEnum.java b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromEnum.java index 37ba2ec9..ecdc5f16 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromEnum.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromEnum.java @@ -4,8 +4,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; /** * Set which values can be used in an API call from an enum diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromEnumValidator.java b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromEnumValidator.java index 570b75f8..6a4b6017 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromEnumValidator.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromEnumValidator.java @@ -2,8 +2,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; public class ApiValuesFromEnumValidator implements ConstraintValidator { diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategory.java b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategory.java index 954b07d4..8193b748 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategory.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategory.java @@ -4,8 +4,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; /** * Fields with this annotation will have their allowableValues constraint in the OpenAPI specification set dynamically based on diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategoryValidator.java b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategoryValidator.java index c36b969e..02baac22 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategoryValidator.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategoryValidator.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.api.common; import java.lang.reflect.Field; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; import uk.gov.beis.els.model.LegislationCategory; import uk.gov.beis.els.model.RatingClass; diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileList.java b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileList.java index 551e3bba..43d0761b 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileList.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileList.java @@ -4,8 +4,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; /** * Set which LoadProfile values can be used in an API call from a subset list of LoadProfile diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileListValidator.java b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileListValidator.java index 54907c17..7e0635ce 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileListValidator.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileListValidator.java @@ -2,8 +2,8 @@ import java.lang.reflect.Field; import java.util.List; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; import uk.gov.beis.els.categories.common.LoadProfile; diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRange.java b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRange.java index 1f4621b8..6d3d4da9 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRange.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRange.java @@ -5,8 +5,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; /** * Fields with this annotation will have their allowableValues constraint in the OpenAPI specification set dynamically based on diff --git a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRangeValidator.java b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRangeValidator.java index 29c366af..d093c99c 100644 --- a/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRangeValidator.java +++ b/src/main/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRangeValidator.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.api.common; import java.lang.reflect.Field; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; import uk.gov.beis.els.model.RatingClass; import uk.gov.beis.els.model.RatingClassRange; diff --git a/src/main/java/uk/gov/beis/els/api/common/BaseInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/common/BaseInternetLabelApiForm.java index 11dbcf36..498ec138 100644 --- a/src/main/java/uk/gov/beis/els/api/common/BaseInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/common/BaseInternetLabelApiForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.api.common; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabelFormat; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabelOrientation; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/api/common/RescaledInternetLabelApiForm.java b/src/main/java/uk/gov/beis/els/api/common/RescaledInternetLabelApiForm.java index 1a5e4488..a1e4786b 100644 --- a/src/main/java/uk/gov/beis/els/api/common/RescaledInternetLabelApiForm.java +++ b/src/main/java/uk/gov/beis/els/api/common/RescaledInternetLabelApiForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.api.common; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabelColour; public class RescaledInternetLabelApiForm extends BaseInternetLabelApiForm { diff --git a/src/main/java/uk/gov/beis/els/api/openapi/OpenApiConfig.java b/src/main/java/uk/gov/beis/els/api/openapi/OpenApiConfig.java index 0ba5baad..5ef32bf1 100644 --- a/src/main/java/uk/gov/beis/els/api/openapi/OpenApiConfig.java +++ b/src/main/java/uk/gov/beis/els/api/openapi/OpenApiConfig.java @@ -5,7 +5,7 @@ import io.swagger.v3.oas.models.media.Schema; import java.util.Map; import java.util.TreeMap; -import org.springdoc.core.customizers.OpenApiCustomiser; +import org.springdoc.core.customizers.OpenApiCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -24,7 +24,7 @@ public OpenAPI configureOpenApi() { ); } @Bean - public OpenApiCustomiser sortSchemasAlphabetically() { + public OpenApiCustomizer sortSchemasAlphabetically() { return openApi -> { Map schemas = openApi.getComponents().getSchemas(); openApi.getComponents().setSchemas(new TreeMap<>(schemas)); diff --git a/src/main/java/uk/gov/beis/els/api/openapi/OpenApiPropertyCustomiser.java b/src/main/java/uk/gov/beis/els/api/openapi/OpenApiPropertyCustomiser.java index 55419348..5677d2d5 100644 --- a/src/main/java/uk/gov/beis/els/api/openapi/OpenApiPropertyCustomiser.java +++ b/src/main/java/uk/gov/beis/els/api/openapi/OpenApiPropertyCustomiser.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import javax.validation.constraints.Digits; +import jakarta.validation.constraints.Digits; import org.springdoc.core.customizers.PropertyCustomizer; import org.springframework.stereotype.Component; import uk.gov.beis.els.api.common.ApiValuesFromEnum; diff --git a/src/main/java/uk/gov/beis/els/api/openapi/OpenApiService.java b/src/main/java/uk/gov/beis/els/api/openapi/OpenApiService.java index d26949e1..337bfccb 100644 --- a/src/main/java/uk/gov/beis/els/api/openapi/OpenApiService.java +++ b/src/main/java/uk/gov/beis/els/api/openapi/OpenApiService.java @@ -1,7 +1,5 @@ package uk.gov.beis.els.api.openapi; -import static org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.on; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -9,11 +7,11 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +30,8 @@ import uk.gov.beis.els.mvc.ReverseRouter; import uk.gov.beis.els.util.StreamUtils; +import static org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.on; + @Service public class OpenApiService { diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/controller/AirConditionersController.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/controller/AirConditionersController.java index 106f092f..4395e034 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/controller/AirConditionersController.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/controller/AirConditionersController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ColderClimateGroup.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ColderClimateGroup.java index fb68cec2..e12a4d67 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ColderClimateGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ColderClimateGroup.java @@ -1,5 +1,5 @@ package uk.gov.beis.els.categories.airconditioners.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface ColderClimateGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/CoolingDuctedAirConditionersForm.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/CoolingDuctedAirConditionersForm.java index 6f029adb..cab217b0 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/CoolingDuctedAirConditionersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/CoolingDuctedAirConditionersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.airconditioners.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/CoolingDuctlessAirConditionersForm.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/CoolingDuctlessAirConditionersForm.java index cf3b99fd..8c3b640a 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/CoolingDuctlessAirConditionersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/CoolingDuctlessAirConditionersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.airconditioners.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/HeatingDuctedAirConditionersForm.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/HeatingDuctedAirConditionersForm.java index 95b3d33d..d8140f60 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/HeatingDuctedAirConditionersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/HeatingDuctedAirConditionersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.airconditioners.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/HeatingDuctlessAirConditionersForm.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/HeatingDuctlessAirConditionersForm.java index 03dc3aad..7ec2fbb3 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/HeatingDuctlessAirConditionersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/HeatingDuctlessAirConditionersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.airconditioners.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService; diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/MultipleClimateGroupForm.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/MultipleClimateGroupForm.java index 4f702222..d48f8060 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/MultipleClimateGroupForm.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/MultipleClimateGroupForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.airconditioners.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ReversibleDuctedAirConditionersForm.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ReversibleDuctedAirConditionersForm.java index 81d32d54..1ccc89d6 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ReversibleDuctedAirConditionersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ReversibleDuctedAirConditionersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.airconditioners.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ReversibleDuctlessAirConditionersForm.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ReversibleDuctlessAirConditionersForm.java index c46e1e7d..b511378f 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ReversibleDuctlessAirConditionersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/ReversibleDuctlessAirConditionersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.airconditioners.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.airconditioners.service.AirConditionersService; diff --git a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/WarmerClimateGroup.java b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/WarmerClimateGroup.java index f9174f3c..8c0eccbb 100644 --- a/src/main/java/uk/gov/beis/els/categories/airconditioners/model/WarmerClimateGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/airconditioners/model/WarmerClimateGroup.java @@ -1,5 +1,5 @@ package uk.gov.beis.els.categories.airconditioners.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface WarmerClimateGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/common/LabelFormatConstraint.java b/src/main/java/uk/gov/beis/els/categories/common/LabelFormatConstraint.java index 49fd91b7..4b61cc6e 100644 --- a/src/main/java/uk/gov/beis/els/categories/common/LabelFormatConstraint.java +++ b/src/main/java/uk/gov/beis/els/categories/common/LabelFormatConstraint.java @@ -4,8 +4,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Constraint(validatedBy = LabelFormatValidator.class) @Target( { ElementType.METHOD, ElementType.FIELD }) diff --git a/src/main/java/uk/gov/beis/els/categories/common/LabelFormatValidator.java b/src/main/java/uk/gov/beis/els/categories/common/LabelFormatValidator.java index bd7aa833..7e7f36a8 100644 --- a/src/main/java/uk/gov/beis/els/categories/common/LabelFormatValidator.java +++ b/src/main/java/uk/gov/beis/els/categories/common/LabelFormatValidator.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.categories.common; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; diff --git a/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm20Char.java b/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm20Char.java index 8910c6bf..7c207659 100644 --- a/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm20Char.java +++ b/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm20Char.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.common; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import org.hibernate.validator.constraints.Length; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingForm; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm30Char.java b/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm30Char.java index 45bdef86..f80c0c91 100644 --- a/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm30Char.java +++ b/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm30Char.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.common; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import org.hibernate.validator.constraints.Length; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingForm; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm40Char.java b/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm40Char.java index 9ab2cb33..c8833df3 100644 --- a/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm40Char.java +++ b/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm40Char.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.common; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import org.hibernate.validator.constraints.Length; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingForm; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm50Char.java b/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm50Char.java index c52a99b7..fbdb1ea4 100644 --- a/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm50Char.java +++ b/src/main/java/uk/gov/beis/els/categories/common/StandardTemplateForm50Char.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.common; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import org.hibernate.validator.constraints.Length; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingForm; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/dishwashers/controller/DishwashersController.java b/src/main/java/uk/gov/beis/els/categories/dishwashers/controller/DishwashersController.java index 137ba7d5..828cccd6 100644 --- a/src/main/java/uk/gov/beis/els/categories/dishwashers/controller/DishwashersController.java +++ b/src/main/java/uk/gov/beis/els/categories/dishwashers/controller/DishwashersController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/dishwashers/model/DishwashersForm.java b/src/main/java/uk/gov/beis/els/categories/dishwashers/model/DishwashersForm.java index 6c0ca8f0..4d591d41 100644 --- a/src/main/java/uk/gov/beis/els/categories/dishwashers/model/DishwashersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/dishwashers/model/DishwashersForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.dishwashers.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.constraints.Range; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; diff --git a/src/main/java/uk/gov/beis/els/categories/domesticovens/controller/DomesticOvensController.java b/src/main/java/uk/gov/beis/els/categories/domesticovens/controller/DomesticOvensController.java index 92b251db..cb278d43 100644 --- a/src/main/java/uk/gov/beis/els/categories/domesticovens/controller/DomesticOvensController.java +++ b/src/main/java/uk/gov/beis/els/categories/domesticovens/controller/DomesticOvensController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/domesticovens/model/DomesticOvensForm.java b/src/main/java/uk/gov/beis/els/categories/domesticovens/model/DomesticOvensForm.java index 564fc47a..b77bedda 100644 --- a/src/main/java/uk/gov/beis/els/categories/domesticovens/model/DomesticOvensForm.java +++ b/src/main/java/uk/gov/beis/els/categories/domesticovens/model/DomesticOvensForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.domesticovens.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm40Char; diff --git a/src/main/java/uk/gov/beis/els/categories/domesticovens/model/FanOvenGroup.java b/src/main/java/uk/gov/beis/els/categories/domesticovens/model/FanOvenGroup.java index edb60902..13dbb231 100644 --- a/src/main/java/uk/gov/beis/els/categories/domesticovens/model/FanOvenGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/domesticovens/model/FanOvenGroup.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.domesticovens.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface FanOvenGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/domesticovens/model/GasOvensForm.java b/src/main/java/uk/gov/beis/els/categories/domesticovens/model/GasOvensForm.java index 31a0f92b..f8c27ed4 100644 --- a/src/main/java/uk/gov/beis/els/categories/domesticovens/model/GasOvensForm.java +++ b/src/main/java/uk/gov/beis/els/categories/domesticovens/model/GasOvensForm.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.categories.domesticovens.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotNull; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/internetlabelling/model/InternetLabellingForm.java b/src/main/java/uk/gov/beis/els/categories/internetlabelling/model/InternetLabellingForm.java index 525d454f..ee62f428 100644 --- a/src/main/java/uk/gov/beis/els/categories/internetlabelling/model/InternetLabellingForm.java +++ b/src/main/java/uk/gov/beis/els/categories/internetlabelling/model/InternetLabellingForm.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.categories.internetlabelling.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.categories.common.BaseForm; import uk.gov.beis.els.model.meta.FieldPrompt; import uk.gov.beis.els.model.meta.InternetLabelModeField; diff --git a/src/main/java/uk/gov/beis/els/categories/lamps/controller/LampsController.java b/src/main/java/uk/gov/beis/els/categories/lamps/controller/LampsController.java index a7e14fe8..53fa47fc 100644 --- a/src/main/java/uk/gov/beis/els/categories/lamps/controller/LampsController.java +++ b/src/main/java/uk/gov/beis/els/categories/lamps/controller/LampsController.java @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; diff --git a/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsForm.java b/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsForm.java index 158fc1c1..186dca0e 100644 --- a/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsForm.java +++ b/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.lamps.model; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.categories.common.PostSeptember2021Field; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormNoSupplierModel.java b/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormNoSupplierModel.java index b93d7b72..b0fbb794 100644 --- a/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormNoSupplierModel.java +++ b/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormNoSupplierModel.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.lamps.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingForm; diff --git a/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormNoSupplierModelConsumption.java b/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormNoSupplierModelConsumption.java index 437b663a..04db3d73 100644 --- a/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormNoSupplierModelConsumption.java +++ b/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormNoSupplierModelConsumption.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.categories.lamps.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.groups.Default; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingForm; diff --git a/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormPackagingArrow.java b/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormPackagingArrow.java index 984f8b4c..343b427b 100644 --- a/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormPackagingArrow.java +++ b/src/main/java/uk/gov/beis/els/categories/lamps/model/LampsFormPackagingArrow.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.categories.lamps.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.groups.Default; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.BaseForm; diff --git a/src/main/java/uk/gov/beis/els/categories/localspaceheaters/controller/LocalSpaceHeatersController.java b/src/main/java/uk/gov/beis/els/categories/localspaceheaters/controller/LocalSpaceHeatersController.java index d6101192..b3d4dd77 100644 --- a/src/main/java/uk/gov/beis/els/categories/localspaceheaters/controller/LocalSpaceHeatersController.java +++ b/src/main/java/uk/gov/beis/els/categories/localspaceheaters/controller/LocalSpaceHeatersController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/localspaceheaters/model/HeatTransferGroup.java b/src/main/java/uk/gov/beis/els/categories/localspaceheaters/model/HeatTransferGroup.java index f4c69c3b..058863bf 100644 --- a/src/main/java/uk/gov/beis/els/categories/localspaceheaters/model/HeatTransferGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/localspaceheaters/model/HeatTransferGroup.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.localspaceheaters.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface HeatTransferGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/localspaceheaters/model/LocalSpaceHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/localspaceheaters/model/LocalSpaceHeatersForm.java index 57c12046..05b01607 100644 --- a/src/main/java/uk/gov/beis/els/categories/localspaceheaters/model/LocalSpaceHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/localspaceheaters/model/LocalSpaceHeatersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.localspaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/controller/ProRefrigeratedCabinetsController.java b/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/controller/ProRefrigeratedCabinetsController.java index 89a6f080..d4387e25 100644 --- a/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/controller/ProRefrigeratedCabinetsController.java +++ b/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/controller/ProRefrigeratedCabinetsController.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/FreezerGroup.java b/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/FreezerGroup.java index 0805982f..389bf973 100644 --- a/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/FreezerGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/FreezerGroup.java @@ -1,5 +1,5 @@ package uk.gov.beis.els.categories.prorefrigeratedcabinets.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface FreezerGroup extends Default {} diff --git a/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/FridgeGroup.java b/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/FridgeGroup.java index 188fdf45..6a224f81 100644 --- a/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/FridgeGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/FridgeGroup.java @@ -1,5 +1,5 @@ package uk.gov.beis.els.categories.prorefrigeratedcabinets.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface FridgeGroup extends Default {} diff --git a/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/ProRefrigeratedCabinetsForm.java b/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/ProRefrigeratedCabinetsForm.java index 1bbe05c7..1849935d 100644 --- a/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/ProRefrigeratedCabinetsForm.java +++ b/src/main/java/uk/gov/beis/els/categories/prorefrigeratedcabinets/model/ProRefrigeratedCabinetsForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.prorefrigeratedcabinets.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; diff --git a/src/main/java/uk/gov/beis/els/categories/rangehoods/controller/RangeHoodsController.java b/src/main/java/uk/gov/beis/els/categories/rangehoods/controller/RangeHoodsController.java index a374fcd5..4fc0ff8b 100644 --- a/src/main/java/uk/gov/beis/els/categories/rangehoods/controller/RangeHoodsController.java +++ b/src/main/java/uk/gov/beis/els/categories/rangehoods/controller/RangeHoodsController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/rangehoods/model/LightingSystemGroup.java b/src/main/java/uk/gov/beis/els/categories/rangehoods/model/LightingSystemGroup.java index fa82a237..4291640e 100644 --- a/src/main/java/uk/gov/beis/els/categories/rangehoods/model/LightingSystemGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/rangehoods/model/LightingSystemGroup.java @@ -1,5 +1,5 @@ package uk.gov.beis.els.categories.rangehoods.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface LightingSystemGroup extends Default {} diff --git a/src/main/java/uk/gov/beis/els/categories/rangehoods/model/RangeHoodsForm.java b/src/main/java/uk/gov/beis/els/categories/rangehoods/model/RangeHoodsForm.java index 66cbc4b1..d900530a 100644 --- a/src/main/java/uk/gov/beis/els/categories/rangehoods/model/RangeHoodsForm.java +++ b/src/main/java/uk/gov/beis/els/categories/rangehoods/model/RangeHoodsForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.rangehoods.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/controller/RefrigeratingAppliancesController.java b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/controller/RefrigeratingAppliancesController.java index 03301811..6f2c4c83 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/controller/RefrigeratingAppliancesController.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/controller/RefrigeratingAppliancesController.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FreezerGroup.java b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FreezerGroup.java index e42b7c7d..c136a1ce 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FreezerGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FreezerGroup.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.refrigeratingappliances.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface FreezerGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FridgeGroup.java b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FridgeGroup.java index e1a485dc..30e46cc6 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FridgeGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FridgeGroup.java @@ -1,5 +1,5 @@ package uk.gov.beis.els.categories.refrigeratingappliances.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface FridgeGroup extends Default {} diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FridgesFreezersForm.java b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FridgesFreezersForm.java index fc6ba8a3..18e92d58 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FridgesFreezersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/FridgesFreezersForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.refrigeratingappliances.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/WineStorageAppliancesForm.java b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/WineStorageAppliancesForm.java index eb52591d..46b441dc 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/WineStorageAppliancesForm.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratingappliances/model/WineStorageAppliancesForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.refrigeratingappliances.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/controller/RefrigeratorsDirectSalesController.java b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/controller/RefrigeratorsDirectSalesController.java index d809fe38..1845c0d5 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/controller/RefrigeratorsDirectSalesController.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/controller/RefrigeratorsDirectSalesController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/BeverageCoolersForm.java b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/BeverageCoolersForm.java index a93ffdcd..fcac9a8f 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/BeverageCoolersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/BeverageCoolersForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.refrigeratorsdirectsales.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm40Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/DisplayCabinetsForm.java b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/DisplayCabinetsForm.java index 5af719d2..779d7629 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/DisplayCabinetsForm.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/DisplayCabinetsForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.refrigeratorsdirectsales.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm40Char; diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/FreezerGroup.java b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/FreezerGroup.java index 8321daa3..9707272c 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/FreezerGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/FreezerGroup.java @@ -1,5 +1,5 @@ package uk.gov.beis.els.categories.refrigeratorsdirectsales.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface FreezerGroup extends Default {} diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/FridgeGroup.java b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/FridgeGroup.java index 417b5d3b..aed897f7 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/FridgeGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/FridgeGroup.java @@ -1,5 +1,5 @@ package uk.gov.beis.els.categories.refrigeratorsdirectsales.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface FridgeGroup extends Default {} diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/IceCreamFreezersForm.java b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/IceCreamFreezersForm.java index 91c1d120..ae40c1d1 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/IceCreamFreezersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/IceCreamFreezersForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.refrigeratorsdirectsales.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm40Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/VendingMachinesForm.java b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/VendingMachinesForm.java index cf9f2b2a..53a617ae 100644 --- a/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/VendingMachinesForm.java +++ b/src/main/java/uk/gov/beis/els/categories/refrigeratorsdirectsales/model/VendingMachinesForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.refrigeratorsdirectsales.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm40Char; diff --git a/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/controller/SolidFuelBoilersController.java b/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/controller/SolidFuelBoilersController.java index dd117c50..5c9d1078 100644 --- a/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/controller/SolidFuelBoilersController.java +++ b/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/controller/SolidFuelBoilersController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/model/SolidFuelBoilerPackagesForm.java b/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/model/SolidFuelBoilerPackagesForm.java index 7769faca..0658cb05 100644 --- a/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/model/SolidFuelBoilerPackagesForm.java +++ b/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/model/SolidFuelBoilerPackagesForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.solidfuelboilers.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/model/SolidFuelBoilersForm.java b/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/model/SolidFuelBoilersForm.java index 037a85c1..f3434822 100644 --- a/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/model/SolidFuelBoilersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/solidfuelboilers/model/SolidFuelBoilersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.solidfuelboilers.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/controller/SpaceHeatersController.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/controller/SpaceHeatersController.java index 7b2c0f62..de31545a 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/controller/SpaceHeatersController.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/controller/SpaceHeatersController.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerCombinationCalculatorForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerCombinationCalculatorForm.java index b686a1c5..8f24cd2a 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerCombinationCalculatorForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerCombinationCalculatorForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLoadProfileList; import uk.gov.beis.els.categories.waterheaters.service.WaterHeatersService; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerCombinationHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerCombinationHeatersForm.java index 36a11588..19fcf1e5 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerCombinationHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerCombinationHeatersForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerPackagesCalculatorForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerPackagesCalculatorForm.java index 01b2c6b1..383ca326 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerPackagesCalculatorForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerPackagesCalculatorForm.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotNull; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerSpaceHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerSpaceHeatersForm.java index 49ca9ba1..eb118de5 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerSpaceHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/BoilerSpaceHeatersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/CogenerationSpaceHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/CogenerationSpaceHeatersForm.java index 585557c9..3eb3ab41 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/CogenerationSpaceHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/CogenerationSpaceHeatersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/CombinationHeaterPackagesForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/CombinationHeaterPackagesForm.java index 17a42b18..10be0c98 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/CombinationHeaterPackagesForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/CombinationHeaterPackagesForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.LoadProfile; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpCombinationCalculatorForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpCombinationCalculatorForm.java index e0517851..eb2051cb 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpCombinationCalculatorForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpCombinationCalculatorForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLoadProfileList; import uk.gov.beis.els.categories.waterheaters.service.WaterHeatersService; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpCombinationHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpCombinationHeatersForm.java index c3c1b7a7..bbc68254 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpCombinationHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpCombinationHeatersForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpPackagesCalculatorForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpPackagesCalculatorForm.java index b580b7b2..2541d48b 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpPackagesCalculatorForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpPackagesCalculatorForm.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.model.meta.FieldPrompt; @Schema(name = "Packages of space heater, temperature control and solar device energy label calculator - Heat pump") diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpSpaceHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpSpaceHeatersForm.java index 89b0b96b..15cc728a 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpSpaceHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/HeatPumpSpaceHeatersForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.spaceheaters.service.SpaceHeatersService; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/LowTemperatureHeatPumpSpaceHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/LowTemperatureHeatPumpSpaceHeatersForm.java index e7f88296..079f0ecd 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/LowTemperatureHeatPumpSpaceHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/LowTemperatureHeatPumpSpaceHeatersForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SpaceHeaterPackagesCalculatorForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SpaceHeaterPackagesCalculatorForm.java index 87e11117..485e84c5 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SpaceHeaterPackagesCalculatorForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SpaceHeaterPackagesCalculatorForm.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.categories.spaceheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotNull; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SpaceHeaterPackagesForm.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SpaceHeaterPackagesForm.java index b1cce887..66d201e7 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SpaceHeaterPackagesForm.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SpaceHeaterPackagesForm.java @@ -10,9 +10,9 @@ import uk.gov.beis.els.model.meta.FieldPrompt; import uk.gov.beis.els.model.meta.StaticProductText; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; @Schema(name = "Packages of space heater, temperature control and solar device energy label") @StaticProductText("You must display the label at the point of sale so that it’s easy to see and clearly related to the product. It must be at least 210mm x 297mm when printed.") diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/StorageTankGroup.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/StorageTankGroup.java index fbf532a7..870c3760 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/StorageTankGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/StorageTankGroup.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.spaceheaters.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface StorageTankGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SupplementaryBoilerGroup.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SupplementaryBoilerGroup.java index c1922045..d53dc186 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SupplementaryBoilerGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SupplementaryBoilerGroup.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.spaceheaters.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface SupplementaryBoilerGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SupplementaryHeatPumpGroup.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SupplementaryHeatPumpGroup.java index 2563d798..61d4cbfe 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SupplementaryHeatPumpGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/SupplementaryHeatPumpGroup.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.spaceheaters.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface SupplementaryHeatPumpGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/TemperatureControlGroup.java b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/TemperatureControlGroup.java index e965cf9c..7867e15d 100644 --- a/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/TemperatureControlGroup.java +++ b/src/main/java/uk/gov/beis/els/categories/spaceheaters/model/TemperatureControlGroup.java @@ -1,6 +1,6 @@ package uk.gov.beis.els.categories.spaceheaters.model; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; public interface TemperatureControlGroup extends Default { } diff --git a/src/main/java/uk/gov/beis/els/categories/televisions/controller/TelevisionController.java b/src/main/java/uk/gov/beis/els/categories/televisions/controller/TelevisionController.java index 91cb4eb9..730e945d 100644 --- a/src/main/java/uk/gov/beis/els/categories/televisions/controller/TelevisionController.java +++ b/src/main/java/uk/gov/beis/els/categories/televisions/controller/TelevisionController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/televisions/model/TelevisionsForm.java b/src/main/java/uk/gov/beis/els/categories/televisions/model/TelevisionsForm.java index 8de4d3e2..4d4a472e 100644 --- a/src/main/java/uk/gov/beis/els/categories/televisions/model/TelevisionsForm.java +++ b/src/main/java/uk/gov/beis/els/categories/televisions/model/TelevisionsForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.televisions.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; diff --git a/src/main/java/uk/gov/beis/els/categories/tumbledryers/controller/TumbleDryersController.java b/src/main/java/uk/gov/beis/els/categories/tumbledryers/controller/TumbleDryersController.java index 89e8acb3..192aec0c 100644 --- a/src/main/java/uk/gov/beis/els/categories/tumbledryers/controller/TumbleDryersController.java +++ b/src/main/java/uk/gov/beis/els/categories/tumbledryers/controller/TumbleDryersController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/tumbledryers/model/CondenserTumbleDryersForm.java b/src/main/java/uk/gov/beis/els/categories/tumbledryers/model/CondenserTumbleDryersForm.java index 76b207b1..2975cadb 100644 --- a/src/main/java/uk/gov/beis/els/categories/tumbledryers/model/CondenserTumbleDryersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/tumbledryers/model/CondenserTumbleDryersForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.categories.tumbledryers.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.tumbledryers.service.TumbleDryersService; import uk.gov.beis.els.model.meta.FieldPrompt; diff --git a/src/main/java/uk/gov/beis/els/categories/tumbledryers/model/TumbleDryersForm.java b/src/main/java/uk/gov/beis/els/categories/tumbledryers/model/TumbleDryersForm.java index 82204269..05794d9b 100644 --- a/src/main/java/uk/gov/beis/els/categories/tumbledryers/model/TumbleDryersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/tumbledryers/model/TumbleDryersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.tumbledryers.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/ventilationunits/controller/VentilationUnitsController.java b/src/main/java/uk/gov/beis/els/categories/ventilationunits/controller/VentilationUnitsController.java index c454a754..c7776183 100644 --- a/src/main/java/uk/gov/beis/els/categories/ventilationunits/controller/VentilationUnitsController.java +++ b/src/main/java/uk/gov/beis/els/categories/ventilationunits/controller/VentilationUnitsController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/ventilationunits/model/VentilationUnitsForm.java b/src/main/java/uk/gov/beis/els/categories/ventilationunits/model/VentilationUnitsForm.java index 0b0ec5c6..25f8cf32 100644 --- a/src/main/java/uk/gov/beis/els/categories/ventilationunits/model/VentilationUnitsForm.java +++ b/src/main/java/uk/gov/beis/els/categories/ventilationunits/model/VentilationUnitsForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.ventilationunits.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/washingmachines/controller/WashingMachinesController.java b/src/main/java/uk/gov/beis/els/categories/washingmachines/controller/WashingMachinesController.java index 46616ed4..b5e5a051 100644 --- a/src/main/java/uk/gov/beis/els/categories/washingmachines/controller/WashingMachinesController.java +++ b/src/main/java/uk/gov/beis/els/categories/washingmachines/controller/WashingMachinesController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; diff --git a/src/main/java/uk/gov/beis/els/categories/washingmachines/model/WasherDryerForm.java b/src/main/java/uk/gov/beis/els/categories/washingmachines/model/WasherDryerForm.java index 7111c946..1ba6d8df 100644 --- a/src/main/java/uk/gov/beis/els/categories/washingmachines/model/WasherDryerForm.java +++ b/src/main/java/uk/gov/beis/els/categories/washingmachines/model/WasherDryerForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.washingmachines.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.constraints.Range; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.ApiValuesFromRatingClassRange; diff --git a/src/main/java/uk/gov/beis/els/categories/washingmachines/model/WashingMachinesForm.java b/src/main/java/uk/gov/beis/els/categories/washingmachines/model/WashingMachinesForm.java index e513d9fa..876bd538 100644 --- a/src/main/java/uk/gov/beis/els/categories/washingmachines/model/WashingMachinesForm.java +++ b/src/main/java/uk/gov/beis/els/categories/washingmachines/model/WashingMachinesForm.java @@ -1,11 +1,11 @@ package uk.gov.beis.els.categories.washingmachines.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.constraints.Range; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.api.common.ApiValuesFromRatingClassRange; diff --git a/src/main/java/uk/gov/beis/els/categories/waterheaters/controller/WaterHeatersController.java b/src/main/java/uk/gov/beis/els/categories/waterheaters/controller/WaterHeatersController.java index 5e44bb63..d67b9a75 100644 --- a/src/main/java/uk/gov/beis/els/categories/waterheaters/controller/WaterHeatersController.java +++ b/src/main/java/uk/gov/beis/els/categories/waterheaters/controller/WaterHeatersController.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/ClimateConditionForm.java b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/ClimateConditionForm.java index d589937f..d9284a2b 100644 --- a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/ClimateConditionForm.java +++ b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/ClimateConditionForm.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.categories.waterheaters.model; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; import uk.gov.beis.els.categories.waterheaters.model.validation.ConsumptionUnitBoth; import uk.gov.beis.els.categories.waterheaters.model.validation.ConsumptionUnitGj; diff --git a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/ConventionalWaterHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/ConventionalWaterHeatersForm.java index 1aa809a0..8915a9e7 100644 --- a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/ConventionalWaterHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/ConventionalWaterHeatersForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.waterheaters.model; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.categories.common.StandardTemplateForm30Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/HeatPumpWaterHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/HeatPumpWaterHeatersForm.java index aa73ca62..3bea253b 100644 --- a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/HeatPumpWaterHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/HeatPumpWaterHeatersForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.waterheaters.model; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; import uk.gov.beis.els.categories.waterheaters.model.validation.HeatPumpWaterHeatersFormSequenceProvider; diff --git a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/HotWaterStorageTanksForm.java b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/HotWaterStorageTanksForm.java index cf776bfe..8861a5e4 100644 --- a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/HotWaterStorageTanksForm.java +++ b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/HotWaterStorageTanksForm.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.categories.waterheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; diff --git a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/SolarWaterHeatersForm.java b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/SolarWaterHeatersForm.java index 457652bd..9403e2fc 100644 --- a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/SolarWaterHeatersForm.java +++ b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/SolarWaterHeatersForm.java @@ -1,8 +1,8 @@ package uk.gov.beis.els.categories.waterheaters.model; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.groups.Default; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.groups.Default; import org.hibernate.validator.group.GroupSequenceProvider; import uk.gov.beis.els.categories.internetlabelling.model.InternetLabellingGroup; import uk.gov.beis.els.categories.waterheaters.model.validation.SolarWaterHeatersFormSequenceProvider; diff --git a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/WaterSolarPackagesCalculatorForm.java b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/WaterSolarPackagesCalculatorForm.java index fd93bdd6..3470b477 100644 --- a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/WaterSolarPackagesCalculatorForm.java +++ b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/WaterSolarPackagesCalculatorForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.waterheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.Digits; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import uk.gov.beis.els.api.common.ApiValuesFromLoadProfileList; import uk.gov.beis.els.categories.common.StandardTemplateForm50Char; import uk.gov.beis.els.categories.waterheaters.service.WaterHeatersService; diff --git a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/WaterSolarPackagesForm.java b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/WaterSolarPackagesForm.java index eb7dd362..418bb5da 100644 --- a/src/main/java/uk/gov/beis/els/categories/waterheaters/model/WaterSolarPackagesForm.java +++ b/src/main/java/uk/gov/beis/els/categories/waterheaters/model/WaterSolarPackagesForm.java @@ -1,9 +1,9 @@ package uk.gov.beis.els.categories.waterheaters.model; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import uk.gov.beis.els.api.common.ApiValuesFromEnum; import uk.gov.beis.els.api.common.ApiValuesFromLegislationCategory; import uk.gov.beis.els.categories.common.LoadProfile; diff --git a/src/main/java/uk/gov/beis/els/controller/CategoryController.java b/src/main/java/uk/gov/beis/els/controller/CategoryController.java index 53832b98..ec9ae48d 100644 --- a/src/main/java/uk/gov/beis/els/controller/CategoryController.java +++ b/src/main/java/uk/gov/beis/els/controller/CategoryController.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; -import javax.validation.Valid; +import jakarta.validation.Valid; import org.apache.commons.lang3.StringUtils; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; diff --git a/src/main/java/uk/gov/beis/els/mvc/FormAnnotationHandlerInterceptor.java b/src/main/java/uk/gov/beis/els/mvc/FormAnnotationHandlerInterceptor.java index 5150ef9e..2cc8d124 100644 --- a/src/main/java/uk/gov/beis/els/mvc/FormAnnotationHandlerInterceptor.java +++ b/src/main/java/uk/gov/beis/els/mvc/FormAnnotationHandlerInterceptor.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Pattern; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Pattern; import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Range; diff --git a/src/main/java/uk/gov/beis/els/mvc/HttpHeaderFilter.java b/src/main/java/uk/gov/beis/els/mvc/HttpHeaderFilter.java index fbf3d21b..f51db779 100644 --- a/src/main/java/uk/gov/beis/els/mvc/HttpHeaderFilter.java +++ b/src/main/java/uk/gov/beis/els/mvc/HttpHeaderFilter.java @@ -1,10 +1,10 @@ package uk.gov.beis.els.mvc; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/src/main/java/uk/gov/beis/els/mvc/ResponseBufferSizeHandlerInterceptor.java b/src/main/java/uk/gov/beis/els/mvc/ResponseBufferSizeHandlerInterceptor.java index 3a5809d8..5b685837 100644 --- a/src/main/java/uk/gov/beis/els/mvc/ResponseBufferSizeHandlerInterceptor.java +++ b/src/main/java/uk/gov/beis/els/mvc/ResponseBufferSizeHandlerInterceptor.java @@ -1,7 +1,7 @@ package uk.gov.beis.els.mvc; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.stereotype.Service; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/src/main/java/uk/gov/beis/els/service/Bucket4JRequestService.java b/src/main/java/uk/gov/beis/els/service/Bucket4JRequestService.java index ae966202..af7fa917 100644 --- a/src/main/java/uk/gov/beis/els/service/Bucket4JRequestService.java +++ b/src/main/java/uk/gov/beis/els/service/Bucket4JRequestService.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 63e7768a..101669ff 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -39,7 +39,7 @@ bucket4j.filters[0].http-response-body={ "status" : 429, "error": "Too many requ bucket4j.filters[0].rate-limits[0].bandwidths[0].capacity=${api.v1.rate-limit.capacity} bucket4j.filters[0].rate-limits[0].bandwidths[0].time=${api.v1.rate-limit.time_value} bucket4j.filters[0].rate-limits[0].bandwidths[0].unit=${api.v1.rate-limit.time_unit} -bucket4j.filters[0].rate-limits[0].expression=@bucket4JRequestService.getRequestIpAddress() +bucket4j.filters[0].rate-limits[0].cache-key=@bucket4JRequestService.getRequestIpAddress() logging.pattern.console=${LOG_PATTERN:%d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger.%M - %msg%n} diff --git a/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromEnumValidatorTest.java b/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromEnumValidatorTest.java index a26a77f5..f16a899f 100644 --- a/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromEnumValidatorTest.java +++ b/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromEnumValidatorTest.java @@ -3,10 +3,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategoryValidatorTest.java b/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategoryValidatorTest.java index ca123646..2ca29acb 100644 --- a/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategoryValidatorTest.java +++ b/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromLegislationCategoryValidatorTest.java @@ -3,10 +3,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileListValidatorTest.java b/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileListValidatorTest.java index f93edda9..f6700e4b 100644 --- a/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileListValidatorTest.java +++ b/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromLoadProfileListValidatorTest.java @@ -3,10 +3,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRangeValidatorTest.java b/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRangeValidatorTest.java index 703fb60e..7fcd1edd 100644 --- a/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRangeValidatorTest.java +++ b/src/test/java/uk/gov/beis/els/api/common/ApiValuesFromRatingClassRangeValidatorTest.java @@ -3,10 +3,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/resources/application-bucket4j-integration-test.properties b/src/test/resources/application-bucket4j-integration-test.properties index a24e43fc..0acdb7c0 100644 --- a/src/test/resources/application-bucket4j-integration-test.properties +++ b/src/test/resources/application-bucket4j-integration-test.properties @@ -11,6 +11,4 @@ bucket4j.filters[0].http-response-body={ "status" : 429, "error": "Too many requ bucket4j.filters[0].rate-limits[0].bandwidths[0].capacity=3 bucket4j.filters[0].rate-limits[0].bandwidths[0].time=1 bucket4j.filters[0].rate-limits[0].bandwidths[0].unit=minutes -bucket4j.filters[0].rate-limits[0].bandwidths[0].fixed-refill-interval=1 -bucket4j.filters[0].rate-limits[0].bandwidths[0].fixed-refill-interval-unit=minutes -bucket4j.filters[0].rate-limits[0].expression=@bucket4JRequestService.getRequestIpAddress() \ No newline at end of file +bucket4j.filters[0].rate-limits[0].cache-key=@bucket4JRequestService.getRequestIpAddress() \ No newline at end of file