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 cc3257087f8fa0a5175ce2d55e543c44c740640a Merge: f7bb0b0 72b7708 Author: danhaywood <[email protected]> AuthorDate: Sun Apr 16 14:16:26 2023 +0100 Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT .editorconfig | 2 +- .../main/java/domainapp/modules/simple/dom/so/SimpleObject.java | 7 ++++--- .../main/java/domainapp/modules/simple/dom/so/SimpleObjects.java | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --cc module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java index 73ba749,e633933..fff68b4 --- 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 @@@ -59,29 -61,27 +56,33 @@@ 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( - schema= SimpleModule.SCHEMA, - uniqueConstraints = { - @UniqueConstraint(name = "SimpleObject__name__UNQ", columnNames = {"name"}) - } +@PersistenceCapable( + schema = SimpleModule.SCHEMA, + identityType=IdentityType.DATASTORE) +@Unique( + name = "SimpleObject__name__UNQ", members = { "name" } ) -@NamedQueries({ - @NamedQuery( +@Queries({ + @Query( name = SimpleObject.NAMED_QUERY__FIND_BY_NAME_LIKE, - query = "SELECT so " + - "FROM SimpleObject so " + - "WHERE so.name LIKE :name" + value = "SELECT " + + "FROM domainapp.modules.simple.dom.so.SimpleObject " + + "WHERE name.indexOf(:name) >= 0" + ), + @Query( + name = SimpleObject.NAMED_QUERY__FIND_BY_NAME_EXACT, + value = "SELECT " + + "FROM domainapp.modules.simple.dom.so.SimpleObject " + + "WHERE name == :name" ) }) -@EntityListeners(CausewayEntityListener.class) +@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id") +@Version(strategy= VersionStrategy.DATE_TIME, column="version") @Named(SimpleModule.NAMESPACE + ".SimpleObject") @DomainObject(entityChangePublishing = Publishing.ENABLED) @DomainObjectLayout( diff --cc module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java index 4036763,7a0187c..2e31e69 --- 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 @@@ -16,11 -16,12 +16,12 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.query.Query; import org.apache.causeway.applib.services.repository.RepositoryService; -import org.apache.causeway.persistence.jpa.applib.services.JpaSupportService; +import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService; + import lombok.RequiredArgsConstructor; + import domainapp.modules.simple.SimpleModule; import domainapp.modules.simple.types.Name; - import lombok.RequiredArgsConstructor; @Named(SimpleModule.NAMESPACE + ".SimpleObjects") @DomainService(nature = NatureOfService.VIEW)
