You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/08/27 15:22:28 UTC

[isis] branch master updated: ISIS-2774: removes config option ...action.explicit

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 0e73f13  ISIS-2774: removes config option ...action.explicit
0e73f13 is described below

commit 0e73f13ab3658ec37a27f9b2e264826774ac8fb5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Aug 27 17:21:19 2021 +0200

    ISIS-2774: removes config option ...action.explicit
    
    also fine-tuning names
    also adding mignotes
---
 .gitignore                                         |  3 ++
 .../modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc | 32 ++++++++++++++++++++++
 .../isis/applib/annotation/Introspection.java      |  4 +--
 .../apache/isis/core/config/IsisConfiguration.java | 15 ++++------
 .../metamodel/facets/ObjectTypeFacetFactory.java   |  7 +++--
 .../ignore/javalang/RemoveMethodsFacetFactory.java |  6 ++--
 .../introspection/IntrospectionPolicyFacet.java    |  6 ++--
 .../MethodPrefixBasedFacetFactoryAbstract.java     | 25 +++++++++++++----
 .../core/metamodel/spec/feature/ObjectMember.java  | 14 ++++++++--
 .../specloader/specimpl/FacetedMethodsBuilder.java | 26 +++++++-----------
 .../specloader/specimpl/ObjectActionDefault.java   | 11 ++++++++
 .../specloader/specimpl/ObjectActionMixedIn.java   |  9 ++++++
 .../specimpl/OneToManyAssociationDefault.java      | 11 +++++++-
 .../specimpl/OneToManyAssociationMixedIn.java      | 10 +++++++
 .../specimpl/OneToOneAssociationDefault.java       | 11 ++++++++
 .../specimpl/OneToOneAssociationMixedIn.java       | 10 +++++++
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  2 +-
 .../specimpl/ObjectAssociationAbstractTest.java    | 21 ++++++++------
 ...ObjectAssociationAbstractTest_alwaysHidden.java |  5 ++++
 .../demo/domain/src/main/resources/application.yml |  2 +-
 .../isis/testdomain/config/IsisConfigBeanTest.java |  9 +++---
 .../config/IsisConfigBeanTest_usingHeadless.java   |  6 ++--
 .../resources/application-config-test.properties   |  2 +-
 ...nModelTest_usingBadDomain_noActionEnforced.java | 26 ++++++++++--------
 24 files changed, 197 insertions(+), 76 deletions(-)

diff --git a/.gitignore b/.gitignore
index fe4da21..b03d936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,9 @@ gradlew.*
 /.gradle/
 **/build/
 
+#Asciidoctor Plugins
+.asciidoctorconfig.adoc
+
 #Lombok (don't accept config alterations, might lead to a maintenance hell)
 lombok.config
 
diff --git a/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
index e6e992f..4735f32 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
@@ -5,3 +5,35 @@
 
 (This page will be added to as development progresses).
 
+== Programming Model
+
+[cols="2a,3a", options="header"]
+
+|===
+
+| previously
+| new
+
+| had introspection control via global config option 
+`isis.core.meta-model.annotation.action.explicit=true/false`
+| use `@DomainObject(introspection=...)` instead ... 
+as it allows to set the policy on a per class basis, and also introduces support 
+for non-public class member introspection 
+
+|===
+
+== Configuration
+
+Following configuration options changed:
+[source,java]
+----
+// removed:
+isis.core.meta-model.annotation.action.explicit=true/false
+
+// semantic equivalent replacement for i.c.m.a.action.explicit=false 
+isis.core.meta-model.introspector.policy=ANNOTATION_OPTIONAL
+
+// semantic equivalent replacement for i.c.m.a.action.explicit=true 
+isis.core.meta-model.introspector.policy=ANNOTATION_REQUIRED
+
+----
\ No newline at end of file
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Introspection.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Introspection.java
index c951a53..c478768 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Introspection.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Introspection.java
@@ -59,7 +59,7 @@ public enum Introspection {
      * Introspect public members only, while
      * presence of at least one appropriate domain annotation is enforced.
      */
-    ANNOTATION_ENFORCED,
+    ANNOTATION_REQUIRED,
 
     /**
      * Introspect public members only, while
@@ -96,7 +96,7 @@ public enum Introspection {
          * Introspect public members only, while
          * presence of at least one appropriate domain annotation is enforced.
          */
-        ANNOTATION_ENFORCED(
+        ANNOTATION_REQUIRED(
                 EncapsulationPolicy.ONLY_PUBLIC_MEMBERS_SUPPORTED,
                 MemberAnnotationPolicy.MEMBER_ANNOTATIONS_REQUIRED),
 
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index bdfc3d4..cba3bee 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -68,6 +68,8 @@ import org.apache.isis.applib.services.userreg.UserRegistrationService;
 import org.apache.isis.applib.services.userui.UserMenu;
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.config.IsisConfiguration.Core;
+import org.apache.isis.core.config.IsisConfiguration.Viewer;
 import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
 import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
 import org.apache.isis.core.config.metamodel.facets.PublishingPolicies.ActionPublishingPolicy;
@@ -713,13 +715,6 @@ public class IsisConfiguration {
                  */
                 private ActionPublishingPolicy executionPublishing = ActionPublishingPolicy.NONE;
 
-                /**
-                 * Whether or not a public method needs to be annotated with
-                 * @{@link org.apache.isis.applib.annotation.Action} in order to be picked up as an action in the
-                 * metamodel.
-                 */
-                private boolean explicit = false;
-
                 private final DomainEvent domainEvent = new DomainEvent();
                 @Data
                 public static class DomainEvent {
@@ -1313,9 +1308,9 @@ public class IsisConfiguration {
                  * <p>
                  * Default is to only introspect public class members, while annotating these is optional.
                  */
-                private IntrospectionPolicy introspectionPolicy;
-                public IntrospectionPolicy getIntrospectionPolicy() {
-                    return Optional.ofNullable(introspectionPolicy)
+                private IntrospectionPolicy policy;
+                public IntrospectionPolicy getPolicy() {
+                    return Optional.ofNullable(policy)
                             .orElse(IntrospectionPolicy.ANNOTATION_OPTIONAL);
                 }
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
index 75b0e03..47fc7a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ObjectTypeFacetFactory.java
@@ -22,10 +22,11 @@ import org.apache.isis.applib.annotation.Introspection.IntrospectionPolicy;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 
+/**
+ * Processes logicalTypeName and determines the effective IntrospectionPolicy.
+ */
 public interface ObjectTypeFacetFactory extends FacetFactory {
 
-    // -- process logicalTypeName
-
     public static class ProcessObjectTypeContext
     extends AbstractProcessWithClsContext<FacetHolder> {
         public ProcessObjectTypeContext(
@@ -39,7 +40,7 @@ public interface ObjectTypeFacetFactory extends FacetFactory {
         public IntrospectionPolicy getIntrospectionPolicy() {
             throw _Exceptions.unsupportedOperation(
                     "ProcessObjectTypeContext does not support getIntrospectionPolicy() "
-                    + "as eg. the EncapsulationPolicy is not yet available this early "
+                    + "as the IntrospectionPolicy is not yet available this early "
                     + "in the meta-model processing stage.");
         }
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
index 3c6163d..d9d336e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ignore/javalang/RemoveMethodsFacetFactory.java
@@ -82,8 +82,8 @@ public class RemoveMethodsFacetFactory extends FacetFactoryAbstract {
                 ? ((ObjectSpecification)facetHolder).getBeanSort().isMixin()
                 : false;
 
-        val config = processClassContext.getFacetHolder().getMetaModelContext().getConfiguration();
-        val isExplicitAction = config.getApplib().getAnnotation().getAction().isExplicit();
+        val isActionAnnotationRequired = processClassContext.getIntrospectionPolicy()
+                .getMemberAnnotationPolicy().isMemberAnnotationsRequired();
 
         getMethodCache()
         .streamPublicMethods(cls)
@@ -102,7 +102,7 @@ public class RemoveMethodsFacetFactory extends FacetFactoryAbstract {
 
             // remove property setter, if has not explicitly an @Action annotation
             // this code block is not required, if @Action annotations are explicit per config
-            if(!isExplicitAction
+            if(!isActionAnnotationRequired
                     && method.getParameterCount() == 1
                     && method.getName().startsWith("set")
                     && method.getName().length() > 3) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
index a43234f..7535987 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/introspection/IntrospectionPolicyFacet.java
@@ -42,10 +42,10 @@ public interface IntrospectionPolicyFacet extends Facet {
             return IntrospectionPolicy.ENCAPSULATION_ENABLED;
         case ANNOTATION_OPTIONAL:
             return IntrospectionPolicy.ANNOTATION_OPTIONAL;
-        case ANNOTATION_ENFORCED:
-            return IntrospectionPolicy.ANNOTATION_ENFORCED;
+        case ANNOTATION_REQUIRED:
+            return IntrospectionPolicy.ANNOTATION_REQUIRED;
         case AS_CONFIGURED:
-            return isisConfig.getCore().getMetaModel().getIntrospector().getIntrospectionPolicy();
+            return isisConfig.getCore().getMetaModel().getIntrospector().getPolicy();
         case NOT_SPECIFIED:
             throw _Exceptions.unexpectedCodeReach(); // there must be no such facet that returns such a case
         default:
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
index f84e959..a8864f5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodPrefixBasedFacetFactoryAbstract.java
@@ -26,6 +26,8 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.MixedIn;
+import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
+import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract;
 import org.apache.isis.core.metamodel.specloader.validator.MetaModelVisitingValidatorAbstract;
 import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
 
@@ -63,14 +65,14 @@ implements MethodPrefixBasedFacetFactory {
     @Override
     public void refineProgrammingModel(final ProgrammingModel programmingModel) {
 
-        if(orphanValidation == OrphanValidation.DONT_VALIDATE
-                || getConfiguration().getApplib().getAnnotation().getAction().isExplicit()) {
+        if(orphanValidation == OrphanValidation.DONT_VALIDATE) {
             return;
         }
 
         val noParamsOnly = getConfiguration().getCore().getMetaModel().getValidator().isNoParamsOnly();
 
-        programmingModel.addValidator(new MetaModelVisitingValidatorAbstract(programmingModel.getMetaModelContext()) {
+        programmingModel
+        .addValidator(new MetaModelVisitingValidatorAbstract(programmingModel.getMetaModelContext()) {
 
             @Override
             public String toString() {
@@ -84,12 +86,23 @@ implements MethodPrefixBasedFacetFactory {
                     return;
                 }
 
+                if(spec instanceof ObjectSpecificationAbstract
+                        && ((ObjectSpecificationAbstract)spec).getIntrospectionPolicy()
+                            .getMemberAnnotationPolicy().isMemberAnnotationsRequired()) {
+                    return; // skip orphaned method validation if annotations are required
+                }
+
+
                 // as an optimization only checking declared members (skipping inherited ones)
 
                 // ensure accepted actions do not have any of the reserved prefixes
                 spec.streamDeclaredActions(MixedIn.EXCLUDED)
                 .forEach(objectAction -> {
 
+                    if(((ObjectMemberAbstract)objectAction).isExplicitlyAnnotated()) {
+                        return; // thats always allowed, check next
+                    }
+
                     val actionId = objectAction.getId();
 
                     for (val prefix : prefixes) {
@@ -100,10 +113,10 @@ implements MethodPrefixBasedFacetFactory {
                                     objectAction.getParameterCount() > 0
                                             && noParamsOnly
                                             && (MethodLiteralConstants.HIDE_PREFIX.equals(prefix)
-                                            || MethodLiteralConstants.DISABLE_PREFIX.equals(prefix))
+                                                    || MethodLiteralConstants.DISABLE_PREFIX.equals(prefix))
                                             ? " (such methods must have no parameters, '"
-                                            + "isis.core.meta-model.validator.no-params-only"
-                                            + "' config property)"
+                                                + "isis.core.meta-model.validator.no-params-only"
+                                                + "' config property)"
                                             : "";
 
                             val messageFormat = "%s#%s: has prefix %s, is probably intended as a supporting method "
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
index df74ffd..573518b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
@@ -52,7 +52,7 @@ public interface ObjectMember extends ObjectFeature {
      * Return the help text for this member - the field or action - to
      * complement the description.
      *
-     * @see #getDescription()
+     * @see #getDescription(java.util.function.Supplier)
      */
     String getHelp();
 
@@ -142,6 +142,14 @@ public interface ObjectMember extends ObjectFeature {
         return false;
     }
 
+    /**
+     * Whether this member has at least one appropriate domain annotation.
+     * @apiNote such that meta-model verification can reason about why this
+     * member was discovered during introspection
+     */
+    boolean isExplicitlyAnnotated();
+
+
     // /////////////////////////////////////////////////////////////
     // Debugging
     // /////////////////////////////////////////////////////////////
@@ -184,7 +192,7 @@ public interface ObjectMember extends ObjectFeature {
             super(null);
         }
 
-        public static boolean isInstanceOf(Throwable throwable) {
+        public static boolean isInstanceOf(final Throwable throwable) {
             return throwable instanceof HiddenException;
         }
 
@@ -197,7 +205,7 @@ public interface ObjectMember extends ObjectFeature {
             super(message, null);
         }
 
-        public static boolean isInstanceOf(Throwable throwable) {
+        public static boolean isInstanceOf(final Throwable throwable) {
             return throwable instanceof DisabledException;
         }
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 007c708..8b6207d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -55,6 +55,7 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
 import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
 import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
+import org.apache.isis.core.metamodel.methods.MethodLiteralConstants;
 import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
 import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
 import org.apache.isis.core.metamodel.specloader.typeextract.TypeExtractor;
@@ -67,9 +68,6 @@ import lombok.extern.log4j.Log4j2;
 public class FacetedMethodsBuilder
 implements HasMetaModelContext {
 
-    private static final String GET_PREFIX = "get";
-    private static final String IS_PREFIX = "is";
-
     /* thread-safety ... make sure every methodsRemaining access is synchronized! */
     private static final class ConcurrentMethodRemover implements MethodRemover {
 
@@ -124,7 +122,7 @@ implements HasMetaModelContext {
 
     private final ClassSubstitutorRegistry classSubstitutorRegistry;
 
-    private final boolean explicitAnnotationsForActions;
+    private final boolean isMemberAnnotationsRequired;
 
     // -- CONSTRUCTOR
 
@@ -142,9 +140,8 @@ implements HasMetaModelContext {
         this.inspectedTypeSpec = inspectedTypeSpec;
         this.introspectedClass = inspectedTypeSpec.getCorrespondingClass();
 
-        this.explicitAnnotationsForActions =
-                introspectionPolicy().getEncapsulationPolicy().isEncapsulatedMembersSupported()
-                    || getConfiguration().getApplib().getAnnotation().getAction().isExplicit();
+        this.isMemberAnnotationsRequired =
+                introspectionPolicy().getMemberAnnotationPolicy().isMemberAnnotationsRequired();
 
         val methodCache = _MethodCache.getInstance();
         val methodsRemaining = introspectionPolicy().getEncapsulationPolicy().isEncapsulatedMembersSupported()
@@ -243,8 +240,10 @@ implements HasMetaModelContext {
         val propertyAccessors = _Lists.<Method>newArrayList();
         getFacetProcessor().findAndRemovePropertyAccessors(methodRemover, propertyAccessors);
 
-        findAndRemovePrefixedNonVoidMethods(GET_PREFIX, Object.class, 0, propertyAccessors::add);
-        findAndRemovePrefixedNonVoidMethods(IS_PREFIX, Boolean.class, 0, propertyAccessors::add);
+        findAndRemovePrefixedNonVoidMethods(
+                MethodLiteralConstants.GET_PREFIX, Object.class, 0, propertyAccessors::add);
+        findAndRemovePrefixedNonVoidMethods(
+                MethodLiteralConstants.IS_PREFIX, Boolean.class, 0, propertyAccessors::add);
 
         createPropertyFacetedMethodsFromAccessors(propertyAccessors, onNewField);
     }
@@ -434,7 +433,7 @@ implements HasMetaModelContext {
         // return false if both are true
         // 1. actionMethod has no @Action annotation
         // 2. actionMethod does not identify as a mixin's main method
-        if(isExplicitActionAnnotationConfigured()) {
+        if(isMemberAnnotationsRequired) {
 
             // even though when @Action is mandatory for action methods,
             // mixins now can contribute methods,
@@ -500,7 +499,7 @@ implements HasMetaModelContext {
             return false;
         }
 
-        if(isExplicitActionAnnotationConfigured()) {
+        if(isMemberAnnotationsRequired) {
             // we have no @Action, so dismiss
             return false;
         }
@@ -510,11 +509,6 @@ implements HasMetaModelContext {
         return true;
     }
 
-
-    private boolean isExplicitActionAnnotationConfigured() {
-        return explicitAnnotationsForActions;
-    }
-
     // ////////////////////////////////////////////////////////////////////////////
     // Helpers for finding and removing methods.
     // ////////////////////////////////////////////////////////////////////////////
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 9199bf3..73b83bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -25,6 +25,8 @@ import java.util.UUID;
 import java.util.function.Predicate;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.exceptions.RecoverableException;
@@ -36,6 +38,7 @@ import org.apache.isis.commons.internal.assertions._Assert;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.collections._Lists;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.commons.internal.reflection._Annotations;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.consent.InteractionResultSet;
@@ -525,6 +528,14 @@ implements ObjectAction {
         return getType().isPrototype();
     }
 
+    @Override
+    public boolean isExplicitlyAnnotated() {
+        //FIXME[ISIS-2774] memoize or even better, make this a final field
+        val javaMethod = getFacetedMethod().getMethod();
+        return _Annotations.synthesize(javaMethod, Action.class).isPresent()
+                || _Annotations.synthesize(javaMethod, ActionLayout.class).isPresent();
+    }
+
     /**
      * Internal API, called by the various implementations of
      * {@link ObjectAction} ({@link ObjectActionDefault default} and
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index be6adca..1c6c125 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -19,11 +19,13 @@
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Domain;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.id.LogicalType;
 import org.apache.isis.commons.collections.Can;
 import org.apache.isis.commons.collections.CanVector;
 import org.apache.isis.commons.internal.assertions._Assert;
+import org.apache.isis.commons.internal.reflection._Annotations;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderAbstract;
@@ -171,7 +173,14 @@ implements MixedInMember {
     @Override
     public ObjectSpecification getMixinType() {
         return getSpecificationLoader().loadSpecification(mixinType);
+    }
 
+    @Override
+    public boolean isExplicitlyAnnotated() {
+        //FIXME[ISIS-2774] memoize or even better, make this a final field
+        val javaMethod = getFacetedMethod().getMethod();
+        return _Annotations.synthesize(javaMethod, Domain.Include.class).isPresent()
+                || super.isExplicitlyAnnotated();
     }
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
index caa7495..19035f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
@@ -20,8 +20,11 @@
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.CollectionLayout;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.commons.collections.Can;
+import org.apache.isis.commons.internal.reflection._Annotations;
 import org.apache.isis.core.metamodel.commons.ToString;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -166,7 +169,13 @@ implements OneToManyAssociation {
         return 0; // n/a
     }
 
-
+    @Override
+    public boolean isExplicitlyAnnotated() {
+        //FIXME[ISIS-2774] memoize or even better, make this a final field
+        val javaMethod = getFacetedMethod().getMethod();
+        return _Annotations.synthesize(javaMethod, Collection.class).isPresent()
+                || _Annotations.synthesize(javaMethod, CollectionLayout.class).isPresent();
+    }
 
     // -- toString
 
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index 033e412..830fc5c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -19,8 +19,10 @@
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Domain;
 import org.apache.isis.applib.id.LogicalType;
 import org.apache.isis.commons.collections.Can;
+import org.apache.isis.commons.internal.reflection._Annotations;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderAbstract;
@@ -172,6 +174,14 @@ implements MixedInMember {
         return this.mixinAction == mixinAction;
     }
 
+    @Override
+    public boolean isExplicitlyAnnotated() {
+        //FIXME[ISIS-2774] memoize or even better, make this a final field
+        val javaMethod = getFacetedMethod().getMethod();
+        return _Annotations.synthesize(javaMethod, Domain.Include.class).isPresent()
+                || super.isExplicitlyAnnotated();
+    }
+
     private ExecutionPublisher getPublishingServiceInternal() {
         return getServiceRegistry().lookupServiceElseFail(ExecutionPublisher.class);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index 83542bb..b3c990a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -20,11 +20,14 @@
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.command.Command;
 import org.apache.isis.commons.collections.Can;
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.commons.internal.reflection._Annotations;
 import org.apache.isis.core.metamodel.commons.ToString;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -312,6 +315,14 @@ implements OneToOneAssociation {
                 .asCommandDto(interactionId, Can.ofSingleton(head), this, valueAdapterOrNull));
     }
 
+    @Override
+    public boolean isExplicitlyAnnotated() {
+        //FIXME[ISIS-2774] memoize or even better, make this a final field
+        val javaMethod = getFacetedMethod().getMethod();
+        return _Annotations.synthesize(javaMethod, Property.class).isPresent()
+                || _Annotations.synthesize(javaMethod, PropertyLayout.class).isPresent();
+    }
+
     // -- OBJECT CONTRACT
 
     @Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
index ba82766..0ecd069 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
@@ -19,8 +19,10 @@
 package org.apache.isis.core.metamodel.specloader.specimpl;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Domain;
 import org.apache.isis.applib.id.LogicalType;
 import org.apache.isis.commons.collections.Can;
+import org.apache.isis.commons.internal.reflection._Annotations;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetHolderAbstract;
@@ -157,6 +159,14 @@ implements MixedInMember {
         return this.mixinAction == mixinAction;
     }
 
+    @Override
+    public boolean isExplicitlyAnnotated() {
+        //FIXME[ISIS-2774] memoize or even better, make this a final field
+        val javaMethod = getFacetedMethod().getMethod();
+        return _Annotations.synthesize(javaMethod, Domain.Include.class).isPresent()
+                || super.isExplicitlyAnnotated();
+    }
+
     private ExecutionPublisher getPublisherDispatchService() {
         return getServiceRegistry().lookupServiceElseFail(ExecutionPublisher.class);
     }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 736fdc8..a2830ca 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -123,7 +123,7 @@ implements FacetHolder {
                 .map(introspectionPolicyFacet->
                         introspectionPolicyFacet
                         .getIntrospectionPolicy(mmc.getConfiguration()))
-                .orElseGet(()->mmc.getConfiguration().getCore().getMetaModel().getIntrospector().getIntrospectionPolicy());
+                .orElseGet(()->mmc.getConfiguration().getCore().getMetaModel().getIntrospector().getPolicy());
 
         this.introspectionPolicy = introspectionPolicy;
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index 6fc28c4..3473068 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -25,6 +25,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.commons.collections.Can;
@@ -45,9 +48,6 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 public class ObjectAssociationAbstractTest {
 
     @Rule
@@ -117,14 +117,14 @@ public class ObjectAssociationAbstractTest {
             @Override
             public UsabilityContext createUsableInteractionContext(
                     final ManagedObject target, final InteractionInitiatedBy interactionInitiatedBy,
-                    Where where) {
+                    final Where where) {
                 return null;
             }
 
             @Override
             public VisibilityContext createVisibleInteractionContext(
                     final ManagedObject targetObjectAdapter, final InteractionInitiatedBy interactionInitiatedBy,
-                    Where where) {
+                    final Where where) {
                 return null;
             }
 
@@ -140,8 +140,8 @@ public class ObjectAssociationAbstractTest {
 
             @Override
             public Can<ManagedObject> getAutoComplete(
-                    ManagedObject object,
-                    String searchArg,
+                    final ManagedObject object,
+                    final String searchArg,
                     final InteractionInitiatedBy interactionInitiatedBy) {
                 return null;
             }
@@ -150,6 +150,11 @@ public class ObjectAssociationAbstractTest {
                 return 0;
             }
 
+            @Override
+            public boolean isExplicitlyAnnotated() {
+                return false;
+            }
+
         };
     }
 
@@ -182,7 +187,7 @@ public class ObjectAssociationAbstractTest {
         assertTrue(objectAssociation.hasChoices());
     }
 
-    private <T extends Facet> T mockFacetIgnoring(final Class<T> typeToMock, Precedence precedence) {
+    private <T extends Facet> T mockFacetIgnoring(final Class<T> typeToMock, final Precedence precedence) {
         final T facet = context.mock(typeToMock);
         context.checking(new Expectations() {
             {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index d6269a9..3d3c3f8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -151,6 +151,11 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
             public int getAutoCompleteMinLength() {
                 return 0;
             }
+            @Override
+            public boolean isExplicitlyAnnotated() {
+                return false;
+            }
+
         };
     }
 
diff --git a/examples/demo/domain/src/main/resources/application.yml b/examples/demo/domain/src/main/resources/application.yml
index 6830ec9..5e809a6 100644
--- a/examples/demo/domain/src/main/resources/application.yml
+++ b/examples/demo/domain/src/main/resources/application.yml
@@ -23,7 +23,6 @@ isis:
     annotation:
       action:
         command: ignore_safe
-        explicit: true
         publishing: none
       action-layout:
         css-class-fa:
@@ -60,6 +59,7 @@ isis:
       introspector:
         parallelize: false
         mode: full
+        policy: ANNOTATION_REQUIRED
     runtime-services:
       translation:
         po:
diff --git a/regressiontests/stable-config/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java b/regressiontests/stable-config/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
index 4a6e80c..eb6e297 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest.java
@@ -32,10 +32,9 @@ import org.apache.isis.core.config.IsisModuleCoreConfig;
 import org.apache.isis.core.config.presets.IsisPresets;
 
 @SpringBootTest(
-        classes = { 
+        classes = {
                 IsisModuleCoreConfig.class
-        }
-        )
+        })
 @TestPropertySource({
     "classpath:/application-config-test.properties",
     IsisPresets.UseLog4j2Test
@@ -48,7 +47,9 @@ class IsisConfigBeanTest {
     @Test
     void configurationBean_shouldBePickedUpBySpring() {
         assertNotNull(isisConfiguration);
-        assertTrue(isisConfiguration.getApplib().getAnnotation().getAction().isExplicit());
+        assertTrue(isisConfiguration
+                .getCore().getMetaModel().getIntrospector().getPolicy()
+                .getMemberAnnotationPolicy().isMemberAnnotationsRequired());
     }
 
 }
diff --git a/regressiontests/stable-config/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java b/regressiontests/stable-config/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
index 48404e5..d9b8e9e 100644
--- a/regressiontests/stable-config/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
+++ b/regressiontests/stable-config/src/test/java/org/apache/isis/testdomain/config/IsisConfigBeanTest_usingHeadless.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.config.presets.IsisPresets;
 import org.apache.isis.testdomain.conf.Configuration_headless;
 
 @SpringBootTest(
-        classes = { 
+        classes = {
                 Configuration_headless.class
         }
 )
@@ -47,7 +47,9 @@ class IsisConfigBeanTest_usingHeadless {
     @Test
     void configurationBean_shouldBePickedUpBySpring() {
         assertNotNull(isisConfiguration);
-        assertTrue(isisConfiguration.getApplib().getAnnotation().getAction().isExplicit());
+        assertTrue(isisConfiguration
+                .getCore().getMetaModel().getIntrospector().getPolicy()
+                .getMemberAnnotationPolicy().isMemberAnnotationsRequired());
     }
 
 }
diff --git a/regressiontests/stable-config/src/test/resources/application-config-test.properties b/regressiontests/stable-config/src/test/resources/application-config-test.properties
index a272767..5288465 100644
--- a/regressiontests/stable-config/src/test/resources/application-config-test.properties
+++ b/regressiontests/stable-config/src/test/resources/application-config-test.properties
@@ -21,5 +21,5 @@
 # renamed to kebab-case, but the old camelCase is also recognised and supported.
 #
 
-isis.core.meta-model.annotation.action.explicit=true
+isis.core.meta-model.introspector.policy=ANNOTATION_REQUIRED
 
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
index d7c8e64..174e913 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
@@ -44,12 +44,12 @@ import org.apache.isis.testing.integtestsupport.applib.validate.DomainModelValid
 import lombok.val;
 
 @SpringBootTest(
-        classes = { 
+        classes = {
                 Configuration_headless.class,
                 Configuration_usingInvalidDomain_noActionEnforced.class
-        }, 
+        },
         properties = {
-                "isis.applib.annotation.action.explicit=false",
+                "isis.core.meta-model.introspector.policy=ANNOTATION_OPTIONAL",
                 "isis.core.meta-model.introspector.mode=FULL"
         })
 @TestPropertySource({
@@ -59,32 +59,34 @@ import lombok.val;
     IsisPresets.SilenceProgrammingModel
 })
 class DomainModelTest_usingBadDomain_noActionEnforced {
-    
+
     @Inject private IsisConfiguration configuration;
     @Inject private IsisSystemEnvironment isisSystemEnvironment;
     @Inject private SpecificationLoader specificationLoader;
 
-    
+
     @Test
     void fullIntrospection_shouldBeEnabledByThisTestClass() {
         assertTrue(IntrospectionMode.isFullIntrospect(configuration, isisSystemEnvironment));
     }
-    
+
     @Test
     void actionAnnotation_shouldBeOptionalByThisTestClass() {
-        assertFalse(configuration.getApplib().getAnnotation().getAction().isExplicit());
+        assertFalse(configuration
+                .getCore().getMetaModel().getIntrospector().getPolicy()
+                .getMemberAnnotationPolicy().isMemberAnnotationsRequired());
     }
-    
+
     @Test
     void orphanedActionSupport_shouldFail() {
-           
+
         val validateDomainModel = new DomainModelValidator(specificationLoader, configuration, isisSystemEnvironment);
-        
+
         assertThrows(DomainModelException.class, validateDomainModel::throwIfInvalid);
         assertTrue(validateDomainModel.anyMatchesContaining(
-                Identifier.classIdentifier(LogicalType.fqcn(InvalidOrphanedActionSupportNoActionEnforced.class)), 
+                Identifier.classIdentifier(LogicalType.fqcn(InvalidOrphanedActionSupportNoActionEnforced.class)),
                 "is assumed to support"));
     }
-    
+
 
 }