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-helloworld.git
commit 4ca871faa37a52ac04db86ba15443efbd9adfa97 Author: danhaywood <[email protected]> AuthorDate: Tue Jan 31 06:57:21 2023 +0000 optimizes imports --- .../modules/hello/dom/hwo/HelloWorldObject.java | 28 +++++++++++++++++----- .../modules/hello/dom/hwo/HelloWorldObjects.java | 13 +++++++--- .../java/domainapp/modules/hello/types/Notes.java | 8 ++++++- src/main/java/domainapp/webapp/AppManifest.java | 10 ++++---- src/main/java/domainapp/webapp/HelloWorldApp.java | 4 ++-- 5 files changed, 46 insertions(+), 17 deletions(-) diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java index 4b100db..dbd7386 100644 --- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java +++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java @@ -1,20 +1,36 @@ package domainapp.modules.hello.dom.hwo; -import domainapp.modules.hello.types.Name; -import domainapp.modules.hello.types.Notes; - import java.util.Comparator; import javax.inject.Inject; import javax.inject.Named; -import javax.jdo.annotations.*; - -import org.apache.causeway.applib.annotation.*; +import javax.jdo.annotations.DatastoreIdentity; +import javax.jdo.annotations.IdGeneratorStrategy; +import javax.jdo.annotations.IdentityType; +import javax.jdo.annotations.NotPersistent; +import javax.jdo.annotations.PersistenceCapable; +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 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.PropertyLayout; +import org.apache.causeway.applib.annotation.Publishing; +import org.apache.causeway.applib.annotation.SemanticsOf; +import org.apache.causeway.applib.annotation.Title; import org.apache.causeway.applib.layout.LayoutConstants; import org.apache.causeway.applib.services.message.MessageService; import org.apache.causeway.applib.services.repository.RepositoryService; import org.apache.causeway.applib.services.title.TitleService; +import domainapp.modules.hello.types.Name; +import domainapp.modules.hello.types.Notes; + @PersistenceCapable( schema = "hello", identityType = IdentityType.DATASTORE diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects.java b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects.java index 4a330dd..3342539 100644 --- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects.java +++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObjects.java @@ -1,17 +1,24 @@ package domainapp.modules.hello.dom.hwo; -import domainapp.modules.hello.types.Name; - import java.util.List; import javax.annotation.Priority; import javax.inject.Inject; import javax.inject.Named; -import org.apache.causeway.applib.annotation.*; +import org.apache.causeway.applib.annotation.Action; +import org.apache.causeway.applib.annotation.ActionLayout; +import org.apache.causeway.applib.annotation.DomainService; +import org.apache.causeway.applib.annotation.NatureOfService; +import org.apache.causeway.applib.annotation.PriorityPrecedence; +import org.apache.causeway.applib.annotation.PromptStyle; +import org.apache.causeway.applib.annotation.RestrictTo; +import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.query.Query; import org.apache.causeway.applib.services.repository.RepositoryService; +import domainapp.modules.hello.types.Name; + @Named("hello.HelloWorldObjects") @DomainService(nature = NatureOfService.VIEW) @Priority(PriorityPrecedence.EARLY) diff --git a/src/main/java/domainapp/modules/hello/types/Notes.java b/src/main/java/domainapp/modules/hello/types/Notes.java index 0b69233..8998c94 100644 --- a/src/main/java/domainapp/modules/hello/types/Notes.java +++ b/src/main/java/domainapp/modules/hello/types/Notes.java @@ -5,7 +5,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.causeway.applib.annotation.*; +import org.apache.causeway.applib.annotation.Editing; +import org.apache.causeway.applib.annotation.Optionality; +import org.apache.causeway.applib.annotation.Parameter; +import org.apache.causeway.applib.annotation.ParameterLayout; +import org.apache.causeway.applib.annotation.Property; +import org.apache.causeway.applib.annotation.PropertyLayout; +import org.apache.causeway.applib.annotation.Where; @javax.jdo.annotations.Column(length = Notes.MAX_LEN, allowsNull = "true") @Property(editing = Editing.ENABLED, maxLength = Notes.MAX_LEN, optionality = Optionality.OPTIONAL) diff --git a/src/main/java/domainapp/webapp/AppManifest.java b/src/main/java/domainapp/webapp/AppManifest.java index c49ae2f..9a8c475 100644 --- a/src/main/java/domainapp/webapp/AppManifest.java +++ b/src/main/java/domainapp/webapp/AppManifest.java @@ -1,5 +1,10 @@ package domainapp.webapp; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.PropertySource; +import org.springframework.context.annotation.PropertySources; + import org.apache.causeway.applib.CausewayModuleApplibChangeAndExecutionLoggers; import org.apache.causeway.applib.CausewayModuleApplibMixins; import org.apache.causeway.core.config.presets.CausewayPresets; @@ -11,11 +16,6 @@ import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleVie import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins; import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.annotation.PropertySources; - import domainapp.modules.hello.HelloWorldModule; @Configuration diff --git a/src/main/java/domainapp/webapp/HelloWorldApp.java b/src/main/java/domainapp/webapp/HelloWorldApp.java index e9e35aa..9ad441f 100644 --- a/src/main/java/domainapp/webapp/HelloWorldApp.java +++ b/src/main/java/domainapp/webapp/HelloWorldApp.java @@ -1,12 +1,12 @@ package domainapp.webapp; -import org.apache.causeway.core.config.presets.CausewayPresets; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.Import; +import org.apache.causeway.core.config.presets.CausewayPresets; + @SpringBootApplication @Import({ AppManifest.class,
