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 13:44:27 UTC
[isis] branch master updated: ISIS-2464: renaming the publishing
related facets
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 3ef53ba ISIS-2464: renaming the publishing related facets
3ef53ba is described below
commit 3ef53baae425b27dcf51a73392cad61a8d7b9575
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 24 14:16:57 2020 +0100
ISIS-2464: renaming the publishing related facets
---
.../isis/applib/services/command/Command.java | 4 +-
.../action/ActionAnnotationFacetFactory.java | 8 ++--
...ctionInvocationFacetForDomainEventAbstract.java | 15 ++++---
.../actions/publish/PublishedActionFacet.java | 30 --------------
.../publish/PublishedActionFacetAbstract.java | 40 -------------------
.../publish/command/CommandPublishingFacet.java} | 25 +++++++-----
.../command/CommandPublishingFacetAbstract.java} | 10 +++--
...CommandPublishingFacetForActionAnnotation.java} | 16 ++++----
...shingFacetForActionAnnotationAsConfigured.java} | 6 +--
...mmandPublishingFacetForPropertyAnnotation.java} | 17 ++++----
...ingFacetForPropertyAnnotationAsConfigured.java} | 6 +--
.../CommandPublishingFacetFromConfiguration.java} | 12 +++---
...nPublishingActionFacetForActionAnnotation.java} | 19 +++++----
...ctionFacetForActionAnnotationAsConfigured.java} | 8 ++--
...ionPublishingActionFacetFromConfiguration.java} | 7 ++--
.../execution/ExecutionPublishingFacet.java} | 19 ++++++---
.../ExecutionPublishingFacetAbstract.java} | 10 ++---
...lishingPropertyFacetForPropertyAnnotation.java} | 20 +++++-----
...rtyFacetForPropertyAnnotationAsConfigured.java} | 13 +++---
...nPublishingPropertyFacetFromConfiguration.java} | 10 +++--
.../property/PropertyAnnotationFacetFactory.java | 8 ++--
...tySetterOrClearFacetForDomainEventAbstract.java | 10 ++---
.../metamodel/MetaModelServiceDefault.java | 8 ++--
.../ActionAnnotationFacetFactoryTest_Command.java | 19 ++++-----
...ctionAnnotationFacetFactoryTest_Publishing.java | 46 ++++++++++------------
.../DomainModelTest_usingGoodDomain.java | 4 +-
26 files changed, 158 insertions(+), 232 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java b/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index a69f14e..435e67d 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -364,8 +364,8 @@ public class Command implements HasUniqueId, HasUsername, HasCommandDto {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
- public void setDispatchingEnabled(boolean dispatchingEnabled) {
- Command.this.publishingEnabled = dispatchingEnabled;
+ public void setPublishingEnabled(boolean publishingEnabled) {
+ Command.this.publishingEnabled = publishingEnabled;
}
};
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index ffb1467..12b45ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.actions.action.associateWith.AssociatedWithFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.explicit.ActionExplicitFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.hidden.HiddenFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacetAbstract;
@@ -40,10 +39,11 @@ import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInv
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault;
import org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.typeof.TypeOfFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetForActionAnnotation;
+import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacetForActionAnnotation;
+import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingActionFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.util.EventUtil;
@@ -203,7 +203,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract {
}
// check for @Action(command=...)
- val commandFacet = CommandFacetForActionAnnotation.create(actionIfAny, getConfiguration(), getServiceInjector(), facetedMethod);
+ val commandFacet = CommandPublishingFacetForActionAnnotation.create(actionIfAny, getConfiguration(), getServiceInjector(), facetedMethod);
super.addFacet(commandFacet);
}
@@ -223,7 +223,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract {
}
// check for @Action(publishing=...)
- val facet = PublishedActionFacetForActionAnnotation.create(actionIfAny, getConfiguration(), facetedMethod);
+ val facet = ExecutionPublishingActionFacetForActionAnnotation.create(actionIfAny, getConfiguration(), facetedMethod);
super.addFacet(facet);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 4907284..b84cdee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -52,9 +52,9 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.DomainEventHelper;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
-import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
+import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacet;
+import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
import org.apache.isis.core.metamodel.services.ixn.InteractionDtoServiceInternal;
@@ -161,8 +161,8 @@ implements ImperativeFacet {
val interaction = interactionContext.getInteractionElseFail();
val command = interaction.getCommand();
- command.updater().setDispatchingEnabled(
- CommandFacet.isDispatchingEnabled(getFacetHolder()));
+ command.updater().setPublishingEnabled(
+ CommandPublishingFacet.isPublishingEnabled(getFacetHolder()));
val actionId = owningAction.getIdentifier().toClassAndNameIdentityString();
log.debug("about to invoke action {}", actionId);
@@ -216,9 +216,8 @@ implements ImperativeFacet {
setCommandResultIfEntity(command, returnedAdapter);
// publish (if not a contributed association, query-only mixin)
- val publishedActionFacet = getIdentified().getFacet(PublishedActionFacet.class);
- if (publishedActionFacet != null) {
- getExecutionDispatcher().publishActionInvocation(priorExecution);
+ if (ExecutionPublishingFacet.isPublishingEnabled(getIdentified())) {
+ getExecutionPublisher().publishActionInvocation(priorExecution);
}
return filteredIfRequired(returnedAdapter, interactionInitiatedBy);
@@ -372,7 +371,7 @@ implements ImperativeFacet {
return serviceRegistry.lookupServiceElseFail(MetricsService.class);
}
- private ExecutionPublisher getExecutionDispatcher() {
+ private ExecutionPublisher getExecutionPublisher() {
return serviceRegistry.lookupServiceElseFail(ExecutionPublisher.class);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/publish/PublishedActionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/publish/PublishedActionFacet.java
deleted file mode 100644
index d6a9661..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/publish/PublishedActionFacet.java
+++ /dev/null
@@ -1,30 +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.core.metamodel.facets.actions.publish;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-
-/**
- * Indicates that the invocation of action should be published, specifying the means by which a
- * canonical event representing this invocation should be created.
- */
-public interface PublishedActionFacet extends Facet {
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/publish/PublishedActionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/publish/PublishedActionFacetAbstract.java
deleted file mode 100644
index bc073e0..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/publish/PublishedActionFacetAbstract.java
+++ /dev/null
@@ -1,40 +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.core.metamodel.facets.actions.publish;
-
-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 PublishedActionFacetAbstract
-extends FacetAbstract
-implements PublishedActionFacet {
-
- public static Class<? extends Facet> type() {
- return PublishedActionFacet.class;
- }
-
- public PublishedActionFacetAbstract(final FacetHolder holder) {
- super( type(),
- holder);
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacet.java
similarity index 61%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacet.java
index 8560247..504b9af 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacet.java
@@ -17,31 +17,36 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.command;
+package org.apache.isis.core.metamodel.facets.members.publish.command;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
+import org.apache.isis.applib.services.publishing.spi.CommandSubscriber;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.services.publishing.CommandPublisher;
import lombok.NonNull;
import lombok.val;
/**
- * Indicates that details of the action should be available as a
- * {@link Command} object, if possible.
- *
- * <p>
- * In the standard Apache Isis Programming Model, corresponds to annotating the
- * action method using <tt>@Command</tt>.
+ * Indicates that details of the action invocation or property edit,
+ * captured by a {@link Command},
+ * should be dispatched via {@link CommandPublisher} to all subscribed
+ * {@link CommandSubscriber}s.
+ *
+ * Corresponds to annotating the action method or property using
+ * {@code @Action/@Property(commandPublishing=ENABLED)}
+ *
+ * @since 2.0
*/
-public interface CommandFacet extends Facet {
+public interface CommandPublishingFacet extends Facet {
public CommandDtoProcessor getProcessor();
- public static boolean isDispatchingEnabled(final @NonNull FacetHolder facetHolder) {
+ public static boolean isPublishingEnabled(final @NonNull FacetHolder facetHolder) {
- val commandFacet = facetHolder.getFacet(CommandFacet.class);
+ val commandFacet = facetHolder.getFacet(CommandPublishingFacet.class);
if(commandFacet!=null) {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetAbstract.java
similarity index 90%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacetAbstract.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetAbstract.java
index 9244864..55625c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/command/CommandFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.command;
+package org.apache.isis.core.metamodel.facets.members.publish.command;
import java.util.Map;
@@ -27,15 +27,17 @@ 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 CommandFacetAbstract extends FacetAbstract implements CommandFacet {
+public abstract class CommandPublishingFacetAbstract
+extends FacetAbstract
+implements CommandPublishingFacet {
public static Class<? extends Facet> type() {
- return CommandFacet.class;
+ return CommandPublishingFacet.class;
}
private final CommandDtoProcessor processor;
- public CommandFacetAbstract(
+ public CommandPublishingFacetAbstract(
final CommandDtoProcessor processor,
final FacetHolder holder,
final ServiceInjector servicesInjector) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
similarity index 87%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
index b84a1da..ee02c49 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotation.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.action.command;
+package org.apache.isis.core.metamodel.facets.members.publish.command;
import java.util.Optional;
@@ -27,15 +27,13 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
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.actions.command.CommandFacet;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacetAbstract;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import lombok.val;
-public class CommandFacetForActionAnnotation extends CommandFacetAbstract {
+public class CommandPublishingFacetForActionAnnotation extends CommandPublishingFacetAbstract {
- public static CommandFacet create(
+ public static CommandPublishingFacet create(
final Optional<Action> actionsIfAny,
final IsisConfiguration configuration,
final ServiceInjector servicesInjector,
@@ -67,13 +65,13 @@ public class CommandFacetForActionAnnotation extends CommandFacetAbstract {
}
// else fall through
default:
- return (CommandFacet)new CommandFacetForActionAnnotationAsConfigured(
+ return (CommandPublishingFacet)new CommandPublishingFacetForActionAnnotationAsConfigured(
holder, servicesInjector);
}
case DISABLED:
return null;
case ENABLED:
- return new CommandFacetForActionAnnotation(
+ return new CommandPublishingFacetForActionAnnotation(
processor, holder, servicesInjector);
default:
}
@@ -90,7 +88,7 @@ public class CommandFacetForActionAnnotation extends CommandFacetAbstract {
}
// else fall through
default:
- return CommandFacetFromConfiguration.create(holder, servicesInjector);
+ return CommandPublishingFacetFromConfiguration.create(holder, servicesInjector);
}
});
}
@@ -106,7 +104,7 @@ public class CommandFacetForActionAnnotation extends CommandFacetAbstract {
return false;
}
- CommandFacetForActionAnnotation(
+ CommandPublishingFacetForActionAnnotation(
final CommandDtoProcessor processor,
final FacetHolder holder,
final ServiceInjector servicesInjector) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotationAsConfigured.java
similarity index 81%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotationAsConfigured.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotationAsConfigured.java
index 5719d7d..0e00870 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetForActionAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForActionAnnotationAsConfigured.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.action.command;
+package org.apache.isis.core.metamodel.facets.members.publish.command;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public class CommandFacetForActionAnnotationAsConfigured extends CommandFacetForActionAnnotation {
+public class CommandPublishingFacetForActionAnnotationAsConfigured extends CommandPublishingFacetForActionAnnotation {
- CommandFacetForActionAnnotationAsConfigured(
+ CommandPublishingFacetForActionAnnotationAsConfigured(
final FacetHolder holder,
final ServiceInjector servicesInjector) {
super(null, holder, servicesInjector);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
similarity index 79%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
index 2f183dc..1be066b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotation.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.properties.property.command;
+package org.apache.isis.core.metamodel.facets.members.publish.command;
import java.util.Optional;
@@ -27,15 +27,12 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
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.actions.action.command.CommandFacetFromConfiguration;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacetAbstract;
import lombok.val;
-public class CommandFacetForPropertyAnnotation extends CommandFacetAbstract {
+public class CommandPublishingFacetForPropertyAnnotation extends CommandPublishingFacetAbstract {
- public static CommandFacet create(
+ public static CommandPublishingFacet create(
final Optional<Property> propertyIfAny,
final IsisConfiguration configuration,
final FacetHolder holder,
@@ -61,12 +58,12 @@ public class CommandFacetForPropertyAnnotation extends CommandFacetAbstract {
case NONE:
return null;
default:
- return (CommandFacet)new CommandFacetForPropertyAnnotationAsConfigured(holder, servicesInjector);
+ return (CommandPublishingFacet)new CommandPublishingFacetForPropertyAnnotationAsConfigured(holder, servicesInjector);
}
case DISABLED:
return null;
case ENABLED:
- return new CommandFacetForPropertyAnnotation(holder, processor, servicesInjector);
+ return new CommandPublishingFacetForPropertyAnnotation(holder, processor, servicesInjector);
default:
}
throw new IllegalStateException("command '" + commandReification + "' not recognised");
@@ -76,13 +73,13 @@ public class CommandFacetForPropertyAnnotation extends CommandFacetAbstract {
case NONE:
return null;
default:
- return CommandFacetFromConfiguration.create(holder, servicesInjector);
+ return CommandPublishingFacetFromConfiguration.create(holder, servicesInjector);
}
});
}
- CommandFacetForPropertyAnnotation(
+ CommandPublishingFacetForPropertyAnnotation(
final FacetHolder holder,
final CommandDtoProcessor processor,
final ServiceInjector servicesInjector) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotationAsConfigured.java
similarity index 81%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotationAsConfigured.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotationAsConfigured.java
index 86931de..bf3b5be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/command/CommandFacetForPropertyAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetForPropertyAnnotationAsConfigured.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.properties.property.command;
+package org.apache.isis.core.metamodel.facets.members.publish.command;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public class CommandFacetForPropertyAnnotationAsConfigured extends CommandFacetForPropertyAnnotation {
+public class CommandPublishingFacetForPropertyAnnotationAsConfigured extends CommandPublishingFacetForPropertyAnnotation {
- CommandFacetForPropertyAnnotationAsConfigured(
+ CommandPublishingFacetForPropertyAnnotationAsConfigured(
final FacetHolder holder, final ServiceInjector servicesInjector) {
super(holder, null, servicesInjector);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetFromConfiguration.java
similarity index 72%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetFromConfiguration.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetFromConfiguration.java
index 09c49ce..df51cd54 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/command/CommandFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/command/CommandPublishingFacetFromConfiguration.java
@@ -17,22 +17,20 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.action.command;
+package org.apache.isis.core.metamodel.facets.members.publish.command;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacetAbstract;
-public class CommandFacetFromConfiguration extends CommandFacetAbstract {
+public class CommandPublishingFacetFromConfiguration extends CommandPublishingFacetAbstract {
- public static CommandFacet create(
+ public static CommandPublishingFacet create(
final FacetHolder holder,
final ServiceInjector servicesInjector) {
- return new CommandFacetFromConfiguration(holder, servicesInjector);
+ return new CommandPublishingFacetFromConfiguration(holder, servicesInjector);
}
- private CommandFacetFromConfiguration(
+ private CommandPublishingFacetFromConfiguration(
final FacetHolder holder,
final ServiceInjector servicesInjector) {
super(null, holder, servicesInjector);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
similarity index 81%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
index b9eb60f..965f8b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotation.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.action.publishing;
+package org.apache.isis.core.metamodel.facets.members.publish.execution;
import java.util.Optional;
@@ -26,15 +26,14 @@ import org.apache.isis.applib.annotation.Publishing;
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.actions.publish.PublishedActionFacet;
-import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacetAbstract;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import lombok.val;
-public class PublishedActionFacetForActionAnnotation extends PublishedActionFacetAbstract {
+public class ExecutionPublishingActionFacetForActionAnnotation
+extends ExecutionPublishingFacetAbstract {
- public static PublishedActionFacet create(
+ public static ExecutionPublishingFacet create(
final Optional<Action> actionsIfAny,
final IsisConfiguration configuration,
final FacetHolder holder) {
@@ -44,7 +43,7 @@ public class PublishedActionFacetForActionAnnotation extends PublishedActionFace
return actionsIfAny
.map(Action::executionPublishing)
.filter(publishing -> publishing != Publishing.NOT_SPECIFIED)
- .map(publishing -> {
+ .<ExecutionPublishingFacet>map(publishing -> {
switch (publishing) {
case AS_CONFIGURED:
@@ -58,12 +57,12 @@ public class PublishedActionFacetForActionAnnotation extends PublishedActionFace
}
// else fall through
default:
- return (PublishedActionFacet)new PublishedActionFacetForActionAnnotationAsConfigured(holder);
+ return new ExecutionPublishingActionFacetForActionAnnotationAsConfigured(holder);
}
case DISABLED:
return null;
case ENABLED:
- return new PublishedActionFacetForActionAnnotation(holder);
+ return new ExecutionPublishingActionFacetForActionAnnotation(holder);
default:
}
throw new IllegalStateException("publishing '" + publishing + "' not recognised");
@@ -79,7 +78,7 @@ public class PublishedActionFacetForActionAnnotation extends PublishedActionFace
}
// else fall through
default:
- return new PublishedActionFacetFromConfiguration(holder);
+ return new ExecutionPublishingActionFacetFromConfiguration(holder);
}
});
}
@@ -93,7 +92,7 @@ public class PublishedActionFacetForActionAnnotation extends PublishedActionFace
return actionSemanticsFacet.value().isSafeInNature();
}
- PublishedActionFacetForActionAnnotation(
+ ExecutionPublishingActionFacetForActionAnnotation(
final FacetHolder holder) {
super(holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotationAsConfigured.java
similarity index 75%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotationAsConfigured.java
index d5483b9..6ecf72d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetForActionAnnotationAsConfigured.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.action.publishing;
+package org.apache.isis.core.metamodel.facets.members.publish.execution;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacetAbstract;
-public class PublishedActionFacetFromConfiguration extends PublishedActionFacetAbstract {
+public class ExecutionPublishingActionFacetForActionAnnotationAsConfigured
+extends ExecutionPublishingActionFacetForActionAnnotation {
- public PublishedActionFacetFromConfiguration(
+ public ExecutionPublishingActionFacetForActionAnnotationAsConfigured(
final FacetHolder holder) {
super(holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetFromConfiguration.java
similarity index 79%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetFromConfiguration.java
index 6ea559f..58d3258 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingActionFacetFromConfiguration.java
@@ -17,13 +17,14 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.action.publishing;
+package org.apache.isis.core.metamodel.facets.members.publish.execution;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public class PublishedActionFacetForActionAnnotationAsConfigured extends PublishedActionFacetForActionAnnotation {
+public class ExecutionPublishingActionFacetFromConfiguration
+extends ExecutionPublishingFacetAbstract {
- public PublishedActionFacetForActionAnnotationAsConfigured(
+ public ExecutionPublishingActionFacetFromConfiguration(
final FacetHolder holder) {
super(holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacet.java
similarity index 67%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacet.java
index d8e43c2..f7f08c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.properties.publish;
+package org.apache.isis.core.metamodel.facets.members.publish.execution;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.publishing.spi.ExecutionSubscriber;
@@ -29,15 +29,22 @@ import lombok.NonNull;
import lombok.val;
/**
- * Indicates that editing of the property, captured by an {@link Interaction.Execution},
+ * Indicates that details of the action invocation or property edit,
+ * captured by an {@link Interaction.Execution},
* should be dispatched via {@link ExecutionPublisher} to all subscribed
* {@link ExecutionSubscriber}s.
+ * <p>
+ * Corresponds to annotating the action method or property using
+ * {@code @Action/@Property(executionPublishing=ENABLED)}
+ *
+ * @since 2.0
+ *
*/
-public interface ExecutionDispatchPropertyFacet extends Facet {
+public interface ExecutionPublishingFacet extends Facet {
- public static boolean isDispatchingEnabled(final @NonNull FacetHolder facetHolder) {
- val executionDispatchingFacet = facetHolder.getFacet(ExecutionDispatchPropertyFacet.class);
- return executionDispatchingFacet!=null;
+ public static boolean isPublishingEnabled(final @NonNull FacetHolder facetHolder) {
+ val executionPublishingFacet = facetHolder.getFacet(ExecutionPublishingFacet.class);
+ return executionPublishingFacet!=null;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetAbstract.java
similarity index 78%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacetAbstract.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetAbstract.java
index 10e40c9..cff33d0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/publish/ExecutionDispatchPropertyFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingFacetAbstract.java
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.properties.publish;
+package org.apache.isis.core.metamodel.facets.members.publish.execution;
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 ExecutionDispatchPropertyFacetAbstract
+public abstract class ExecutionPublishingFacetAbstract
extends FacetAbstract
-implements ExecutionDispatchPropertyFacet {
+implements ExecutionPublishingFacet {
public static Class<? extends Facet> type() {
- return ExecutionDispatchPropertyFacet.class;
+ return ExecutionPublishingFacet.class;
}
- public ExecutionDispatchPropertyFacetAbstract(final FacetHolder holder) {
+ public ExecutionPublishingFacetAbstract(final FacetHolder holder) {
super(type(), holder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
similarity index 72%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetForPropertyAnnotation.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
index 4dd56ef..05e0f16 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetForPropertyAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotation.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.properties.property.publishing;
+package org.apache.isis.core.metamodel.facets.members.publish.execution;
import java.util.Optional;
@@ -26,15 +26,13 @@ import org.apache.isis.applib.annotation.Publishing;
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.properties.publish.ExecutionDispatchPropertyFacet;
-import org.apache.isis.core.metamodel.facets.properties.publish.ExecutionDispatchPropertyFacetAbstract;
import lombok.val;
-public class ExecutionDispatchPropertyFacetForPropertyAnnotation
-extends ExecutionDispatchPropertyFacetAbstract {
+public class ExecutionPublishingPropertyFacetForPropertyAnnotation
+extends ExecutionPublishingFacetAbstract {
- public static ExecutionDispatchPropertyFacet create(
+ public static ExecutionPublishingFacet create(
final Optional<Property> propertyIfAny,
final IsisConfiguration configuration,
final FacetHolder holder) {
@@ -52,13 +50,13 @@ extends ExecutionDispatchPropertyFacetAbstract {
case NONE:
return null;
default:
- return (ExecutionDispatchPropertyFacet)
- new PublishedPropertyFacetForPropertyAnnotationAsConfigured(holder);
+ return (ExecutionPublishingFacet)
+ new ExecutionPublishingPropertyFacetForPropertyAnnotationAsConfigured(holder);
}
case DISABLED:
return null;
case ENABLED:
- return new ExecutionDispatchPropertyFacetForPropertyAnnotation(holder);
+ return new ExecutionPublishingPropertyFacetForPropertyAnnotation(holder);
default:
}
return null;
@@ -69,13 +67,13 @@ extends ExecutionDispatchPropertyFacetAbstract {
case NONE:
return null;
default:
- return new ExecutionDispatchPropertyFacetFromConfiguration(holder);
+ return new ExecutionPublishingPropertyFacetFromConfiguration(holder);
}
});
}
- public ExecutionDispatchPropertyFacetForPropertyAnnotation(final FacetHolder holder) {
+ public ExecutionPublishingPropertyFacetForPropertyAnnotation(final FacetHolder holder) {
super(holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotationAsConfigured.java
similarity index 70%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetFromConfiguration.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotationAsConfigured.java
index 9b6c44b..2b3df28 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/ExecutionDispatchPropertyFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetForPropertyAnnotationAsConfigured.java
@@ -16,17 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.isis.core.metamodel.facets.properties.property.publishing;
+package org.apache.isis.core.metamodel.facets.members.publish.execution;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.properties.publish.ExecutionDispatchPropertyFacetAbstract;
-
-public class ExecutionDispatchPropertyFacetFromConfiguration
-extends ExecutionDispatchPropertyFacetAbstract {
- public ExecutionDispatchPropertyFacetFromConfiguration(final FacetHolder holder) {
+public class ExecutionPublishingPropertyFacetForPropertyAnnotationAsConfigured
+extends ExecutionPublishingPropertyFacetForPropertyAnnotation {
+
+ public ExecutionPublishingPropertyFacetForPropertyAnnotationAsConfigured(final FacetHolder holder) {
super(holder);
}
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetFromConfiguration.java
similarity index 75%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotationAsConfigured.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetFromConfiguration.java
index 39796af..585ffaf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/publishing/PublishedPropertyFacetForPropertyAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/publish/execution/ExecutionPublishingPropertyFacetFromConfiguration.java
@@ -16,12 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.properties.property.publishing;
+
+package org.apache.isis.core.metamodel.facets.members.publish.execution;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public class PublishedPropertyFacetForPropertyAnnotationAsConfigured extends ExecutionDispatchPropertyFacetForPropertyAnnotation {
- public PublishedPropertyFacetForPropertyAnnotationAsConfigured(final FacetHolder holder) {
+public class ExecutionPublishingPropertyFacetFromConfiguration
+extends ExecutionPublishingFacetAbstract {
+
+ public ExecutionPublishingPropertyFacetFromConfiguration(final FacetHolder holder) {
super(holder);
}
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 9607833..1f5b207 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -36,10 +36,11 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
+import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacetForPropertyAnnotation;
+import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingPropertyFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.object.domainobject.domainevents.PropertyDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.facets.properties.projection.ProjectingFacetFromPropertyAnnotation;
-import org.apache.isis.core.metamodel.facets.properties.property.command.CommandFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.disabled.DisabledFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.fileaccept.FileAcceptFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.hidden.HiddenFacetForPropertyAnnotation;
@@ -55,7 +56,6 @@ import org.apache.isis.core.metamodel.facets.properties.property.modify.Property
import org.apache.isis.core.metamodel.facets.properties.property.modify.PropertySetterFacetForDomainEventFromPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.mustsatisfy.MustSatisfySpecificationFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.notpersisted.NotPersistedFacetForPropertyAnnotation;
-import org.apache.isis.core.metamodel.facets.properties.property.publishing.ExecutionDispatchPropertyFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.regex.RegExFacetForPatternAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.regex.RegExFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
@@ -247,7 +247,7 @@ implements MetaModelRefiner {
}
// check for @Property(command=...)
- val commandFacet = CommandFacetForPropertyAnnotation
+ val commandFacet = CommandPublishingFacetForPropertyAnnotation
.create(propertyIfAny, getConfiguration(), facetHolder, getServiceInjector());
super.addFacet(commandFacet);
@@ -280,7 +280,7 @@ implements MetaModelRefiner {
}
// check for @Property(publishing=...)
- val facet = ExecutionDispatchPropertyFacetForPropertyAnnotation
+ val facet = ExecutionPublishingPropertyFacetForPropertyAnnotation
.create(propertyIfAny, getConfiguration(), holder);
super.addFacet(facet);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
index b4ca3b6..6c52a95 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/modify/PropertySetterOrClearFacetForDomainEventAbstract.java
@@ -35,10 +35,10 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.DomainEventHelper;
import org.apache.isis.core.metamodel.facets.SingleValueFacetAbstract;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
+import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacet;
+import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
-import org.apache.isis.core.metamodel.facets.properties.publish.ExecutionDispatchPropertyFacet;
import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
@@ -260,8 +260,8 @@ extends SingleValueFacetAbstract<Class<? extends PropertyDomainEvent<?,?>>> {
return head.getTarget();
}
- command.updater().setDispatchingEnabled(
- CommandFacet.isDispatchingEnabled(getFacetHolder()));
+ command.updater().setPublishingEnabled(
+ CommandPublishingFacet.isPublishingEnabled(getFacetHolder()));
val propertyId = owningProperty.getIdentifier().toClassAndNameIdentityString();
@@ -291,7 +291,7 @@ extends SingleValueFacetAbstract<Class<? extends PropertyDomainEvent<?,?>>> {
}
// publish (if not a contributed association, query-only mixin)
- val publishedPropertyFacet = getIdentified().getFacet(ExecutionDispatchPropertyFacet.class);
+ val publishedPropertyFacet = getIdentified().getFacet(ExecutionPublishingFacet.class);
if (publishedPropertyFacet != null) {
getExecutionDispatcher().publishPropertyEdit(priorExecution);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 766b8f9..42d371f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -40,7 +40,7 @@ import org.apache.isis.applib.services.metamodel.DomainMember;
import org.apache.isis.applib.services.metamodel.DomainModel;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
+import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureType;
@@ -257,11 +257,11 @@ public class MetaModelServiceDefault implements MetaModelService {
if (objectMemberIfAny == null) {
return null;
}
- final CommandFacet commandFacet = objectMemberIfAny.getFacet(CommandFacet.class);
- if(commandFacet == null) {
+ final CommandPublishingFacet commandPublishingFacet = objectMemberIfAny.getFacet(CommandPublishingFacet.class);
+ if(commandPublishingFacet == null) {
return null;
}
- return commandFacet.getProcessor();
+ return commandPublishingFacet.getProcessor();
}
@Override
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
index 9609ab8..6755b8a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Command.java
@@ -23,15 +23,15 @@ import java.lang.reflect.Method;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
+import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacet;
+import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacetForActionAnnotation;
import lombok.val;
@@ -52,8 +52,7 @@ public class ActionAnnotationFacetFactoryTest_Command extends ActionAnnotationFa
processCommand(facetFactory, new ProcessMethodContext(SomeHasUniqueId.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(CommandFacet.class);
- assertNull(facet);
+ assertFalse(CommandPublishingFacet.isPublishingEnabled(facetedMethod));
}
@Test
@@ -71,8 +70,7 @@ public class ActionAnnotationFacetFactoryTest_Command extends ActionAnnotationFa
processCommand(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(CommandFacet.class);
- assertNull(facet);
+ assertFalse(CommandPublishingFacet.isPublishingEnabled(facetedMethod));
}
@Test
@@ -90,9 +88,9 @@ public class ActionAnnotationFacetFactoryTest_Command extends ActionAnnotationFa
processCommand(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(CommandFacet.class);
+ final Facet facet = facetedMethod.getFacet(CommandPublishingFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof CommandFacetForActionAnnotation);
+ assertTrue(facet instanceof CommandPublishingFacetForActionAnnotation);
}
@@ -111,8 +109,7 @@ public class ActionAnnotationFacetFactoryTest_Command extends ActionAnnotationFa
processCommand(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(CommandFacet.class);
- assertNull(facet);
+ assertFalse(CommandPublishingFacet.isPublishingEnabled(facetedMethod));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
index 4a017de..8162970 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Publishing.java
@@ -23,8 +23,8 @@ import java.lang.reflect.Method;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
@@ -32,10 +32,10 @@ import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration;
-import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
+import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingActionFacetForActionAnnotation;
+import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingActionFacetFromConfiguration;
+import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacet;
import lombok.val;
@@ -54,8 +54,7 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
processPublishing(facetFactory, new ProcessMethodContext(SomeHasUniqueId.class, null, actionMethod, mockMethodRemover, facetedMethod));
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
- assertNull(facet);
+ assertFalse(ExecutionPublishingFacet.isPublishingEnabled(facetedMethod));
expectNoMethodsRemoved();
}
@@ -74,8 +73,7 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
- assertNull(facet);
+ assertFalse(ExecutionPublishingFacet.isPublishingEnabled(facetedMethod));
}
@Test
@@ -92,9 +90,9 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
+ final Facet facet = facetedMethod.getFacet(ExecutionPublishingFacet.class);
assertNotNull(facet);
- final PublishedActionFacetFromConfiguration facetImpl = (PublishedActionFacetFromConfiguration) facet;
+ final ExecutionPublishingActionFacetFromConfiguration facetImpl = (ExecutionPublishingActionFacetFromConfiguration) facet;
_Blackhole.consume(facetImpl);
}
@@ -123,8 +121,7 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
- assertNull(facet);
+ assertFalse(ExecutionPublishingFacet.isPublishingEnabled(facetedMethod));
expectNoMethodsRemoved();
@@ -143,9 +140,9 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
+ final Facet facet = facetedMethod.getFacet(ExecutionPublishingFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof PublishedActionFacetFromConfiguration);
+ assertTrue(facet instanceof ExecutionPublishingActionFacetFromConfiguration);
}
@Test
@@ -164,8 +161,7 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
processPublishing(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
- assertNull(facet);
+ assertFalse(ExecutionPublishingFacet.isPublishingEnabled(facetedMethod));
expectNoMethodsRemoved();
}
@@ -191,9 +187,9 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
processPublishing(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
+ final Facet facet = facetedMethod.getFacet(ExecutionPublishingFacet.class);
assertNotNull(facet);
- final PublishedActionFacetForActionAnnotation facetImpl = (PublishedActionFacetForActionAnnotation) facet;
+ final ExecutionPublishingActionFacetForActionAnnotation facetImpl = (ExecutionPublishingActionFacetForActionAnnotation) facet;
_Blackhole.consume(facetImpl);
expectNoMethodsRemoved();
@@ -228,8 +224,7 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
processPublishing(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
- assertNull(facet);
+ assertFalse(ExecutionPublishingFacet.isPublishingEnabled(facetedMethod));
expectNoMethodsRemoved();
@@ -254,9 +249,9 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
processPublishing(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
+ final Facet facet = facetedMethod.getFacet(ExecutionPublishingFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof PublishedActionFacetForActionAnnotation);
+ assertTrue(facet instanceof ExecutionPublishingActionFacetForActionAnnotation);
expectNoMethodsRemoved();
}
@@ -281,9 +276,9 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
processPublishing(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
+ final Facet facet = facetedMethod.getFacet(ExecutionPublishingFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof PublishedActionFacetForActionAnnotation);
+ assertTrue(facet instanceof ExecutionPublishingActionFacetForActionAnnotation);
}
@Test
@@ -306,8 +301,7 @@ public class ActionAnnotationFacetFactoryTest_Publishing extends ActionAnnotatio
processPublishing(facetFactory, new ProcessMethodContext(Customer.class, null, actionMethod, mockMethodRemover, facetedMethod));
// then
- final Facet facet = facetedMethod.getFacet(PublishedActionFacet.class);
- assertNull(facet);
+ assertFalse(ExecutionPublishingFacet.isPublishingEnabled(facetedMethod));
}
}
\ No newline at end of file
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 9ceff06..0f67208 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacet;
+import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacet;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
import org.apache.isis.schema.metamodel.v2.DomainClassDto;
@@ -173,7 +173,7 @@ class DomainModelTest_usingGoodDomain {
// -- HELPER
private void assertHasPublishedActionFacet(FacetHolder facetHolder) {
- val facet = facetHolder.getFacet(PublishedActionFacet.class);
+ val facet = facetHolder.getFacet(ExecutionPublishingFacet.class);
assertNotNull(facet);
}