You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/03/15 09:32:46 UTC
[isis-app-simpleapp] branch jdo-SNAPSHOT updated: reconciling jdo
with jpa branch
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
The following commit(s) were added to refs/heads/jdo-SNAPSHOT by this push:
new 1647e89 reconciling jdo with jpa branch
1647e89 is described below
commit 1647e89ed66470f8440ff72a0a8d0980f7735408
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Mar 15 09:32:31 2021 +0000
reconciling jdo with jpa branch
---
.../simple/integtests/tests/SimpleObjects_IntegTest.java | 5 ++---
module-simple-tests/src/test/resources/application-test.yml | 2 --
.../java/domainapp/modules/simple/dom/so/SimpleObject.java | 12 +++++-------
.../java/domainapp/modules/simple/dom/so/SimpleObjects.java | 2 ++
webapp/pom.xml | 2 --
5 files changed, 9 insertions(+), 14 deletions(-)
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 348773b..1763534 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
@@ -3,18 +3,17 @@ package domainapp.modules.simple.integtests.tests;
import java.util.List;
import javax.inject.Inject;
-import javax.jdo.JDODataStoreException;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Test;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.isis.testing.integtestsupport.applib.ThrowableMatchers;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.apache.isis.testing.integtestsupport.applib.ThrowableMatchers;
+
import domainapp.modules.simple.dom.so.SimpleObject;
import domainapp.modules.simple.dom.so.SimpleObjects;
import domainapp.modules.simple.fixture.SimpleObject_persona;
diff --git a/module-simple-tests/src/test/resources/application-test.yml b/module-simple-tests/src/test/resources/application-test.yml
index 3da8c51..3a68cae 100644
--- a/module-simple-tests/src/test/resources/application-test.yml
+++ b/module-simple-tests/src/test/resources/application-test.yml
@@ -2,5 +2,3 @@ isis:
persistence:
schema:
auto-create-schemas: "simple"
-
-
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 4050df5..e30fba3 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
@@ -11,24 +11,22 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import static org.apache.isis.applib.annotation.SemanticsOf.IDEMPOTENT;
import static org.apache.isis.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.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.val;
+import domainapp.modules.simple.types.Name;
+import domainapp.modules.simple.types.Notes;
+
@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE, schema = "SIMPLE")
@javax.jdo.annotations.DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
@javax.jdo.annotations.Queries({
@@ -47,7 +45,7 @@ import lombok.val;
})
@javax.jdo.annotations.Version(strategy= VersionStrategy.DATE_TIME, column="version")
@javax.jdo.annotations.Unique(name="SimpleObject_name_UNQ", members = {"name"})
-@DomainObject()
+@DomainObject(objectType = "simple.SimpleObject")
@DomainObjectLayout()
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@ToString(onlyExplicitlyIncluded = true)
diff --git 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
index 04407a9..cb353b6 100644
--- 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
@@ -38,6 +38,7 @@ public class SimpleObjects {
return repositoryService.persist(SimpleObject.withName(name));
}
+
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT, promptStyle = PromptStyle.DIALOG_SIDEBAR)
public List<SimpleObject> findByName(
@@ -48,6 +49,7 @@ public class SimpleObjects {
.withParameter("name", name));
}
+
@Programmatic
public SimpleObject findByNameExact(final String name) {
return repositoryService.firstMatch(
diff --git a/webapp/pom.xml b/webapp/pom.xml
index ff662dd..0b27712 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -95,7 +95,6 @@
<artifactId>isis-extensions-flyway-impl</artifactId>
</dependency>
-
</dependencies>
<profiles>
@@ -174,7 +173,6 @@
</plugins>
</build>
</profile>
-
</profiles>
</project>