This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to tag tags/v3/01-01-starter-app in repository https://gitbox.apache.org/repos/asf/causeway-app-petclinic.git
commit 4bb0853afa28c380b2b0ee7e27caa91c87a48e9b Author: Dan Haywood <[email protected]> AuthorDate: Thu May 30 07:11:33 2024 +0100 updates javax to jakarta --- .editorconfig | 2 +- .../integtests/tests/SimpleObjects_IntegTest.java | 4 +-- .../modules/simple/dom/so/SimpleObject.java | 36 +++++++++++----------- .../modules/simple/dom/so/SimpleObjects.java | 8 ++--- .../simple/fixture/SimpleObject_persona.java | 2 +- .../metamodel/SwaggerExport_IntegTest.java | 2 +- .../metamodel/ValidateDomainModel_IntegTest.java | 2 +- .../webapp/integtests/smoke/Smoke_IntegTest.java | 2 +- .../fixture/scenarios/DomainAppDemo.java | 2 +- .../application/seed/CustomRolesAndUsers.java | 2 +- .../application/seed/SeedSecurityService.java | 4 +-- .../services/health/HealthCheckServiceImpl.java | 4 +-- .../services/homepage/HomePageViewModel.java | 4 +-- .../webapp/custom/restapi/CustomController.java | 2 +- .../domainapp/webapp/quartz/job/SampleJob.java | 2 +- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.editorconfig b/.editorconfig index 5c99ed8..ca308ed 100644 --- a/.editorconfig +++ b/.editorconfig @@ -112,7 +112,7 @@ ij_java_for_statement_wrap = off ij_java_generate_final_locals = false ij_java_generate_final_parameters = false ij_java_if_brace_force = never -ij_java_imports_layout = java.**,|,$java.**,|,javax.**,|,$javax.**,|,com.**,|,$com.**,|,graphql.**,|,$graphql.**,|,org.**,|,$org.**,|,org.springframework.**,|,$org.springframework.**,|,org.apache.causeway.**,|,$org.apache.causeway.**,|,org.apache.isis.**,|,$org.apache.isis.**,|,lombok.**,lombok.experimental.**,lombok.extern.log4j.**,lombok.extern.**,|,demoapp.**,|,*,|,$* +ij_java_imports_layout = java.**,|,$java.**,|,jakarta.**,|,$jakarta.**,|,com.**,|,$com.**,|,graphql.**,|,$graphql.**,|,org.**,|,$org.**,|,org.springframework.**,|,$org.springframework.**,|,org.apache.causeway.**,|,$org.apache.causeway.**,|,org.apache.isis.**,|,$org.apache.isis.**,|,lombok.**,lombok.experimental.**,lombok.extern.log4j.**,lombok.extern.**,|,demoapp.**,|,*,|,$* ij_java_indent_case_from_switch = true ij_java_insert_inner_class_imports = false ij_java_insert_override_annotation = true diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java index 0309406..3119a6a 100644 --- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java +++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java @@ -2,8 +2,8 @@ package domainapp.modules.simple.integtests.tests; import java.util.List; -import javax.inject.Inject; -import javax.persistence.RollbackException; +import jakarta.inject.Inject; +import jakarta.persistence.RollbackException; import org.h2.jdbc.JdbcSQLIntegrityConstraintViolationException; import org.hamcrest.MatcherAssert; diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java index c28dd9d..d0a5fa5 100644 --- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java +++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java @@ -4,24 +4,24 @@ import java.time.LocalTime; import java.time.ZoneOffset; import java.util.Comparator; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.springframework.lang.Nullable; diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java index f3e844e..471315e 100644 --- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java +++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java @@ -2,10 +2,10 @@ package domainapp.modules.simple.dom.so; import java.util.List; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.TypedQuery; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.persistence.TypedQuery; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java index 493e69e..27fac28 100644 --- a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java +++ b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java @@ -3,7 +3,7 @@ package domainapp.modules.simple.fixture; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.core.io.ClassPathResource; diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java index e7b9728..7c9e648 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java +++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/SwaggerExport_IntegTest.java @@ -2,7 +2,7 @@ package domainapp.webapp.integtests.metamodel; import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java index 32cd5e5..b8dfc17 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java +++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/metamodel/ValidateDomainModel_IntegTest.java @@ -1,6 +1,6 @@ package domainapp.webapp.integtests.metamodel; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java index f7954f3..0f24093 100644 --- a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java +++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java @@ -2,7 +2,7 @@ package domainapp.webapp.integtests.smoke; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java index 28b603f..ddc71d3 100644 --- a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java +++ b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java @@ -1,6 +1,6 @@ package domainapp.webapp.application.fixture.scenarios; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript; import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixturesService; diff --git a/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java b/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java index da6cd6a..be4333e 100644 --- a/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java +++ b/webapp/src/main/java/domainapp/webapp/application/seed/CustomRolesAndUsers.java @@ -2,7 +2,7 @@ package domainapp.webapp.application.seed; import java.util.function.Supplier; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId; import org.apache.causeway.commons.collections.Can; diff --git a/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java b/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java index 8a55993..18d5412 100644 --- a/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java +++ b/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java @@ -1,7 +1,7 @@ package domainapp.webapp.application.seed; -import javax.annotation.Priority; -import javax.inject.Inject; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java index 9d503f7..4e08641 100644 --- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java +++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java @@ -1,7 +1,7 @@ package domainapp.webapp.application.services.health; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.stereotype.Service; diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java index 80e78c5..012f243 100644 --- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java +++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java @@ -2,8 +2,8 @@ package domainapp.webapp.application.services.homepage; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.apache.causeway.applib.annotation.Collection; import org.apache.causeway.applib.annotation.CollectionLayout; diff --git a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java index 1e8cd6d..7934f39 100644 --- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java +++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.Callable; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java index 7d28f4b..f338c85 100644 --- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java +++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.Callable; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.quartz.Job; import org.quartz.JobExecutionContext;
