You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/06/03 21:30:18 UTC
[isis] branch master updated: ISIS-2513: Demo: port embedded
showcase to JPA
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1334031 ISIS-2513: Demo: port embedded showcase to JPA
1334031 is described below
commit 1334031e822851ca4877dd2265542e9d5ee2ec84
Author: andi-huber <ah...@apache.org>
AuthorDate: Thu Jun 3 23:30:03 2021 +0200
ISIS-2513: Demo: port embedded showcase to JPA
---
.../src/main/java/demoapp/dom/DemoModuleJpa.java | 2 +
...antJdo_updateNumber.java => ComplexNumber.java} | 37 ++++++++--------
.../objects/other/embedded/EmbeddedTypeMenu.java | 11 -----
.../objects/other/embedded/EmbeddedTypeVm.java | 8 ++--
.../other/embedded/{ => jdo}/ComplexNumberJdo.java | 6 ++-
.../{ => jdo}/ComplexNumberJdoValueSemantics.java | 2 +-
.../{ => jdo}/NumberConstantJdo-description.adoc | 0
.../embedded/{ => jdo}/NumberConstantJdo.java | 16 ++++---
.../{ => jdo}/NumberConstantJdo.layout.xml | 0
.../other/embedded/{ => jdo}/NumberConstantJdo.svg | 0
.../{ => jdo}/NumberConstantJdoRepository.java | 42 +++++++-----------
.../{ => jdo}/NumberConstantJdo_updateNumber.java | 5 ++-
.../ComplexNumberJpa.java} | 21 +++++----
.../ComplexNumberJpaValueSemantics.java} | 34 +++++++--------
.../NumberConstantJpa-description.adoc} | 7 ++-
.../NumberConstantJpa.java} | 51 ++++++++++++++--------
.../NumberConstantJpa.layout.xml} | 0
.../NumberConstantJpa.svg} | 0
.../embedded/jpa/NumberConstantJpaRepository.java | 45 +++++++++++++++++++
.../NumberConstantJpa_updateNumber.java} | 13 +++---
.../NumberConstantEntity.java} | 34 +++++----------
.../persistence/NumberConstantSeeding.java | 20 +++++++++
.../embedded/samples/ComplexNumberSamples.java | 22 ++++++++++
.../customvaluetypes/ComplexNumberJdo_Test.java | 3 +-
24 files changed, 233 insertions(+), 146 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
index 421714a..cbccf06 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
@@ -33,6 +33,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.jpa.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa;
import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.jpa.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa;
import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.jpa.JaxbRefJpa;
+import demoapp.dom.domain.objects.other.embedded.jpa.NumberConstantJpa;
import demoapp.dom.domain.properties.Property.commandPublishing.jpa.PropertyCommandPublishingJpa;
import demoapp.dom.domain.properties.Property.executionPublishing.jpa.PropertyExecutionPublishingJpa;
import demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildJpa;
@@ -142,6 +143,7 @@ import demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpa;
PropertyProjectingChildJpa.class,
JaxbRefJpa.class,
+ NumberConstantJpa.class,
})
public class DemoModuleJpa {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumber.java
similarity index 55%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumber.java
index fdfbbca..a9f95cc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumber.java
@@ -18,29 +18,28 @@
*/
package demoapp.dom.domain.objects.other.embedded;
-import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.PromptStyle;
+import lombok.Value;
-import lombok.RequiredArgsConstructor;
+public interface ComplexNumber {
-// tag::class[]
-@Action()
-@ActionLayout(
- promptStyle = PromptStyle.DIALOG_SIDEBAR
- , associateWith = "number")
-@RequiredArgsConstructor
-public class NumberConstantJdo_updateNumber {
+ double getRe();
+ double getIm();
- private final NumberConstantJdo numberConstantJdo;
-
- public NumberConstantJdo act(ComplexNumberJdo complexNumberJdo) {
- numberConstantJdo.setNumber(complexNumberJdo);
- return numberConstantJdo;
+ // used for seeding
+ public static SimpleNamedComplexNumber named(
+ final String name,
+ final double re,
+ final double im) {
+ return new SimpleNamedComplexNumber(name, re, im);
}
- public ComplexNumberJdo default0Act() {
- return numberConstantJdo.getNumber();
+ // helper type used for seeding
+ @Value
+ static class SimpleNamedComplexNumber
+ implements ComplexNumber {
+ final String name;
+ final double re;
+ final double im;
}
+
}
-// end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeMenu.java
index c0936b6..a285926 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeMenu.java
@@ -18,8 +18,6 @@
*/
package demoapp.dom.domain.objects.other.embedded;
-import org.springframework.context.annotation.Profile;
-
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainService;
@@ -28,24 +26,15 @@ import org.apache.isis.applib.services.factory.FactoryService;
import lombok.RequiredArgsConstructor;
-@Profile("demo-jdo")
@DomainService(nature=NatureOfService.VIEW, logicalTypeName = "demo.EmbeddedTypeMenu")
@RequiredArgsConstructor
public class EmbeddedTypeMenu {
private final FactoryService factoryService;
- private final NumberConstantJdoRepository repo;
@Action
@ActionLayout(cssClassFa="fa-stop-circle", describedAs = "Experimental support for embedded types")
public EmbeddedTypeVm embeddedTypes(){
-
- if(repo.listAll().size() == 0) {
- repo.add("Pi", ComplexNumberJdo.of(Math.PI, 0.));
- repo.add("Euler's Constant", ComplexNumberJdo.of(Math.E, 0.));
- repo.add("Imaginary Unit", ComplexNumberJdo.of(0, 1));
- }
-
return factoryService.viewModel(new EmbeddedTypeVm());
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java
index 387515d..a821e823 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java
@@ -27,6 +27,8 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom._infra.values.ValueHolderRepository;
+import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity;
// tag::class[]
@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName = "demo.EmbeddedTypeVm")
@@ -34,7 +36,7 @@ public class EmbeddedTypeVm implements HasAsciiDocDescription {
// ...
// end::class[]
- @Inject private NumberConstantJdoRepository numberConstantRepo;
+ @Inject private ValueHolderRepository<ComplexNumber, ? extends NumberConstantEntity> numberConstantRepo;
public String title() {
return "Embedded Types";
@@ -42,8 +44,8 @@ public class EmbeddedTypeVm implements HasAsciiDocDescription {
// tag::class[]
@Collection
- public List<NumberConstantJdo> getAllConstants(){
- return numberConstantRepo.listAll();
+ public List<? extends NumberConstantEntity> getAllConstants(){
+ return numberConstantRepo.all();
}
}
// end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
similarity index 93%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdo.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
index 89b54ac..6cd2163 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.jdo;
import java.util.Optional;
import java.util.regex.Matcher;
@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
import org.apache.isis.applib.annotation.Value;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
import lombok.AccessLevel;
import lombok.val;
@@ -34,7 +35,8 @@ import lombok.val;
@lombok.Getter // <.>
@lombok.Setter(AccessLevel.PRIVATE) // <.>
@lombok.AllArgsConstructor(staticName = "of")
-public class ComplexNumberJdo {
+public class ComplexNumberJdo
+ implements ComplexNumber{
@javax.jdo.annotations.Column(allowsNull = "false")
private double re;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdoValueSemantics.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdoValueSemantics.java
similarity index 98%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdoValueSemantics.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdoValueSemantics.java
index 93506db..a7ca37f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdoValueSemantics.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdoValueSemantics.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.jdo;
import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo-description.adoc
similarity index 100%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo-description.adoc
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
similarity index 83%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
index d91d9d5..a547b8e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.jdo;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
@@ -31,17 +31,18 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
+import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@DomainObject
-public class NumberConstantJdo implements HasAsciiDocDescription {
+@DomainObject(logicalTypeName = "demo.NumberConstantEntity")
+public class NumberConstantJdo
+ extends NumberConstantEntity {
// ...
@@ -50,6 +51,11 @@ public class NumberConstantJdo implements HasAsciiDocDescription {
return getName();
}
+ @Override
+ public ComplexNumber value() {
+ return getNumber();
+ }
+
//tag::class[]
@javax.jdo.annotations.Column(allowsNull = "false")
@Property
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.layout.xml
similarity index 100%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.layout.xml
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.svg b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.svg
similarity index 100%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.svg
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.svg
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdoRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
similarity index 50%
rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdoRepository.java
rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
index bee3175..c6a1fe2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdoRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
@@ -16,42 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
+package demoapp.dom.domain.objects.other.embedded.jdo;
import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Repository;
-
-import org.apache.isis.applib.services.factory.FactoryService;
-import org.apache.isis.applib.services.repository.RepositoryService;
+import org.springframework.stereotype.Service;
+import demoapp.dom._infra.values.ValueHolderRepository;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
import lombok.val;
@Profile("demo-jdo")
-@Repository
-@Named("demo.numberConstantRepository")
-public class NumberConstantJdoRepository {
-
- @Inject private RepositoryService repository;
- @Inject private FactoryService factory;
-
- public List<NumberConstantJdo> listAll(){
- return repository.allInstances(NumberConstantJdo.class);
- }
+@Service
+public class NumberConstantJdoRepository
+extends ValueHolderRepository<ComplexNumber, NumberConstantJdo> {
- public void add(String name, ComplexNumberJdo number) {
- val numConst = factory.detachedEntity(new NumberConstantJdo());
- numConst.setName(name);
- numConst.setNumber(number);
- add(numConst);
+ protected NumberConstantJdoRepository() {
+ super(NumberConstantJdo.class);
}
- public void add(NumberConstantJdo entry) {
- repository.persist(entry);
+ @Override
+ protected NumberConstantJdo newDetachedEntity(ComplexNumber value) {
+ val numConst = repositoryService.detachedEntity(new NumberConstantJdo());
+ numConst.setName(((ComplexNumber.SimpleNamedComplexNumber)value).getName());
+ numConst.setNumber(ComplexNumberJdo.of(value.getRe(), value.getIm()));
+ return numConst;
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo_updateNumber.java
similarity index 92%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo_updateNumber.java
index fdfbbca..1cf1a5e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo_updateNumber.java
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.jdo;
+
+import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -24,6 +26,7 @@ import org.apache.isis.applib.annotation.PromptStyle;
import lombok.RequiredArgsConstructor;
+@Profile("demo-jdo")
// tag::class[]
@Action()
@ActionLayout(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
index 89b54ac..c983268 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.jpa;
import java.util.Optional;
import java.util.regex.Matcher;
@@ -24,22 +24,25 @@ import java.util.regex.Pattern;
import org.apache.isis.applib.annotation.Value;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
import lombok.AccessLevel;
import lombok.val;
// tag::class[]
-@javax.jdo.annotations.PersistenceCapable // <.>
-@javax.jdo.annotations.EmbeddedOnly // <.>
-@Value(semanticsProviderClass = ComplexNumberJdoValueSemantics.class) // <.>
+//@Entity // <.>
+@javax.persistence.Embeddable // <.>
+@Value(semanticsProviderClass = ComplexNumberJpaValueSemantics.class) // <.>
@lombok.Getter // <.>
@lombok.Setter(AccessLevel.PRIVATE) // <.>
@lombok.AllArgsConstructor(staticName = "of")
-public class ComplexNumberJdo {
+@lombok.NoArgsConstructor
+public class ComplexNumberJpa
+ implements ComplexNumber {
- @javax.jdo.annotations.Column(allowsNull = "false")
+ @javax.persistence.Column(nullable = false)
private double re;
- @javax.jdo.annotations.Column(allowsNull = "false")
+ @javax.persistence.Column(nullable = false)
private double im;
// end::class[]
@@ -56,10 +59,10 @@ public class ComplexNumberJdo {
private static final Pattern PATTERN =
Pattern.compile("^(?<re>\\S*)\\W*(?<sign>[+-])\\W*(?<im>\\S+)i$");
- public static Optional<ComplexNumberJdo> parse(final String parse) {
+ public static Optional<ComplexNumberJpa> parse(final String parse) {
val m = PATTERN.matcher(parse);
return m.matches() ?
- Optional.of(ComplexNumberJdo.of(
+ Optional.of(ComplexNumberJpa.of(
realFrom(m), signFrom(m) * imaginaryFrom(m)))
: Optional.empty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdoValueSemantics.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpaValueSemantics.java
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdoValueSemantics.java
rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpaValueSemantics.java
index 93506db..7647100 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumberJdoValueSemantics.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpaValueSemantics.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.jpa;
import java.util.stream.Collectors;
@@ -30,35 +30,35 @@ import org.apache.isis.commons.internal.base._Strings;
import lombok.val;
// tag::class[]
-public class ComplexNumberJdoValueSemantics
- implements ValueSemanticsProvider<ComplexNumberJdo>{
+public class ComplexNumberJpaValueSemantics
+ implements ValueSemanticsProvider<ComplexNumberJpa>{
// end::class[]
// tag::getParser[]
@Override
- public Parser<ComplexNumberJdo> getParser() {
+ public Parser<ComplexNumberJpa> getParser() {
// end::getParser[]
// ...
// tag::getParser[]
- return new Parser<ComplexNumberJdo>() {
+ return new Parser<ComplexNumberJpa>() {
@Override
- public ComplexNumberJdo parseTextEntry(Object contextPojo, String entry) {
- return ComplexNumberJdo.parse(entry).orElse(null);
+ public ComplexNumberJpa parseTextEntry(Object contextPojo, String entry) {
+ return ComplexNumberJpa.parse(entry).orElse(null);
}
@Override
public int typicalLength() {
return 30;
}
@Override
- public String displayTitleOf(ComplexNumberJdo object) {
+ public String displayTitleOf(ComplexNumberJpa object) {
return object!=null ? object.title() : "NaN";
}
@Override
- public String displayTitleOf(ComplexNumberJdo object, String usingMask) {
+ public String displayTitleOf(ComplexNumberJpa object, String usingMask) {
return displayTitleOf(object);
}
@Override
- public String parseableTitleOf(ComplexNumberJdo existing) {
+ public String parseableTitleOf(ComplexNumberJpa existing) {
return displayTitleOf(existing);
}
};
@@ -67,13 +67,13 @@ public class ComplexNumberJdoValueSemantics
// tag::getEncoderDecoder[]
@Override
- public EncoderDecoder<ComplexNumberJdo> getEncoderDecoder() {
+ public EncoderDecoder<ComplexNumberJpa> getEncoderDecoder() {
// end::getEncoderDecoder[]
// ...
// tag::getEncoderDecoder[]
- return new EncoderDecoder<ComplexNumberJdo>() {
+ return new EncoderDecoder<ComplexNumberJpa>() {
@Override
- public String toEncodedString(ComplexNumberJdo cn) {
+ public String toEncodedString(ComplexNumberJpa cn) {
if(cn==null) {
return null;
}
@@ -83,7 +83,7 @@ public class ComplexNumberJdoValueSemantics
Long.toHexString(re), Long.toHexString(im));
}
@Override
- public ComplexNumberJdo fromEncodedString(String str) {
+ public ComplexNumberJpa fromEncodedString(String str) {
if(_NullSafe.isEmpty(str)) {
return null;
}
@@ -95,7 +95,7 @@ public class ComplexNumberJdoValueSemantics
}
val re = Double.longBitsToDouble(Long.parseLong(chunks.get(0), 16));
val im = Double.longBitsToDouble(Long.parseLong(chunks.get(1), 16));
- return ComplexNumberJdo.of(re, im);
+ return ComplexNumberJpa.of(re, im);
}
};
}
@@ -103,11 +103,11 @@ public class ComplexNumberJdoValueSemantics
// tag::getDefaultsProvider[]
@Override
- public DefaultsProvider<ComplexNumberJdo> getDefaultsProvider() {
+ public DefaultsProvider<ComplexNumberJpa> getDefaultsProvider() {
// end::getDefaultsProvider[]
// ...
// tag::getDefaultsProvider[]
- return ()-> ComplexNumberJdo.of(0, 0);
+ return ()-> ComplexNumberJpa.of(0, 0);
}
// end::getDefaultsProvider[]
// tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa-description.adoc
similarity index 91%
rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa-description.adoc
index 7c55dda..f0cbead 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa-description.adoc
@@ -1,11 +1,16 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+[WARNING]
+====
+TODO this yet is just a copy from JDO
+====
+
This class is a parent entity that contains an embedded type as a property:
[source,java]
.NumberConstantJdo.java
----
-include::NumberConstantJdo.java[tags=class]
+include::NumberConstantJpa.java[tags=class]
----
<.> JDO `@Embedded` annotation inlines the constituent parts of the value type as columns of the owning entity
<.> maps the 'ComplexNumber.re' property to column `number_re`
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
similarity index 58%
rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
index d91d9d5..202cef1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
@@ -16,32 +16,39 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.jpa;
-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.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
+import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity;
import lombok.Getter;
+import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
-@Profile("demo-jdo")
+@Profile("demo-jpa")
//tag::class[]
-@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
-@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@DomainObject
-public class NumberConstantJdo implements HasAsciiDocDescription {
+@Entity
+@Table(
+ schema = "demo",
+ name = "NumberConstantJpa"
+)
+@EntityListeners(JpaEntityInjectionPointResolver.class)
+@DomainObject(logicalTypeName = "demo.NumberConstantEntity")
+@NoArgsConstructor
+public class NumberConstantJpa
+ extends NumberConstantEntity {
// ...
@@ -50,18 +57,24 @@ public class NumberConstantJdo implements HasAsciiDocDescription {
return getName();
}
+ @Override
+ public ComplexNumber value() {
+ return getNumber();
+ }
+
+ @Id
+ @GeneratedValue
+ private Long id;
+
//tag::class[]
@javax.jdo.annotations.Column(allowsNull = "false")
@Property
@Getter @Setter
private String name;
- @javax.jdo.annotations.Embedded(members={ // <.>
- @Persistent(name="re", columns=@Column(name="number_re")), // <.>
- @Persistent(name="im", columns=@Column(name="number_im")) // <.>
- })
+ @javax.persistence.Embedded
@Property(editing = Editing.ENABLED)
@Getter @Setter
- private ComplexNumberJdo number;
+ private ComplexNumberJpa number;
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.svg b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.svg
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.svg
rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.svg
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java
new file mode 100644
index 0000000..0939763
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package demoapp.dom.domain.objects.other.embedded.jpa;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import demoapp.dom._infra.values.ValueHolderRepository;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
+import lombok.val;
+
+@Profile("demo-jpa")
+@Service
+public class NumberConstantJpaRepository
+extends ValueHolderRepository<ComplexNumber, NumberConstantJpa> {
+
+ protected NumberConstantJpaRepository() {
+ super(NumberConstantJpa.class);
+ }
+
+ @Override
+ protected NumberConstantJpa newDetachedEntity(ComplexNumber value) {
+ val numConst = repositoryService.detachedEntity(new NumberConstantJpa());
+ numConst.setName(((ComplexNumber.SimpleNamedComplexNumber)value).getName());
+ numConst.setNumber(ComplexNumberJpa.of(value.getRe(), value.getIm()));
+ return numConst;
+ }
+
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa_updateNumber.java
similarity index 79%
rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java
rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa_updateNumber.java
index fdfbbca..1299ad4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo_updateNumber.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa_updateNumber.java
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.jpa;
+
+import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -24,22 +26,23 @@ import org.apache.isis.applib.annotation.PromptStyle;
import lombok.RequiredArgsConstructor;
+@Profile("demo-jpa")
// tag::class[]
@Action()
@ActionLayout(
promptStyle = PromptStyle.DIALOG_SIDEBAR
, associateWith = "number")
@RequiredArgsConstructor
-public class NumberConstantJdo_updateNumber {
+public class NumberConstantJpa_updateNumber {
- private final NumberConstantJdo numberConstantJdo;
+ private final NumberConstantJpa numberConstantJdo;
- public NumberConstantJdo act(ComplexNumberJdo complexNumberJdo) {
+ public NumberConstantJpa act(ComplexNumberJpa complexNumberJdo) {
numberConstantJdo.setNumber(complexNumberJdo);
return numberConstantJdo;
}
- public ComplexNumberJdo default0Act() {
+ public ComplexNumberJpa default0Act() {
return numberConstantJdo.getNumber();
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantEntity.java
similarity index 58%
copy from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java
copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantEntity.java
index 387515d..9352ec8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantEntity.java
@@ -16,34 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.domain.objects.other.embedded;
+package demoapp.dom.domain.objects.other.embedded.persistence;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.Nature;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom._infra.values.ValueHolder;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
-// tag::class[]
-@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName = "demo.EmbeddedTypeVm")
-public class EmbeddedTypeVm implements HasAsciiDocDescription {
-
- // ...
-// end::class[]
- @Inject private NumberConstantJdoRepository numberConstantRepo;
-
- public String title() {
- return "Embedded Types";
- }
+@DomainObject(
+ logicalTypeName = "demo.NumberConstantEntity" // shared permissions with concrete sub class
+)
+public abstract class NumberConstantEntity
+implements
+ HasAsciiDocDescription,
+ ValueHolder<ComplexNumber> {
-// tag::class[]
- @Collection
- public List<NumberConstantJdo> getAllConstants(){
- return numberConstantRepo.listAll();
- }
}
-// end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantSeeding.java
new file mode 100644
index 0000000..75db660
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantSeeding.java
@@ -0,0 +1,20 @@
+package demoapp.dom.domain.objects.other.embedded.persistence;
+
+import javax.inject.Inject;
+
+import org.springframework.stereotype.Service;
+
+import demoapp.dom._infra.seed.SeedServiceAbstract;
+import demoapp.dom._infra.values.ValueHolderRepository;
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
+
+@Service
+public class NumberConstantSeeding
+extends SeedServiceAbstract {
+
+ @Inject
+ public NumberConstantSeeding(ValueHolderRepository<ComplexNumber, ? extends NumberConstantEntity> entities) {
+ super(entities);
+ }
+
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/samples/ComplexNumberSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/samples/ComplexNumberSamples.java
new file mode 100644
index 0000000..e49e7f1
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/samples/ComplexNumberSamples.java
@@ -0,0 +1,22 @@
+package demoapp.dom.domain.objects.other.embedded.samples;
+
+import java.util.stream.Stream;
+
+import org.springframework.stereotype.Service;
+
+import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
+import demoapp.dom.types.Samples;
+
+@Service
+public class ComplexNumberSamples implements Samples<ComplexNumber> {
+
+ @Override
+ public Stream<ComplexNumber> stream() {
+ return Stream.of(
+ ComplexNumber.named("Pi", Math.PI, 0.),
+ ComplexNumber.named("Euler's Constant", Math.E, 0.),
+ ComplexNumber.named("Imaginary Unit", 0, 1)
+ );
+ }
+
+}
\ No newline at end of file
diff --git a/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java b/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java
index aaf46af..3901124 100644
--- a/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java
+++ b/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java
@@ -3,10 +3,9 @@ package demoapp.dom.domain.objects.other.customvaluetypes;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
+import demoapp.dom.domain.objects.other.embedded.jdo.ComplexNumberJdo;
import lombok.val;
-import demoapp.dom.domain.objects.other.embedded.ComplexNumberJdo;
-
class ComplexNumberJdo_Test {
@Test