You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/01/31 07:18:31 UTC
[causeway-app-simpleapp] 02/04: reorganises imports
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git
commit 41964bcfa601af0349a7ef6755564045dcbbec3a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 31 07:07:51 2023 +0000
reorganises imports
---
.../integtests/tests/SimpleObject_IntegTest.java | 3 +-
.../integtests/tests/SimpleObjects_IntegTest.java | 15 ++-----
.../domainapp/modules/simple/SimpleModule.java | 2 +-
.../modules/simple/dom/so/SimpleObject.java | 51 +++++-----------------
.../simple/fixture/SimpleObject_persona.java | 9 +++-
.../metamodel/SwaggerExport_IntegTest.java | 4 +-
.../webapp/integtests/smoke/Smoke_IntegTest.java | 9 ++--
.../application/seed/SeedSecurityService.java | 1 -
.../java/domainapp/webapp/quartz/QuartzModule.java | 1 +
.../domainapp/webapp/quartz/job/SampleJob.java | 1 +
webapp/src/main/resources/menubars.layout.xml | 6 ++-
11 files changed, 41 insertions(+), 61 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 24ef373..4b53dd6 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,28 +1,21 @@
package domainapp.modules.simple.integtests.tests;
import java.util.List;
-import java.util.Optional;
import javax.inject.Inject;
-import javax.jdo.JDOFatalDataStoreException;
-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 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.springframework.dao.DuplicateKeyException;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
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.persistence.jdo.spring.exceptions.JdoResourceFailureException;
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 2dbd502..2355484 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -19,7 +19,7 @@ import domainapp.modules.simple.dom.so.SimpleObject;
CausewayModuleExtPdfjsApplibModel.class,
CausewayModuleExtFullCalendarApplib.class,
CausewayModuleTestingFakeDataApplib.class,
- CausewayModulePersistenceJdoApplib.class
+ CausewayModulePersistenceJdoApplib.class,
})
@ComponentScan
public class SimpleModule implements ModuleWithFixtures {
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 fceb150..fca5e25 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
@@ -1,39 +1,20 @@
package domainapp.modules.simple.dom.so;
+import domainapp.modules.simple.SimpleModule;
+import domainapp.modules.simple.types.Name;
+import domainapp.modules.simple.types.Notes;
+import lombok.*;
+
import java.time.LocalTime;
import java.time.ZoneOffset;
import java.util.Comparator;
import javax.inject.Inject;
import javax.inject.Named;
-import javax.jdo.annotations.Column;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.PersistenceCapable;
-import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.Queries;
-import javax.jdo.annotations.Query;
-import javax.jdo.annotations.Unique;
-import javax.jdo.annotations.Version;
-import javax.jdo.annotations.VersionStrategy;
+import javax.jdo.annotations.*;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.springframework.lang.Nullable;
-
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.ActionLayout;
-import org.apache.causeway.applib.annotation.DomainObject;
-import org.apache.causeway.applib.annotation.DomainObjectLayout;
-import org.apache.causeway.applib.annotation.Editing;
-import org.apache.causeway.applib.annotation.MemberSupport;
-import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.PromptStyle;
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.PropertyLayout;
-import org.apache.causeway.applib.annotation.Publishing;
-import org.apache.causeway.applib.annotation.TableDecorator;
-import org.apache.causeway.applib.annotation.Title;
+import org.apache.causeway.applib.annotation.*;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.layout.LayoutConstants;
import org.apache.causeway.applib.services.message.MessageService;
@@ -43,20 +24,11 @@ import org.apache.causeway.applib.value.Blob;
import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
import org.apache.causeway.extensions.pdfjs.applib.annotations.PdfJsViewer;
+import org.springframework.lang.Nullable;
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;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.val;
-
@PersistenceCapable(
schema = SimpleModule.SCHEMA,
@@ -97,9 +69,10 @@ public class SimpleObject implements Comparable<SimpleObject>, CalendarEventable
return simpleObject;
}
- @Inject RepositoryService repositoryService;
- @Inject TitleService titleService;
- @Inject MessageService messageService;
+ @Inject @NotPersistent
+ RepositoryService repositoryService;
+ @Inject @NotPersistent TitleService titleService;
+ @Inject @NotPersistent MessageService messageService;
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 b06d1de..3284220 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>