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/08/24 06:28:32 UTC
[isis] branch master updated: ISIS-2856: remove
JpaEntityInjectionPointResolver
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 b602e5d ISIS-2856: remove JpaEntityInjectionPointResolver
b602e5d is described below
commit b602e5da3bf82620b40e2c59a52f15cec5489738
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Aug 24 08:28:25 2021 +0200
ISIS-2856: remove JpaEntityInjectionPointResolver
---
.../apache/isis/core/metamodel/consent/Allow.java | 17 +----
.../metamodel/facetapi/FacetHolderAbstract.java | 9 +--
.../jpa/ActionCommandPublishingJpa.java | 6 +-
.../jpa/ActionExecutionPublishingJpa.java | 6 +-
...ainObjectEntityChangePublishingDisabledJpa.java | 6 +-
...mainObjectEntityChangePublishingEnabledJpa.java | 6 +-
...ityChangePublishingEnabledMetaAnnotatedJpa.java | 6 +-
...ngePublishingEnabledMetaAnnotOverriddenJpa.java | 6 +-
.../viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java | 6 +-
.../other/embedded/jpa/NumberConstantJpa.java | 9 +--
.../jpa/PropertyCommandPublishingJpa.java | 6 +-
.../jpa/PropertyExecutionPublishingJpa.java | 6 +-
.../projecting/jpa/PropertyProjectingChildJpa.java | 6 +-
.../core/wrapperFactory/jpa/WrapperFactoryJpa.java | 11 +--
.../secman/apptenancy/jpa/TenantedJpa.java | 9 +--
.../dom/types/isis/clobs/jpa/IsisClobJpa.java | 20 ++++--
.../jpa/IsisLocalResourcePathJpa.java | 9 +--
.../dom/types/isis/markups/jpa/IsisMarkupJpa.java | 9 +--
.../types/isis/passwords/jpa/IsisPasswordJpa.java | 9 +--
.../isisext/asciidocs/jpa/IsisAsciiDocJpa.java | 12 ++--
.../isisext/markdowns/jpa/IsisMarkdownJpa.java | 9 +--
.../images/jpa/JavaAwtBufferedImageJpa.java | 9 +--
.../javalang/booleans/jpa/WrapperBooleanJpa.java | 6 +-
.../types/javalang/bytes/jpa/WrapperByteJpa.java | 6 +-
.../characters/jpa/WrapperCharacterJpa.java | 6 +-
.../javalang/doubles/jpa/WrapperDoubleJpa.java | 6 +-
.../types/javalang/floats/jpa/WrapperFloatJpa.java | 6 +-
.../javalang/integers/jpa/WrapperIntegerJpa.java | 6 +-
.../types/javalang/longs/jpa/WrapperLongJpa.java | 6 +-
.../types/javalang/shorts/jpa/WrapperShortJpa.java | 6 +-
.../javalang/strings/jpa/JavaLangStringJpa.java | 6 +-
.../bigdecimals/jpa/JavaMathBigDecimalJpa.java | 6 +-
.../bigintegers/jpa/JavaMathBigIntegerJpa.java | 6 +-
.../dom/types/javanet/urls/jpa/JavaNetUrlJpa.java | 6 +-
.../javasql/javasqldate/jpa/JavaSqlDateJpa.java | 6 +-
.../javasqltimestamp/jpa/JavaSqlTimestampJpa.java | 6 +-
.../jpa/JavaTimeLocalDateJpa.java | 6 +-
.../jpa/JavaTimeLocalDateTimeJpa.java | 6 +-
.../jpa/JavaTimeOffsetDateTimeJpa.java | 6 +-
.../jpa/JavaTimeOffsetTimeJpa.java | 6 +-
.../jpa/JavaTimeZonedDateTimeJpa.java | 6 +-
.../javautil/javautildate/jpa/JavaUtilDateJpa.java | 6 +-
.../types/javautil/uuids/jpa/JavaUtilUuidJpa.java | 6 +-
.../booleans/jpa/PrimitiveBooleanJpa.java | 6 +-
.../primitive/bytes/jpa/PrimitiveByteJpa.java | 6 +-
.../primitive/chars/jpa/PrimitiveCharJpa.java | 6 +-
.../primitive/doubles/jpa/PrimitiveDoubleJpa.java | 6 +-
.../primitive/floats/jpa/PrimitiveFloatJpa.java | 6 +-
.../types/primitive/ints/jpa/PrimitiveIntJpa.java | 6 +-
.../primitive/longs/jpa/PrimitiveLongJpa.java | 6 +-
.../primitive/shorts/jpa/PrimitiveShortJpa.java | 6 +-
.../JpaEntityInjectionPointResolver.java | 79 ----------------------
.../applib/classrules/ArchitectureJpaRules.java | 17 ++---
.../applib/entity/jpa/dom/JpaEntity2.java | 4 +-
54 files changed, 193 insertions(+), 273 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
index 7c5984a..62088ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/Allow.java
@@ -19,8 +19,6 @@
package org.apache.isis.core.metamodel.consent;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-
/**
* An instance of this type is used to allow something.
*/
@@ -31,20 +29,7 @@ public class Allow extends ConsentAbstract {
public static final Allow DEFAULT = new Allow();
private Allow() {
- this((String) null);
- }
-
- /**
- * Called by DnD viewer; we should instead find a way to put the calling
- * logic into {@link Facet}s so that it is available for use by other
- * viewers.
- *
- * @see Veto
- * @deprecated
- */
- @Deprecated
- public Allow(final String description) {
- super(description, null);
+ super(null, null);
}
public Allow(final InteractionResult interactionResult) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderAbstract.java
index 1f4ce4a..fec986b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderAbstract.java
@@ -21,14 +21,12 @@ package org.apache.isis.core.metamodel.facetapi;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
import java.util.stream.Stream;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import static org.apache.isis.commons.internal.base._Casts.uncheckedCast;
@@ -178,9 +176,6 @@ implements FacetHolder {
return false; // no changes
}
- @Deprecated // introduced so can resolve initial conflicts
- private static Set<String> uniquePrecedenceWarnings = _Sets.newConcurrentHashSet();
-
// on equal precedence returns b
private Facet preferredOf(final @NonNull Facet a, final @NonNull Facet b) {
@@ -209,9 +204,7 @@ implements FacetHolder {
friendlyName(b.getClass()),
a.getPrecedence().name());
- if(uniquePrecedenceWarnings.add(msg)) {
- log.warn(msg);
- }
+ log.warn(msg);
return b;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
index 264965d..302d30c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -51,7 +51,7 @@ import demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishi
schema = "demo",
name = "ActionCommandPublishingJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.ActionCommandPublishingEntity"
, editing = Editing.DISABLED
@@ -62,7 +62,7 @@ public class ActionCommandPublishingJpa
// ...
//end::class[]
- public ActionCommandPublishingJpa(String initialValue) {
+ public ActionCommandPublishingJpa(final String initialValue) {
this.property = initialValue;
this.propertyCommandDisabled = initialValue;
this.propertyMetaAnnotated = initialValue;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
index 725eb10..7465884 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -51,7 +51,7 @@ import demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPubl
schema = "demo",
name = "ActionExecutionPublishingJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.ActionExecutionPublishingEntity"
, editing = Editing.DISABLED
@@ -62,7 +62,7 @@ public class ActionExecutionPublishingJpa
// ...
//end::class[]
- public ActionExecutionPublishingJpa(String initialValue) {
+ public ActionExecutionPublishingJpa(final String initialValue) {
this.property = initialValue;
this.propertyMetaAnnotated = initialValue;
this.propertyMetaAnnotatedOverridden = initialValue;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
index ae9be88..a881863 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/disabled/jpa/DomainObjectEntityChangePublishingDisabledJpa.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -47,7 +47,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.
schema = "demo",
name = "DomainObjectEntityChangePublishingDisabledJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
nature=Nature.ENTITY
, logicalTypeName = "demo.DomainObjectEntityChangePublishingDisabledEntity"
@@ -63,7 +63,7 @@ public class DomainObjectEntityChangePublishingDisabledJpa
// ...
//end::class[]
- public DomainObjectEntityChangePublishingDisabledJpa(String initialValue) {
+ public DomainObjectEntityChangePublishingDisabledJpa(final String initialValue) {
this.property = initialValue;
this.propertyUpdatedByAction = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
index 53d4b50..a93b32c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/annotated/enabled/jpa/DomainObjectEntityChangePublishingEnabledJpa.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -47,7 +47,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.
schema = "demo",
name = "DomainObjectEntityChangePublishingEnabledJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
nature=Nature.ENTITY
, logicalTypeName = "demo.DomainObjectEntityChangePublishingEnabledEntity"
@@ -63,7 +63,7 @@ public class DomainObjectEntityChangePublishingEnabledJpa
// ...
//end::class[]
- public DomainObjectEntityChangePublishingEnabledJpa(String initialValue) {
+ public DomainObjectEntityChangePublishingEnabledJpa(final String initialValue) {
this.property = initialValue;
this.propertyUpdatedByAction = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
index 3cb5391..d891e15 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnot/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -47,7 +47,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.
schema = "demo",
name = "DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObjectEntityChangePublishingEnabledMetaAnnotation // <.>
@DomainObject(
nature=Nature.ENTITY
@@ -64,7 +64,7 @@ public class DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa
// ...
//end::class[]
- public DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa(String initialValue) {
+ public DomainObjectEntityChangePublishingEnabledMetaAnnotatedJpa(final String initialValue) {
this.property = initialValue;
this.propertyUpdatedByAction = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
index 60b30c8..22c87ec 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/metaAnnotOverridden/enabled/jpa/DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotO
schema = "demo",
name = "DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObjectEntityChangePublishingDisabledMetaAnnotation // <.>
@DomainObject(
nature=Nature.ENTITY
@@ -67,7 +67,7 @@ public class DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa
// ...
//end::class[]
- public DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa(String initialValue) {
+ public DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJpa(final String initialValue) {
this.property = initialValue;
this.propertyUpdatedByAction = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
index 4cc3397..a5124b7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jpa/JaxbRefJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.J
schema = "demo",
name = "JaxbRefJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
bounding = Bounding.BOUNDED
, logicalTypeName = "demo.JaxbRefEntity")
@@ -55,7 +55,7 @@ import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.J
public class JaxbRefJpa
extends JaxbRefEntity {
- public JaxbRefJpa(String name) {
+ public JaxbRefJpa(final String name) {
this.name = name;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
index 202cef1..1e33f49 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
@@ -29,14 +29,15 @@ 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 org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-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.domain.objects.other.embedded.ComplexNumber;
+import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -44,7 +45,7 @@ import lombok.Setter;
schema = "demo",
name = "NumberConstantJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(logicalTypeName = "demo.NumberConstantEntity")
@NoArgsConstructor
public class NumberConstantJpa
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
index 1ece7bf..932a82d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandP
schema = "demo",
name = "PropertyCommandPublishingJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PropertyCommandPublishingEntity"
, editing = Editing.ENABLED
@@ -59,7 +59,7 @@ public class PropertyCommandPublishingJpa
// ...
//end::class[]
- public PropertyCommandPublishingJpa(String initialValue) {
+ public PropertyCommandPublishingJpa(final String initialValue) {
this.property = initialValue;
this.propertyCommandPublishingDisabled = initialValue;
this.propertyMetaAnnotated = initialValue;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
index b19d976..e3917bf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -49,7 +49,7 @@ import demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecut
schema = "demo",
name = "PropertyExecutionPublishingJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PropertyExecutionPublishingEntity"
, editing = Editing.ENABLED
@@ -60,7 +60,7 @@ public class PropertyExecutionPublishingJpa
// ...
//end::class[]
- public PropertyExecutionPublishingJpa(String initialValue) {
+ public PropertyExecutionPublishingJpa(final String initialValue) {
this.property = initialValue;
this.propertyMetaAnnotated = initialValue;
this.propertyMetaAnnotatedOverridden = initialValue;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
index 47d2fe2..daf132d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jpa/PropertyProjectingChildJpa.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -47,7 +47,7 @@ import demoapp.dom.domain.properties.Property.projecting.persistence.PropertyPro
schema = "demo",
name = "PropertyProjectingChildJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PropertyProjectingChildEntity"
, editing = Editing.DISABLED
@@ -59,7 +59,7 @@ public class PropertyProjectingChildJpa
// ...
//end::class[]
- public PropertyProjectingChildJpa(String initialValue) {
+ public PropertyProjectingChildJpa(final String initialValue) {
this.name = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
index 564e485..aab511f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
@@ -38,15 +38,16 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.control.AsyncControl;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
-import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity_updatePropertyAsyncMixin;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.val;
+import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
+import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity_updatePropertyAsyncMixin;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -54,7 +55,7 @@ import lombok.val;
schema = "demo",
name = "WrapperFactoryJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
nature=Nature.ENTITY
, logicalTypeName = "demo.WrapperFactoryEntity"
@@ -70,7 +71,7 @@ public class WrapperFactoryJpa
// ...
//end::class[]
- public WrapperFactoryJpa(String initialValue) {
+ public WrapperFactoryJpa(final String initialValue) {
this.propertyAsync = initialValue;
this.propertyAsyncMixin = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
index 5a9084e..71db3be 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/jpa/TenantedJpa.java
@@ -34,13 +34,14 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -48,7 +49,7 @@ import lombok.Setter;
schema = "demo",
name = "TenantedJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.TenantedEntity"
)
@@ -56,7 +57,7 @@ import lombok.Setter;
public class TenantedJpa
extends TenantedEntity {
- public TenantedJpa(String name) {
+ public TenantedJpa(final String name) {
this.name = name;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java
index db5493e..9e09342 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java
@@ -28,6 +28,8 @@ 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.Optionality;
@@ -35,13 +37,13 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import org.apache.isis.persistence.jpa.applib.types.ClobJpaEmbeddable;
-import org.springframework.context.annotation.Profile;
-import demoapp.dom.types.isis.clobs.persistence.IsisClobEntity;
import lombok.NoArgsConstructor;
+import demoapp.dom.types.isis.clobs.persistence.IsisClobEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -49,7 +51,7 @@ import lombok.NoArgsConstructor;
schema = "demo",
name = "IsisClobJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.IsisClobEntity"
)
@@ -58,7 +60,7 @@ public class IsisClobJpa
extends IsisClobEntity {
//end::class[]
- public IsisClobJpa(Clob initialValue) {
+ public IsisClobJpa(final Clob initialValue) {
setReadOnlyProperty(initialValue);
setReadWriteProperty(initialValue);
}
@@ -77,12 +79,14 @@ public class IsisClobJpa
@Embedded
private ClobJpaEmbeddable readOnlyProperty;
+ @Override
@Title(prepend = "Clob JPA entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
public Clob getReadOnlyProperty() {
return ClobJpaEmbeddable.toClob(readOnlyProperty);
}
+ @Override
public void setReadOnlyProperty(final Clob readOnlyProperty) {
this.readOnlyProperty = ClobJpaEmbeddable.fromClob(readOnlyProperty);
}
@@ -96,12 +100,14 @@ public class IsisClobJpa
@Embedded
private ClobJpaEmbeddable readWriteProperty;
+ @Override
@Property(editing = Editing.ENABLED) // <.>
@PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
public Clob getReadWriteProperty() {
return ClobJpaEmbeddable.toClob(readWriteProperty);
}
+ @Override
public void setReadWriteProperty(final Clob readWriteProperty) {
this.readWriteProperty = ClobJpaEmbeddable.fromClob(readWriteProperty);
}
@@ -115,12 +121,14 @@ public class IsisClobJpa
@Embedded
private ClobJpaEmbeddable readOnlyOptionalProperty;
+ @Override
@Property(optionality = Optionality.OPTIONAL) // <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
public Clob getReadOnlyOptionalProperty() {
return ClobJpaEmbeddable.toClob(readOnlyOptionalProperty);
}
+ @Override
public void setReadOnlyOptionalProperty(final Clob readOnlyOptionalProperty) {
this.readOnlyOptionalProperty = ClobJpaEmbeddable.fromClob(readOnlyOptionalProperty);
}
@@ -133,12 +141,14 @@ public class IsisClobJpa
@Embedded
private ClobJpaEmbeddable readWriteOptionalProperty;
+ @Override
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
public Clob getReadWriteOptionalProperty() {
return ClobJpaEmbeddable.toClob(readWriteOptionalProperty);
}
+ @Override
public void setReadWriteOptionalProperty(final Clob readWriteOptionalProperty) {
this.readWriteOptionalProperty = ClobJpaEmbeddable.fromClob(readWriteOptionalProperty);
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
index 379fc88..168f81c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
@@ -34,13 +34,14 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-import demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -48,7 +49,7 @@ import lombok.Setter;
schema = "demo",
name = "IsisLocalResourcePathJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.IsisLocalResourcePathEntity"
)
@@ -57,7 +58,7 @@ public class IsisLocalResourcePathJpa
extends IsisLocalResourcePathEntity {
//end::class[]
- public IsisLocalResourcePathJpa(LocalResourcePath initialValue) {
+ public IsisLocalResourcePathJpa(final LocalResourcePath initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
index e2676a7..23ad9c2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
@@ -40,13 +40,14 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -54,7 +55,7 @@ import lombok.Setter;
schema = "demo",
name = "IsisMarkupJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.IsisMarkupEntity"
)
@@ -63,7 +64,7 @@ public class IsisMarkupJpa
extends IsisMarkupEntity {
//end::class[]
- public IsisMarkupJpa(Markup initialValue) {
+ public IsisMarkupJpa(final Markup initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java
index ca80242..e076661 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java
@@ -34,13 +34,14 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Password;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-import demoapp.dom.types.isis.passwords.persistence.IsisPasswordEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom.types.isis.passwords.persistence.IsisPasswordEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -48,7 +49,7 @@ import lombok.Setter;
schema = "demo",
name = "IsisPasswordJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.IsisPasswordEntity"
)
@@ -57,7 +58,7 @@ public class IsisPasswordJpa
extends IsisPasswordEntity {
//end::class[]
- public IsisPasswordJpa(Password initialValue) {
+ public IsisPasswordJpa(final Password initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java
index 07d8bdd..c32338f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java
@@ -30,6 +30,8 @@ import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
+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.Optionality;
@@ -37,15 +39,15 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-import org.springframework.context.annotation.Profile;
-import demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -53,7 +55,7 @@ import lombok.Setter;
schema = "demo",
name = "IsisAsciiDocJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.IsisAsciiDocEntity"
)
@@ -62,7 +64,7 @@ public class IsisAsciiDocJpa
extends IsisAsciiDocEntity {
//end::class[]
- public IsisAsciiDocJpa(AsciiDoc initialValue) {
+ public IsisAsciiDocJpa(final AsciiDoc initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java
index 04f6d74..c8237b7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java
@@ -39,14 +39,15 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
-import demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -54,7 +55,7 @@ import lombok.Setter;
schema = "demo",
name = "IsisMarkdownJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.IsisMarkdownEntity"
)
@@ -63,7 +64,7 @@ public class IsisMarkdownJpa
extends IsisMarkdownEntity {
//end::class[]
- public IsisMarkdownJpa(Markdown initialValue) {
+ public IsisMarkdownJpa(final Markdown initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
index 141a1cf..c8df4e6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
@@ -34,14 +34,15 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import org.apache.isis.persistence.jpa.integration.typeconverters.JavaAwtBufferedImageByteArrayConverter;
-import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -49,7 +50,7 @@ import lombok.Setter;
schema = "demo",
name = "JavaAwtBufferedImageJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaAwtBufferedImageEntity"
)
@@ -62,7 +63,7 @@ public class JavaAwtBufferedImageJpa
{
//end::class[]
- public JavaAwtBufferedImageJpa(BufferedImage initialValue) {
+ public JavaAwtBufferedImageJpa(final BufferedImage initialValue) {
this.readOnlyProperty = initialValue;
// this.readWriteProperty = initialValue; // editable properties not yet supported
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
index 8bab233..c707526 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanEntity;
schema = "demo",
name = "WrapperBooleanJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.WrapperBooleanEntity"
)
@@ -57,7 +57,7 @@ public class WrapperBooleanJpa
extends WrapperBooleanEntity {
//end::class[]
- public WrapperBooleanJpa(Boolean initialValue) {
+ public WrapperBooleanJpa(final Boolean initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
index f14a243..1abf258 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.bytes.persistence.WrapperByteEntity;
schema = "demo",
name = "WrapperByteJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.WrapperByteEntity"
)
@@ -57,7 +57,7 @@ public class WrapperByteJpa
extends WrapperByteEntity {
//end::class[]
- public WrapperByteJpa(Byte initialValue) {
+ public WrapperByteJpa(final Byte initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
index 4975b1a..ca50086 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.characters.persistence.WrapperCharacterEntity;
schema = "demo",
name = "WrapperCharacterJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.WrapperCharacterEntity"
)
@@ -57,7 +57,7 @@ public class WrapperCharacterJpa
extends WrapperCharacterEntity {
//end::class[]
- public WrapperCharacterJpa(Character initialValue) {
+ public WrapperCharacterJpa(final Character initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
index 9cc067f..ee932ff 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleEntity;
schema = "demo",
name = "WrapperDoubleJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.WrapperDoubleEntity"
)
@@ -57,7 +57,7 @@ public class WrapperDoubleJpa
extends WrapperDoubleEntity {
//end::class[]
- public WrapperDoubleJpa(Double initialValue) {
+ public WrapperDoubleJpa(final Double initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
index 3112daa..77ba8f5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.floats.persistence.WrapperFloatEntity;
schema = "demo",
name = "WrapperFloatJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.WrapperFloatEntity"
)
@@ -57,7 +57,7 @@ public class WrapperFloatJpa
extends WrapperFloatEntity {
//end::class[]
- public WrapperFloatJpa(Float initialValue) {
+ public WrapperFloatJpa(final Float initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
index cf60349..2c14c47 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.integers.persistence.WrapperIntegerEntity;
schema = "demo",
name = "WrapperIntegerJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.WrapperIntegerEntity"
)
@@ -57,7 +57,7 @@ public class WrapperIntegerJpa
extends WrapperIntegerEntity {
//end::class[]
- public WrapperIntegerJpa(Integer initialValue) {
+ public WrapperIntegerJpa(final Integer initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
index 3e79672..ea07d3b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.longs.persistence.WrapperLongEntity;
schema = "demo",
name = "WrapperLongJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.WrapperLongEntity"
)
@@ -57,7 +57,7 @@ public class WrapperLongJpa
extends WrapperLongEntity {
//end::class[]
- public WrapperLongJpa(Long initialValue) {
+ public WrapperLongJpa(final Long initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
index ee6e1b7..199c82b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.shorts.persistence.WrapperShortEntity;
schema = "demo",
name = "WrapperShortJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.WrapperShortEntity"
)
@@ -57,7 +57,7 @@ public class WrapperShortJpa
extends WrapperShortEntity {
//end::class[]
- public WrapperShortJpa(Short initialValue) {
+ public WrapperShortJpa(final Short initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
index ba07ff7..4b26b6e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javalang.strings.persistence.JavaLangStringEntity;
schema = "demo",
name = "JavaLangStringJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaLangStringEntity"
)
@@ -57,7 +57,7 @@ public class JavaLangStringJpa
extends JavaLangStringEntity {
//end::class[]
- public JavaLangStringJpa(String initialValue) {
+ public JavaLangStringJpa(final String initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
index 5173935..8709a9e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalEnti
schema = "demo",
name = "JavaMathBigDecimalJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaMathBigDecimalEntity"
)
@@ -57,7 +57,7 @@ public class JavaMathBigDecimalJpa
extends JavaMathBigDecimalEntity {
//end::class[]
- public JavaMathBigDecimalJpa(java.math.BigDecimal initialValue) {
+ public JavaMathBigDecimalJpa(final java.math.BigDecimal initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
index ac8f4cf..896b86e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerEnti
schema = "demo",
name = "JavaMathBigIntegerJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaMathBigIntegerEntity"
)
@@ -57,7 +57,7 @@ public class JavaMathBigIntegerJpa
extends JavaMathBigIntegerEntity {
//end::class[]
- public JavaMathBigIntegerJpa(java.math.BigInteger initialValue) {
+ public JavaMathBigIntegerJpa(final java.math.BigInteger initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
index b8a9168..584194d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javanet.urls.persistence.JavaNetUrlEntity;
schema = "demo",
name = "JavaNetUrlJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaNetUrlEntity"
)
@@ -57,7 +57,7 @@ public class JavaNetUrlJpa
extends JavaNetUrlEntity {
//end::class[]
- public JavaNetUrlJpa(java.net.URL initialValue) {
+ public JavaNetUrlJpa(final java.net.URL initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
index 2bcaef8..ebbae9d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateEntity;
schema = "demo",
name = "JavaSqlDateJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaSqlDateEntity"
)
@@ -57,7 +57,7 @@ public class JavaSqlDateJpa
extends JavaSqlDateEntity {
//end::class[]
- public JavaSqlDateJpa(java.sql.Date initialValue) {
+ public JavaSqlDateJpa(final java.sql.Date initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
index 48d1d2e..9494490 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampEn
schema = "demo",
name = "JavaSqlTimestampJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaSqlTimestampEntity"
)
@@ -57,7 +57,7 @@ public class JavaSqlTimestampJpa
extends JavaSqlTimestampEntity {
//end::class[]
- public JavaSqlTimestampJpa(java.sql.Timestamp initialValue) {
+ public JavaSqlTimestampJpa(final java.sql.Timestamp initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
index 16314d7..b72fd53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDat
schema = "demo",
name = "JavaTimeLocalDateJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaTimeLocalDateEntity"
)
@@ -57,7 +57,7 @@ public class JavaTimeLocalDateJpa
extends JavaTimeLocalDateEntity {
//end::class[]
- public JavaTimeLocalDateJpa(java.time.LocalDate initialValue) {
+ public JavaTimeLocalDateJpa(final java.time.LocalDate initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
index e143e4c..5fd2904 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLoca
schema = "demo",
name = "JavaTimeLocalDateTimeJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaTimeLocalDateTimeEntity"
)
@@ -57,7 +57,7 @@ public class JavaTimeLocalDateTimeJpa
extends JavaTimeLocalDateTimeEntity {
//end::class[]
- public JavaTimeLocalDateTimeJpa(java.time.LocalDateTime initialValue) {
+ public JavaTimeLocalDateTimeJpa(final java.time.LocalDateTime initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
index d7edbbe..d348aab 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOff
schema = "demo",
name = "JavaTimeOffsetDateTimeJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaTimeOffsetDateTimeEntity"
)
@@ -57,7 +57,7 @@ public class JavaTimeOffsetDateTimeJpa
extends JavaTimeOffsetDateTimeEntity {
//end::class[]
- public JavaTimeOffsetDateTimeJpa(java.time.OffsetDateTime initialValue) {
+ public JavaTimeOffsetDateTimeJpa(final java.time.OffsetDateTime initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
index af38417..7bd25cc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetT
schema = "demo",
name = "JavaTimeOffsetTimeJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaTimeOffsetTimeEntity"
)
@@ -57,7 +57,7 @@ public class JavaTimeOffsetTimeJpa
extends JavaTimeOffsetTimeEntity {
//end::class[]
- public JavaTimeOffsetTimeJpa(java.time.OffsetTime initialValue) {
+ public JavaTimeOffsetTimeJpa(final java.time.OffsetTime initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
index 2afc61a..e0f7cfc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZone
schema = "demo",
name = "JavaTimeZonedDateTimeJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaTimeZonedDateTimeEntity"
)
@@ -57,7 +57,7 @@ public class JavaTimeZonedDateTimeJpa
extends JavaTimeZonedDateTimeEntity {
//end::class[]
- public JavaTimeZonedDateTimeJpa(java.time.ZonedDateTime initialValue) {
+ public JavaTimeZonedDateTimeJpa(final java.time.ZonedDateTime initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
index 2d1a2c2..6dd8eea 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateEntity;
schema = "demo",
name = "JavaUtilDateJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaUtilDateEntity"
)
@@ -57,7 +57,7 @@ public class JavaUtilDateJpa
extends JavaUtilDateEntity {
//end::class[]
- public JavaUtilDateJpa(java.util.Date initialValue) {
+ public JavaUtilDateJpa(final java.util.Date initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
index d4df2f9..5a9aafa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -48,7 +48,7 @@ import demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidEntity;
schema = "demo",
name = "JavaUtilUuidJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.JavaUtilUuidEntity"
)
@@ -57,7 +57,7 @@ public class JavaUtilUuidJpa
extends JavaUtilUuidEntity {
//end::class[]
- public JavaUtilUuidJpa(java.util.UUID initialValue) {
+ public JavaUtilUuidJpa(final java.util.UUID initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jpa/PrimitiveBooleanJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jpa/PrimitiveBooleanJpa.java
index ba147fe..4e86ac3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jpa/PrimitiveBooleanJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jpa/PrimitiveBooleanJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.booleans.persistence.PrimitiveBooleanEntity;
schema = "demo",
name = "PrimitiveBooleanJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PrimitiveBooleanEntity"
)
@@ -55,7 +55,7 @@ public class PrimitiveBooleanJpa
extends PrimitiveBooleanEntity {
//end::class[]
- public PrimitiveBooleanJpa(boolean initialValue) {
+ public PrimitiveBooleanJpa(final boolean initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jpa/PrimitiveByteJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jpa/PrimitiveByteJpa.java
index eee9c14..0232b67 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jpa/PrimitiveByteJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jpa/PrimitiveByteJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.bytes.persistence.PrimitiveByteEntity;
schema = "demo",
name = "PrimitiveByteJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PrimitiveByteEntity"
)
@@ -55,7 +55,7 @@ public class PrimitiveByteJpa
extends PrimitiveByteEntity {
//end::class[]
- public PrimitiveByteJpa(byte initialValue) {
+ public PrimitiveByteJpa(final byte initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
index 9132218..550c50c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jpa/PrimitiveCharJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.chars.persistence.PrimitiveCharEntity;
schema = "demo",
name = "PrimitiveCharJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PrimitiveCharEntity"
)
@@ -55,7 +55,7 @@ public class PrimitiveCharJpa
extends PrimitiveCharEntity {
//end::class[]
- public PrimitiveCharJpa(char initialValue) {
+ public PrimitiveCharJpa(final char initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jpa/PrimitiveDoubleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jpa/PrimitiveDoubleJpa.java
index 5c9e5a2..082bb21 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jpa/PrimitiveDoubleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jpa/PrimitiveDoubleJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.doubles.persistence.PrimitiveDoubleEntity;
schema = "demo",
name = "PrimitiveDoubleJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PrimitiveDoubleEntity"
)
@@ -55,7 +55,7 @@ public class PrimitiveDoubleJpa
extends PrimitiveDoubleEntity {
//end::class[]
- public PrimitiveDoubleJpa(double initialValue) {
+ public PrimitiveDoubleJpa(final double initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jpa/PrimitiveFloatJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jpa/PrimitiveFloatJpa.java
index 709ba58..2039da6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jpa/PrimitiveFloatJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jpa/PrimitiveFloatJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.floats.persistence.PrimitiveFloatEntity;
schema = "demo",
name = "PrimitiveFloatJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PrimitiveFloatEntity"
)
@@ -55,7 +55,7 @@ public class PrimitiveFloatJpa
extends PrimitiveFloatEntity {
//end::class[]
- public PrimitiveFloatJpa(float initialValue) {
+ public PrimitiveFloatJpa(final float initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jpa/PrimitiveIntJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jpa/PrimitiveIntJpa.java
index 9f7919b..5674f93 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jpa/PrimitiveIntJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jpa/PrimitiveIntJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.ints.persistence.PrimitiveIntEntity;
schema = "demo",
name = "PrimitiveIntJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PrimitiveIntEntity"
)
@@ -55,7 +55,7 @@ public class PrimitiveIntJpa
extends PrimitiveIntEntity {
//end::class[]
- public PrimitiveIntJpa(int initialValue) {
+ public PrimitiveIntJpa(final int initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jpa/PrimitiveLongJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jpa/PrimitiveLongJpa.java
index c46b15f..160467c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jpa/PrimitiveLongJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jpa/PrimitiveLongJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.longs.persistence.PrimitiveLongEntity;
schema = "demo",
name = "PrimitiveLongJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PrimitiveLongEntity"
)
@@ -55,7 +55,7 @@ public class PrimitiveLongJpa
extends PrimitiveLongEntity {
//end::class[]
- public PrimitiveLongJpa(long initialValue) {
+ public PrimitiveLongJpa(final long initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jpa/PrimitiveShortJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jpa/PrimitiveShortJpa.java
index 5875f41..c3135f6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jpa/PrimitiveShortJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jpa/PrimitiveShortJpa.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.shorts.persistence.PrimitiveShortEntity;
schema = "demo",
name = "PrimitiveShortJpa"
)
-@EntityListeners(JpaEntityInjectionPointResolver.class)
+@EntityListeners(IsisEntityListener.class)
@DomainObject(
logicalTypeName = "demo.PrimitiveShortEntity"
)
@@ -55,7 +55,7 @@ public class PrimitiveShortJpa
extends PrimitiveShortEntity {
//end::class[]
- public PrimitiveShortJpa(short initialValue) {
+ public PrimitiveShortJpa(final short initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
diff --git a/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/integration/JpaEntityInjectionPointResolver.java b/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/integration/JpaEntityInjectionPointResolver.java
deleted file mode 100644
index ed37aa0..0000000
--- a/persistence/jpa/applib/src/main/java/org/apache/isis/persistence/jpa/applib/integration/JpaEntityInjectionPointResolver.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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 org.apache.isis.persistence.jpa.applib.integration;
-
-import javax.persistence.PostLoad;
-import javax.persistence.PostPersist;
-import javax.persistence.PostRemove;
-import javax.persistence.PostUpdate;
-import javax.persistence.PrePersist;
-import javax.persistence.PreRemove;
-import javax.persistence.PreUpdate;
-
-/**
- * Use {@link IsisEntityListener} instead.
- */
-@Deprecated
-//@Log4j2
-public class JpaEntityInjectionPointResolver extends IsisEntityListener {
-
- @Override
- @PrePersist
- void onPrePersist(final Object entityPojo) {
- super.onPrePersist(entityPojo);
- }
-
- @Override
- @PreUpdate
- void onPreUpdate(final Object entityPojo) {
- super.onPreUpdate(entityPojo);
- }
-
- @Override
- @PreRemove
- void onPreRemove(final Object entityPojo) {
- super.onPreRemove(entityPojo);
- }
-
- @Override
- @PostPersist
- void onPostPersist(final Object entityPojo) {
- super.onPostPersist(entityPojo);
- }
-
- @Override
- @PostUpdate
- void onPostUpdate(final Object entityPojo) {
- super.onPostUpdate(entityPojo);
- }
-
- @Override
- @PostRemove
- void onPostRemove(final Object entityPojo) {
- super.onPostRemove(entityPojo);
- }
-
- @Override
- @PostLoad
- void onPostLoad(final Object entityPojo) {
- super.onPostLoad(entityPojo);
- }
-
-
-}
diff --git a/testing/archtestsupport/applib/src/main/java/org/apache/isis/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java b/testing/archtestsupport/applib/src/main/java/org/apache/isis/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
index e60c95f..3a66229 100644
--- a/testing/archtestsupport/applib/src/main/java/org/apache/isis/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
+++ b/testing/archtestsupport/applib/src/main/java/org/apache/isis/testing/archtestsupport/applib/classrules/ArchitectureJpaRules.java
@@ -41,19 +41,20 @@ import com.tngtech.archunit.lang.ConditionEvents;
import com.tngtech.archunit.lang.SimpleConditionEvent;
import com.tngtech.archunit.lang.syntax.elements.ClassesShouldConjunction;
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
-
import static com.tngtech.archunit.base.DescribedPredicate.not;
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.fields;
-import lombok.experimental.UtilityClass;
-import lombok.val;
+
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
+
import static org.apache.isis.testing.archtestsupport.applib.classrules.CommonPredicates.annotationOf;
import static org.apache.isis.testing.archtestsupport.applib.classrules.CommonPredicates.haveNoArgProtectedConstructor;
import static org.apache.isis.testing.archtestsupport.applib.classrules.CommonPredicates.ofAnEnum;
+import lombok.val;
+import lombok.experimental.UtilityClass;
+
/**
* A library of architecture tests to ensure coding conventions are followed for classes annotated with
* the JPA {@link Entity} annotation.
@@ -118,7 +119,7 @@ public class ArchitectureJpaRules {
private boolean containsIsisEntityListener(final JavaClass[] classes) {
//noinspection deprecation
return Arrays.stream(classes)
- .anyMatch(x -> Objects.equals(x.getFullName(), JpaEntityInjectionPointResolver.class.getName())
+ .anyMatch(x -> Objects.equals(x.getFullName(), IsisEntityListener.class.getName())
|| x.isAssignableTo(IsisEntityListener.class));
}
};
@@ -274,7 +275,7 @@ public class ArchitectureJpaRules {
static DescribedPredicate<JavaClass> areEntities() {
return new DescribedPredicate<JavaClass>("are entities") {
@Override
- public boolean apply(JavaClass input) {
+ public boolean apply(final JavaClass input) {
return input.isAnnotatedWith(Entity.class);
}
};
diff --git a/testing/archtestsupport/applib/src/test/java/org/apache/isis/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java b/testing/archtestsupport/applib/src/test/java/org/apache/isis/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
index ffb5247..b1bb221 100644
--- a/testing/archtestsupport/applib/src/test/java/org/apache/isis/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
+++ b/testing/archtestsupport/applib/src/test/java/org/apache/isis/testing/archtestsupport/applib/entity/jpa/dom/JpaEntity2.java
@@ -32,7 +32,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
-import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPointResolver;
+import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
@Entity
@Table(
@@ -41,7 +41,7 @@ import org.apache.isis.persistence.jpa.applib.integration.JpaEntityInjectionPoin
)
@DomainObject(nature = Nature.ENTITY)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
-@EntityListeners({ JpaEntityInjectionPointResolver.class})
+@EntityListeners({ IsisEntityListener.class})
public abstract class JpaEntity2 implements Comparable<JpaEntity2> {
@Id @Column(name = "id", nullable = false)