This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch jpa-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git
commit bc590330a5a1184e6938f2851275285b34d757c5 Author: danhaywood <[email protected]> AuthorDate: Tue Jan 31 07:07:39 2023 +0000 reorganizes imports --- .../simple/integtests/tests/SimpleObject_IntegTest.java | 3 ++- .../simple/integtests/tests/SimpleObjects_IntegTest.java | 12 ++++-------- .../main/java/domainapp/modules/simple/SimpleModule.java | 13 ++++++------- .../java/domainapp/modules/simple/dom/so/SimpleObject.java | 7 ++++--- .../modules/simple/fixture/SimpleObject_persona.java | 9 +++++++-- .../integtests/metamodel/SwaggerExport_IntegTest.java | 4 +++- .../domainapp/webapp/integtests/smoke/Smoke_IntegTest.java | 9 +++++---- .../webapp/application/seed/SeedSecurityService.java | 1 - .../src/main/java/domainapp/webapp/quartz/QuartzModule.java | 1 + .../main/java/domainapp/webapp/quartz/job/SampleJob.java | 1 + webapp/src/main/resources/menubars.layout.xml | 6 +++++- 11 files changed, 38 insertions(+), 28 deletions(-) diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java index d75aec9..4aad82e 100644 --- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java +++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java @@ -3,11 +3,12 @@ package domainapp.modules.simple.integtests.tests; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.springframework.transaction.annotation.Transactional; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.springframework.transaction.annotation.Transactional; + import org.apache.causeway.applib.services.wrapper.DisabledException; import org.apache.causeway.applib.services.wrapper.InvalidException; 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 a642f31..ad6e86f 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 @@ -1,27 +1,23 @@ package domainapp.modules.simple.integtests.tests; import java.util.List; -import java.util.Optional; import javax.inject.Inject; import javax.persistence.RollbackException; -import org.assertj.core.api.Assertions; import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.springframework.dao.DuplicateKeyException; -import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionSystemException; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import static org.assertj.core.api.Assertions.*; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.apache.causeway.applib.services.iactnlayer.InteractionService; -import org.apache.causeway.applib.services.xactn.TransactionService; import org.apache.causeway.commons.functional.Try; import org.apache.causeway.testing.unittestsupport.applib.matchers.ThrowableMatchers; diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java index 6178427..48129b1 100644 --- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java +++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java @@ -1,10 +1,6 @@ package domainapp.modules.simple; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import domainapp.modules.simple.dom.so.SimpleObject; import org.apache.causeway.extensions.fullcalendar.applib.CausewayModuleExtFullCalendarApplib; import org.apache.causeway.extensions.pdfjs.applib.CausewayModuleExtPdfjsApplibModel; @@ -13,8 +9,11 @@ import org.apache.causeway.testing.fakedata.applib.CausewayModuleTestingFakeData import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript; import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures; import org.apache.causeway.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAbstract; - -import domainapp.modules.simple.dom.so.SimpleObject; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @Configuration @Import({ 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 93cc745..7661580 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 @@ -53,9 +53,6 @@ import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable; import static org.apache.causeway.applib.annotation.SemanticsOf.IDEMPOTENT; import static org.apache.causeway.applib.annotation.SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE; -import domainapp.modules.simple.SimpleModule; -import domainapp.modules.simple.types.Name; -import domainapp.modules.simple.types.Notes; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -63,6 +60,10 @@ import lombok.Setter; import lombok.ToString; import lombok.val; +import domainapp.modules.simple.SimpleModule; +import domainapp.modules.simple.types.Name; +import domainapp.modules.simple.types.Notes; + @Entity @Table( 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 930a2ff..493e69e 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 @@ -5,6 +5,8 @@ import java.io.InputStream; import javax.inject.Inject; +import org.springframework.core.io.ClassPathResource; + import org.apache.causeway.applib.services.clock.ClockService; import org.apache.causeway.applib.services.registry.ServiceRegistry; import org.apache.causeway.applib.value.Blob; @@ -12,9 +14,12 @@ import org.apache.causeway.testing.fakedata.applib.services.FakeDataService; import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptWithResult; import org.apache.causeway.testing.fixtures.applib.personas.Persona; import org.apache.causeway.testing.fixtures.applib.setup.PersonaEnumPersistAll; -import org.springframework.core.io.ClassPathResource; -import lombok.*; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.SneakyThrows; +import lombok.val; import lombok.experimental.Accessors; import domainapp.modules.simple.dom.so.SimpleObject; 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 e5107e7..e7b9728 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 @@ -5,6 +5,7 @@ import java.io.IOException; import javax.inject.Inject; import org.junit.jupiter.api.Test; + import org.springframework.context.annotation.Import; import org.springframework.test.annotation.DirtiesContext; @@ -14,9 +15,10 @@ import org.apache.causeway.applib.services.swagger.Visibility; import org.apache.causeway.testing.integtestsupport.applib.swagger.SwaggerExporter; import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; -import domainapp.webapp.integtests.WebAppIntegTestAbstract; import lombok.val; +import domainapp.webapp.integtests.WebAppIntegTestAbstract; + @Import({ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class }) 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 baf4eda..78c6cf6 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 @@ -4,18 +4,19 @@ import java.util.List; import javax.inject.Inject; -import org.apache.causeway.applib.services.wrapper.InvalidException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + import org.springframework.transaction.annotation.Transactional; +import org.apache.causeway.applib.services.wrapper.InvalidException; import org.apache.causeway.applib.services.xactn.TransactionService; -import static org.assertj.core.api.Assertions.assertThat; - -import domainapp.webapp.integtests.WebAppIntegTestAbstract; import domainapp.modules.simple.dom.so.SimpleObject; import domainapp.modules.simple.dom.so.SimpleObjects; +import domainapp.webapp.integtests.WebAppIntegTestAbstract; @Transactional class Smoke_IntegTest extends WebAppIntegTestAbstract { 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 24c0aa0..8a55993 100644 --- a/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java +++ b/webapp/src/main/java/domainapp/webapp/application/seed/SeedSecurityService.java @@ -9,7 +9,6 @@ import org.springframework.stereotype.Service; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.events.metamodel.MetamodelEvent; import org.apache.causeway.applib.services.xactn.TransactionService; -import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.core.config.environment.CausewaySystemEnvironment; import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts; diff --git a/webapp/src/main/java/domainapp/webapp/quartz/QuartzModule.java b/webapp/src/main/java/domainapp/webapp/quartz/QuartzModule.java index 3220d64..6b09d1e 100644 --- a/webapp/src/main/java/domainapp/webapp/quartz/QuartzModule.java +++ b/webapp/src/main/java/domainapp/webapp/quartz/QuartzModule.java @@ -2,6 +2,7 @@ package domainapp.webapp.quartz; import org.quartz.JobDetail; import org.quartz.SimpleTrigger; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; 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 47ea4e8..ac87ca8 100644 --- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java +++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java @@ -10,6 +10,7 @@ import javax.inject.Inject; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; + import org.springframework.stereotype.Component; import org.apache.causeway.applib.services.iactnlayer.InteractionContext; diff --git a/webapp/src/main/resources/menubars.layout.xml b/webapp/src/main/resources/menubars.layout.xml index 8baf3e7..a369046 100644 --- a/webapp/src/main/resources/menubars.layout.xml +++ b/webapp/src/main/resources/menubars.layout.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<mb3:menuBars xsi:schemaLocation="http://causeway.apache.org/applib/layout/menubars/bootstrap3 http://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/links http://causeway.apache.org/applib/layout/links/links.xsd"; xmlns:cpt="http://causeway.apache.org/applib/layout/component"; xmlns:lnk="http://causeway.apache.org/a [...] +<mb3:menuBars + xsi:schemaLocation="http://causeway.apache.org/applib/layout/menubars/bootstrap3 http://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd"; + xmlns:cpt="http://causeway.apache.org/applib/layout/component"; + xmlns:mb3="http://causeway.apache.org/applib/layout/menubars/bootstrap3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <mb3:primary> <mb3:menu> <mb3:named>Simple Objects</mb3:named>
