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 2020/11/24 14:29:45 UTC
[isis] branch master updated: ISIS-2464: more facet renaming
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 3fbcbf0 ISIS-2464: more facet renaming
3fbcbf0 is described below
commit 3fbcbf0d58d4ead0e1cf6fdef0dcfb08e838eb3c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 24 15:29:30 2020 +0100
ISIS-2464: more facet renaming
---
.../DomainObjectAnnotationFacetFactory.java | 18 ++++-----
...ePublishingFacetForDomainObjectAnnotation.java} | 27 ++++++-------
...acetForDomainObjectAnnotationAsConfigured.java} | 8 ++--
...ityChangePublishingFacetFromConfiguration.java} | 14 ++++---
.../entitychange/EntityChangePublishingFacet.java} | 33 ++++++++--------
.../EntityChangePublishingFacetAbstract.java} | 40 ++++----------------
.../EntityChangePublishingFacetImpl.java} | 10 ++---
.../DomainObjectAnnotationFacetFactoryTest.java | 44 +++++++++++-----------
.../changetracking/EntityChangeTrackerDefault.java | 10 ++---
9 files changed, 88 insertions(+), 116 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 927ebe8..3ea3e70 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -52,7 +52,6 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
import org.apache.isis.core.metamodel.facets.PostConstructMethodCache;
import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
-import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedLifecycleEventFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedLifecycleEventFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.callbacks.PersistedLifecycleEventFacetForDomainObjectAnnotation;
@@ -60,7 +59,6 @@ import org.apache.isis.core.metamodel.facets.object.callbacks.PersistingLifecycl
import org.apache.isis.core.metamodel.facets.object.callbacks.RemovingLifecycleEventFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedLifecycleEventFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingLifecycleEventFacetForDomainObjectAnnotation;
-import org.apache.isis.core.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.choices.ChoicesFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
@@ -68,6 +66,7 @@ import org.apache.isis.core.metamodel.facets.object.domainobject.domainevents.Co
import org.apache.isis.core.metamodel.facets.object.domainobject.domainevents.PropertyDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.EditingEnabledFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotation;
+import org.apache.isis.core.metamodel.facets.object.domainobject.entitychangepublishing.EntityChangePublishingFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.recreatable.RecreatableObjectFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.mixin.MetaModelValidatorForMixinTypes;
@@ -117,7 +116,7 @@ implements MetaModelRefiner, PostConstructMethodCache, ObjectSpecIdFacetFactory
@Override
public void process(final ProcessClassContext processClassContext) {
- processAuditing(processClassContext);
+ processEntityChangePublishing(processClassContext);
processAutoComplete(processClassContext);
processBounded(processClassContext);
processEditing(processClassContext);
@@ -128,7 +127,7 @@ implements MetaModelRefiner, PostConstructMethodCache, ObjectSpecIdFacetFactory
}
- void processAuditing(final ProcessClassContext processClassContext) {
+ void processEntityChangePublishing(final ProcessClassContext processClassContext) {
val cls = processClassContext.getCls();
val facetHolder = processClassContext.getFacetHolder();
@@ -142,13 +141,14 @@ implements MetaModelRefiner, PostConstructMethodCache, ObjectSpecIdFacetFactory
return;
}
- // check for @DomainObject(auditing=....)
- val auditing = processClassContext.synthesizeOnType(DomainObject.class).map(DomainObject::entityChangePublishing);
- val auditableFacet = AuditableFacetForDomainObjectAnnotation
- .create(auditing, getConfiguration(), facetHolder);
+ // check for @DomainObject(entityChangePublishing=....)
+ val entityChangePublishing = processClassContext.synthesizeOnType(DomainObject.class)
+ .map(DomainObject::entityChangePublishing);
+ val entityChangePublishingFacet = EntityChangePublishingFacetForDomainObjectAnnotation
+ .create(entityChangePublishing, getConfiguration(), facetHolder);
// then add
- super.addFacet(auditableFacet);
+ super.addFacet(entityChangePublishingFacet);
}
// -- AUTO COMPLETE
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
similarity index 70%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
index f09eb39..8565600 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotation.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
+package org.apache.isis.core.metamodel.facets.object.domainobject.entitychangepublishing;
import java.util.Optional;
@@ -26,14 +26,15 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
-import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
+import org.apache.isis.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacetAbstract;
import lombok.val;
-public class AuditableFacetForDomainObjectAnnotation extends AuditableFacetAbstract {
+public class EntityChangePublishingFacetForDomainObjectAnnotation
+extends EntityChangePublishingFacetAbstract {
- public static AuditableFacet create(
+ public static EntityChangePublishingFacet create(
Optional<Publishing> entityChangePublishingIfAny,
IsisConfiguration configuration,
FacetHolder holder) {
@@ -50,25 +51,21 @@ public class AuditableFacetForDomainObjectAnnotation extends AuditableFacetAbstr
return null;
default:
return entityChangePublishingIfAny.isPresent()
- ? new AuditableFacetForDomainObjectAnnotationAsConfigured(holder)
- : new AuditableFacetFromConfiguration(holder);
+ ? new EntityChangePublishingFacetForDomainObjectAnnotationAsConfigured(holder)
+ : new EntityChangePublishingFacetFromConfiguration(holder);
}
case DISABLED:
- // explicitly disable
- return new AuditableFacetForDomainObjectAnnotation(Enablement.DISABLED, holder);
+ return null;
case ENABLED:
- return new AuditableFacetForDomainObjectAnnotation(Enablement.ENABLED, holder);
+ return new EntityChangePublishingFacetForDomainObjectAnnotation(holder);
default:
throw _Exceptions.unmatchedCase(publish);
}
}
- protected AuditableFacetForDomainObjectAnnotation(
- Enablement enablement,
- FacetHolder holder) {
-
- super(holder, enablement);
+ protected EntityChangePublishingFacetForDomainObjectAnnotation(FacetHolder holder) {
+ super(holder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotationAsConfigured.java
similarity index 76%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotationAsConfigured.java
index b213e66..2429a9f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetForDomainObjectAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetForDomainObjectAnnotationAsConfigured.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
+package org.apache.isis.core.metamodel.facets.object.domainobject.entitychangepublishing;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public class AuditableFacetForDomainObjectAnnotationAsConfigured extends AuditableFacetForDomainObjectAnnotation {
+public class EntityChangePublishingFacetForDomainObjectAnnotationAsConfigured extends EntityChangePublishingFacetForDomainObjectAnnotation {
- public AuditableFacetForDomainObjectAnnotationAsConfigured(final FacetHolder facetHolder) {
- super(Enablement.ENABLED, facetHolder);
+ public EntityChangePublishingFacetForDomainObjectAnnotationAsConfigured(final FacetHolder facetHolder) {
+ super(facetHolder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetFromConfiguration.java
similarity index 67%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetFromConfiguration.java
index 53313cf..eacec68 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/auditing/AuditableFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/entitychangepublishing/EntityChangePublishingFacetFromConfiguration.java
@@ -16,21 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.object.domainobject.auditing;
+package org.apache.isis.core.metamodel.facets.object.domainobject.entitychangepublishing;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacetAbstract;
+import org.apache.isis.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacetAbstract;
/**
- * If the domain object has not been annotated with {@link org.apache.isis.applib.annotation.DomainObject} but auditing
+ * If the domain object has not been annotated with
+ * {@link org.apache.isis.applib.annotation.DomainObject} but entity-change-publishing
* has been configured in <tt>application.properties</tt>.
*/
-public class AuditableFacetFromConfiguration extends AuditableFacetAbstract {
+public class EntityChangePublishingFacetFromConfiguration
+extends EntityChangePublishingFacetAbstract {
- public AuditableFacetFromConfiguration(final FacetHolder facetHolder) {
- super(facetHolder, Enablement.ENABLED);
+ public EntityChangePublishingFacetFromConfiguration(final FacetHolder facetHolder) {
+ super(facetHolder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacet.java
similarity index 58%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacet.java
index 805126e..25a513b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacet.java
@@ -16,36 +16,37 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.object.audit;
+package org.apache.isis.core.metamodel.facets.object.publish.entitychange;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import lombok.val;
/**
- * Corresponds to annotating the class with the {@Code @DomainObject(auditing=ENABLED)} annotation.
+ * Corresponds to annotating the entity class with
+ * {@Code @DomainObject(entityChangePublishing=ENABLED)}.
+ *
+ * @since 2.0
*/
-public interface AuditableFacet extends Facet {
-
- /**
- * Indicates that the object to which this {@link Facet} is
- * attached should <i>not</i> be treated as being audited.
- *
- * <p>
- * Exists to allow implementations that configure auditing for all objects, but which
- * can then be disabled for selected objects (eg using {@link Audited#disabled()} ).
- */
- public boolean isDisabled();
+public interface EntityChangePublishingFacet extends Facet {
- public static boolean isAuditingEnabled(final FacetHolder facetHolder) {
+ public static boolean isPublishingEnabled(final FacetHolder facetHolder) {
if(facetHolder==null) {
return false;
}
- val auditableFacet = facetHolder.getFacet(AuditableFacet.class);
- if(auditableFacet == null || auditableFacet.isDisabled()) {
+
+ if(facetHolder instanceof ObjectSpecification) {
+ if(!((ObjectSpecification)facetHolder).isEntity()) {
+ return false;
+ }
+ }
+
+ val auditableFacet = facetHolder.getFacet(EntityChangePublishingFacet.class);
+ if(auditableFacet == null) {
return false;
}
return true;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacetAbstract.java
similarity index 52%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacetAbstract.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacetAbstract.java
index a022c50..ce102bc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacetAbstract.java
@@ -16,46 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.object.audit;
-
-
-import java.util.Map;
+package org.apache.isis.core.metamodel.facets.object.publish.entitychange;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-public abstract class AuditableFacetAbstract extends FacetAbstract implements
-AuditableFacet {
+public abstract class EntityChangePublishingFacetAbstract
+extends FacetAbstract
+implements EntityChangePublishingFacet {
public static Class<? extends Facet> type() {
- return AuditableFacet.class;
- }
-
- public enum Enablement {
- DISABLED,
- ENABLED;
-
- public static Enablement ifDisabled(boolean disabled) {
- return disabled ? DISABLED: ENABLED;
- }
- }
-
- private final Enablement enablement;
-
- public AuditableFacetAbstract(final FacetHolder facetHolder, final Enablement enablement) {
- super(AuditableFacetAbstract.type(), facetHolder, Derivation.NOT_DERIVED);
- this.enablement = enablement;
- }
-
- @Override
- public boolean isDisabled() {
- return this.enablement == Enablement.DISABLED;
+ return EntityChangePublishingFacet.class;
}
- @Override public void appendAttributesTo(final Map<String, Object> attributeMap) {
- super.appendAttributesTo(attributeMap);
- attributeMap.put("enablement", enablement);
+ public EntityChangePublishingFacetAbstract(final FacetHolder facetHolder) {
+ super(EntityChangePublishingFacetAbstract.type(), facetHolder, Derivation.NOT_DERIVED);
}
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacetImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacetImpl.java
similarity index 76%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacetImpl.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacetImpl.java
index ea70ff0..6e1f060 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/audit/AuditableFacetImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/publish/entitychange/EntityChangePublishingFacetImpl.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.object.audit;
+package org.apache.isis.core.metamodel.facets.object.publish.entitychange;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+public class EntityChangePublishingFacetImpl
+extends EntityChangePublishingFacetAbstract {
-public class AuditableFacetImpl extends AuditableFacetAbstract {
-
- public AuditableFacetImpl(final FacetHolder facetHolder, final Enablement enablement) {
- super(facetHolder, enablement);
+ public EntityChangePublishingFacetImpl(final FacetHolder facetHolder) {
+ super(facetHolder);
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index ac98b53..78345da 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -41,20 +41,20 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext;
-import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
-import org.apache.isis.core.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotation;
-import org.apache.isis.core.metamodel.facets.object.domainobject.auditing.AuditableFacetForDomainObjectAnnotationAsConfigured;
-import org.apache.isis.core.metamodel.facets.object.domainobject.auditing.AuditableFacetFromConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.choices.ChoicesFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetForDomainObjectAnnotationAsConfigured;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration;
+import org.apache.isis.core.metamodel.facets.object.domainobject.entitychangepublishing.EntityChangePublishingFacetForDomainObjectAnnotation;
+import org.apache.isis.core.metamodel.facets.object.domainobject.entitychangepublishing.EntityChangePublishingFacetForDomainObjectAnnotationAsConfigured;
+import org.apache.isis.core.metamodel.facets.object.domainobject.entitychangepublishing.EntityChangePublishingFacetFromConfiguration;
import org.apache.isis.core.metamodel.facets.object.domainobject.objectspecid.ObjectSpecIdFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.recreatable.RecreatableObjectFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
+import org.apache.isis.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -108,7 +108,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
}
- public static class Auditing extends DomainObjectAnnotationFacetFactoryTest {
+ public static class EntityChangePublishing extends DomainObjectAnnotationFacetFactoryTest {
@DomainObject(entityChangePublishing = org.apache.isis.applib.annotation.Publishing.AS_CONFIGURED)
class CustomerWithDomainObjectAndAuditingSetToAsConfigured {
@@ -127,25 +127,25 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
allowingEntityChangePublishingToReturn(PublishingPolicies.EntityChangePublishingPolicy.ALL);
- facetFactory.processAuditing(new ProcessClassContext(HasUniqueId.class, mockMethodRemover, facetHolder));
+ facetFactory.processEntityChangePublishing(new ProcessClassContext(HasUniqueId.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
+ final Facet facet = facetHolder.getFacet(EntityChangePublishingFacet.class);
Assert.assertNull(facet);
expectNoMethodsRemoved();
}
- public static class WhenNotAnnotatedAndDefaultsFromConfiguration extends Auditing {
+ public static class WhenNotAnnotatedAndDefaultsFromConfiguration extends EntityChangePublishing {
@Test
public void configured_value_set_to_all() {
allowingEntityChangePublishingToReturn(PublishingPolicies.EntityChangePublishingPolicy.ALL);
- facetFactory.processAuditing(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
+ facetFactory.processEntityChangePublishing(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
+ final Facet facet = facetHolder.getFacet(EntityChangePublishingFacet.class);
assertThat(facet, is(notNullValue()));
- Assert.assertTrue(facet instanceof AuditableFacetFromConfiguration);
+ Assert.assertTrue(facet instanceof EntityChangePublishingFacetFromConfiguration);
expectNoMethodsRemoved();
}
@@ -156,7 +156,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(DomainObjectAnnotationFacetFactoryTest.Customer.class, mockMethodRemover, facetHolder));
- final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ final EntityChangePublishingFacet facet = facetHolder.getFacet(EntityChangePublishingFacet.class);
Assert.assertNull(facet);
expectNoMethodsRemoved();
@@ -164,7 +164,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
}
- public static class WithDomainObjectAnnotationWithAuditingSetToAsConfigured extends Auditing {
+ public static class WithDomainObjectAnnotationWithAuditingSetToAsConfigured extends EntityChangePublishing {
@Test
public void configured_value_set_to_all() {
@@ -172,9 +172,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAuditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
+ final Facet facet = facetHolder.getFacet(EntityChangePublishingFacet.class);
Assert.assertNotNull(facet);
- Assert.assertTrue(facet instanceof AuditableFacetForDomainObjectAnnotationAsConfigured);
+ Assert.assertTrue(facet instanceof EntityChangePublishingFacetForDomainObjectAnnotationAsConfigured);
expectNoMethodsRemoved();
}
@@ -185,7 +185,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAuditingSetToAsConfigured.class, mockMethodRemover, facetHolder));
- final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ final EntityChangePublishingFacet facet = facetHolder.getFacet(EntityChangePublishingFacet.class);
Assert.assertNull(facet);
expectNoMethodsRemoved();
@@ -193,7 +193,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
}
- public static class WithDomainObjectAnnotationWithAuditingSetToEnabled extends Auditing {
+ public static class WithDomainObjectAnnotationWithAuditingSetToEnabled extends EntityChangePublishing {
@Test
public void irrespective_of_configured_value() {
@@ -201,16 +201,16 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAuditingSetToEnabled.class, mockMethodRemover, facetHolder));
- final Facet facet = facetHolder.getFacet(AuditableFacet.class);
+ final Facet facet = facetHolder.getFacet(EntityChangePublishingFacet.class);
Assert.assertNotNull(facet);
- Assert.assertTrue(facet instanceof AuditableFacetForDomainObjectAnnotation);
+ Assert.assertTrue(facet instanceof EntityChangePublishingFacetForDomainObjectAnnotation);
expectNoMethodsRemoved();
}
}
- public static class WithDomainObjectAnnotationWithAuditingSetToDisabled extends Auditing {
+ public static class WithDomainObjectAnnotationWithAuditingSetToDisabled extends EntityChangePublishing {
@Test
public void irrespective_of_configured_value() {
@@ -218,10 +218,10 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory.process(new ProcessClassContext(CustomerWithDomainObjectAndAuditingSetToDisabled.class, mockMethodRemover, facetHolder));
- final AuditableFacet facet = facetHolder.getFacet(AuditableFacet.class);
+ final EntityChangePublishingFacet facet = facetHolder.getFacet(EntityChangePublishingFacet.class);
Assert.assertNotNull(facet);
- Assert.assertEquals(true, facet.isDisabled());
+ //Assert.assertEquals(true, facet.isDisabled());
Assert.assertEquals(true, facet.alwaysReplace());
Assert.assertEquals(false, facet.isFallback());
Assert.assertEquals(false, facet.isDerived());
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
index d8c5b63..421d01e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/changetracking/EntityChangeTrackerDefault.java
@@ -50,7 +50,6 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.internal.factory._InstanceUtil;
-import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
import org.apache.isis.core.metamodel.facets.object.callbacks.LifecycleEventFacet;
import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
@@ -65,6 +64,7 @@ import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedCallbackFac
import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatedLifecycleEventFacet;
import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingCallbackFacet;
import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingLifecycleEventFacet;
+import org.apache.isis.core.metamodel.facets.object.publish.entitychange.EntityChangePublishingFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects.EntityUtil;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -163,12 +163,8 @@ implements
+ "since changedObjectPropertiesRef was already prepared (memoized) for auditing.");
}
- val spec = adapter.getSpecification();
- if(!spec.isEntity()) {
- return false;
- }
- if(!AuditableFacet.isAuditingEnabled(spec)) {
- return false; // ignore entities that are not enabled for auditing
+ if(!EntityChangePublishingFacet.isPublishingEnabled(adapter.getSpecification())) {
+ return false; // ignore entities that are not enabled for entity change publishing
}
return true;