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/isis-app-simpleapp.git
commit 57b74b1fe02e075ec80aedd4e15a5f80825c7558
Merge: 5397357 283b26b
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Thu Sep 1 13:36:14 2022 +0100
Merge branch 'jpa-SNAPSHOT' into jdo-SNAPSHOT
.../java/domainapp/modules/simple/dom/so/SimpleObject.java | 3 ++-
.../application/services/homepage/HomePageViewModel.java | 3 +++
webapp/src/main/resources/application.yml | 10 +++++++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --cc
module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index 3905815,60a6559..4f7e790
---
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
@@@ -66,31 -73,25 +67,31 @@@ import domainapp.modules.simple.types.N
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(IsisEntityListener.class)
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
+@Version(strategy= VersionStrategy.DATE_TIME, column="version")
@Named(SimpleModule.NAMESPACE + ".SimpleObject")
@DomainObject(entityChangePublishing = Publishing.ENABLED)
- @DomainObjectLayout()
+ @DomainObjectLayout(tableDecoration = TableDecoration.DATATABLES_NET)
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@ToString(onlyExplicitlyIncluded = true)
