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 2019/10/28 17:16:15 UTC
[isis] 03/10: ISIS-2158: renaming Facet.isNoop() ->
Facet.isFallback()
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4b6e2a0fab8e5d385b06f8114bf5711ad3aaf88c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Oct 26 08:30:40 2019 +0200
ISIS-2158: renaming Facet.isNoop() -> Facet.isFallback()
---
.../org/apache/isis/metamodel/consent/InteractionAdvisor.java | 2 +-
.../src/main/java/org/apache/isis/metamodel/facetapi/Facet.java | 7 ++++---
.../java/org/apache/isis/metamodel/facetapi/FacetAbstract.java | 8 ++++----
.../main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java | 8 ++++----
.../java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java | 4 ++--
.../metamodel/facets/actions/layout/ActionLayoutFacetFactory.java | 4 ++--
.../NotContributedFacetDerivedFromDomainServiceFacetFactory.java | 2 +-
.../derived/NotContributedFacetDerivedFromMixinFacetFactory.java | 2 +-
...NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java | 2 +-
.../isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java | 2 +-
.../isis/metamodel/facets/fallback/ActionChoicesFacetNone.java | 2 +-
.../isis/metamodel/facets/fallback/ActionDefaultsFacetNone.java | 2 +-
.../isis/metamodel/facets/fallback/DescribedAsFacetNone.java | 2 +-
.../org/apache/isis/metamodel/facets/fallback/HelpFacetNone.java | 2 +-
.../isis/metamodel/facets/fallback/MaxLengthFacetUnlimited.java | 2 +-
.../apache/isis/metamodel/facets/fallback/MultiLineFacetNone.java | 2 +-
.../org/apache/isis/metamodel/facets/fallback/NamedFacetNone.java | 2 +-
.../org/apache/isis/metamodel/facets/fallback/TitleFacetNone.java | 2 +-
.../members/disabled/forsession/DisableForSessionFacetNone.java | 2 +-
.../members/disabled/method/DisableForContextFacetNone.java | 2 +-
.../facets/members/hidden/forsession/HideForSessionFacetNone.java | 2 +-
.../facets/members/hidden/method/HideForContextFacetNone.java | 2 +-
.../bookmarkable/BookmarkPolicyFacetFallbackFactory.java | 4 ++--
.../object/domainobject/DomainObjectAnnotationFacetFactory.java | 2 +-
.../object/projection/ProjectionFacetFromProjectingProperty.java | 2 +-
.../facets/object/title/methods/TitleFacetViaMethodsFactory.java | 2 +-
.../facets/object/title/methods/TitleFacetViaToStringMethod.java | 2 +-
.../facets/param/choices/ActionParameterChoicesFacetNone.java | 2 +-
.../facets/properties/defaults/PropertyDefaultFacetNone.java | 2 +-
.../fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java | 2 +-
.../properties/validating/PropertyValidateFacetAbstract.java | 2 +-
.../facets/properties/validating/PropertyValidateFacetNone.java | 2 +-
.../metamodel/facets/value/image/ImageValueSemanticsProvider.java | 2 +-
.../facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java | 2 +-
.../metamodel/postprocessors/param/DeriveFacetsPostProcessor.java | 4 ++--
.../services/appfeat/ApplicationFeatureRepositoryDefault.java | 2 +-
.../isis/metamodel/services/grid/GridSystemServiceAbstract.java | 2 +-
.../isis/metamodel/services/metamodel/DomainMemberDefault.java | 2 +-
.../isis/metamodel/services/metamodel/MetaModelExporter.java | 2 +-
.../isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java | 2 +-
.../isis/metamodel/specloader/specimpl/ObjectActionDefault.java | 8 ++++----
.../isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java | 2 +-
.../specloader/specimpl/ObjectSpecificationAbstract.java | 2 +-
.../metamodel/specloader/specimpl/OneToOneAssociationDefault.java | 2 +-
.../domainobject/DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../object/ident/title/TitleFacetViaMethodsFactoryTest.java | 2 +-
.../facets/value/ImageValueSemanticsProviderAbstractTest.java | 2 +-
.../specimpl/ObjectAssociationAbstractTest_alwaysHidden.java | 2 +-
.../ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java | 2 +-
.../BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java | 4 ++--
.../MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../domaintypes/ActionParameterDescriptionReprRenderer.java | 2 +-
.../rendering/domaintypes/PropertyDescriptionReprRenderer.java | 2 +-
.../wicket/ui/components/entity/fieldset/PropertyGroup.java | 2 +-
.../wicket/ui/components/scalars/string/StringPanelFactory.java | 2 +-
55 files changed, 72 insertions(+), 71 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
index 24bc793..0d60c41 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/consent/InteractionAdvisor.java
@@ -58,7 +58,7 @@ public interface InteractionAdvisor {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/Facet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/Facet.java
index 97beef6..a984b4a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/Facet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/Facet.java
@@ -86,12 +86,13 @@ public interface Facet extends FacetWithAttributes {
public boolean isDerived();
/**
- * Whether this facet implementation is a no-op.
+ * Whether this facet implementation is a fallback. Meaning it is treated
+ * with lowest priority, always overruled by any other facet of same type.
*/
- public boolean isNoop();
+ public boolean isFallback();
/**
- * Whether this facet implementation should replace existing (none-noop)
+ * Whether this facet implementation should replace existing (none-fallback)
* implementations.
*/
public boolean alwaysReplace();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
index 33bfb4d..c25059c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetAbstract.java
@@ -152,13 +152,13 @@ public abstract class FacetAbstract implements Facet, MetaModelContext.Delegatin
* No-op implementations should override and return <tt>true</tt>.
*/
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return false;
}
/**
* Default implementation of this method that returns <tt>true</tt>, ie
- * should replace (none {@link #isNoop() no-op} implementations.
+ * should replace (none {@link #isFallback() no-op} implementations.
*
* <p>
* Implementations that don't wish to replace none no-op implementations
@@ -227,8 +227,8 @@ public abstract class FacetAbstract implements Facet, MetaModelContext.Delegatin
attributeMap.put("derived", derived);
}
attributeMap.put("underlyingFacet", underlyingFacet);
- if(isNoop()) {
- attributeMap.put("noop", isNoop());
+ if(isFallback()) {
+ attributeMap.put("noop", isFallback());
}
if(isHiding()) {
attributeMap.put("hiding", isHiding());
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java
index d819bbe..2cf6923 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolder.java
@@ -46,7 +46,7 @@ public interface FacetHolder {
/**
* Whether there is a facet registered of the specified type that is not a
- * {@link Facet#isNoop() no-op}.
+ * {@link Facet#isFallback() no-op}.
*
* <p>
* Convenience; saves having to {@link #getFacet(Class)} and then check if
@@ -54,7 +54,7 @@ public interface FacetHolder {
*/
default boolean containsDoOpFacet(Class<? extends Facet> facetType) {
val facet = getFacet(facetType);
- return facet != null && !facet.isNoop();
+ return facet != null && !facet.isFallback();
}
/**
@@ -63,7 +63,7 @@ public interface FacetHolder {
*/
default boolean containsDoOpNotDerivedFacet(Class<? extends Facet> facetType) {
val facet = getFacet(facetType);
- return facet != null && !facet.isNoop() && !facet.isDerived();
+ return facet != null && !facet.isFallback() && !facet.isDerived();
}
Stream<Facet> streamFacets();
@@ -81,7 +81,7 @@ public interface FacetHolder {
* If there are any facet of the same type, they will be overwritten
* <i>provided</i> that either the {@link Facet} specifies to
* {@link Facet#alwaysReplace() always replace} or if the existing
- * {@link Facet} is a {@link Facet#isNoop() no-op}.
+ * {@link Facet} is a {@link Facet#isFallback() no-op}.
*/
void addFacet(Facet facet);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
index 5a3ea55..3ece3fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facetapi/FacetHolderImpl.java
@@ -100,12 +100,12 @@ public class FacetHolderImpl implements FacetHolder, MetaModelContextAware {
private void addFacet(Class<? extends Facet> facetType, Facet facet) {
val existingFacet = getFacet(facetType);
- if (existingFacet == null || existingFacet.isNoop()) {
+ if (existingFacet == null || existingFacet.isFallback()) {
put(facetType, facet);
return;
}
if (!facet.alwaysReplace()) {
- return;
+ return; //eg. ValueSemanticsProviderAndFacetAbstract is alwaysReplace=false
}
if (facet.isDerived() && !existingFacet.isDerived()) {
return;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index a7997fb..1daf745 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -125,13 +125,13 @@ public class ActionLayoutFacetFactory extends FacetFactoryAbstract implements Co
private static boolean isContributingService(final ObjectSpecification spec) {
final DomainServiceFacet domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
- return domainServiceFacet != null && !domainServiceFacet.isNoop() &&
+ return domainServiceFacet != null && !domainServiceFacet.isFallback() &&
!domainServiceFacet.getNatureOfService().isProgrammatic();
}
private static boolean isMixinObject(final ObjectSpecification spec) {
final MixinFacet mixinFacet = spec.getFacet(MixinFacet.class);
- final boolean b = mixinFacet != null && !mixinFacet.isNoop();
+ final boolean b = mixinFacet != null && !mixinFacet.isFallback();
return b;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
index 094a51d..4c68600 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
@@ -42,7 +42,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactory extends Fac
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass);
final DomainServiceFacet domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
- if(domainServiceFacet == null || domainServiceFacet.isNoop()) {
+ if(domainServiceFacet == null || domainServiceFacet.isFallback()) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
index df038af..d2b543e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
@@ -41,7 +41,7 @@ public class NotContributedFacetDerivedFromMixinFacetFactory extends FacetFactor
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass);
final MixinFacet mixinFacet = spec.getFacet(MixinFacet.class);
- if(mixinFacet == null || mixinFacet.isNoop()) {
+ if(mixinFacet == null || mixinFacet.isFallback()) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
index 12a7b2b..6199c62 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
@@ -43,7 +43,7 @@ public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory extends F
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass);
final DomainServiceFacet domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
- if(domainServiceFacet == null || domainServiceFacet.isNoop()) {
+ if(domainServiceFacet == null || domainServiceFacet.isFallback()) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
index 8c2e506..539ca10 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/all/deficiencies/DeficiencyFacet.java
@@ -101,7 +101,7 @@ public final class DeficiencyFacet implements Facet {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionChoicesFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionChoicesFacetNone.java
index 991fdc1..77e8392 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionChoicesFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionChoicesFacetNone.java
@@ -38,7 +38,7 @@ public class ActionChoicesFacetNone extends ActionChoicesFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionDefaultsFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionDefaultsFacetNone.java
index 73703bb..f9a5f45 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionDefaultsFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/ActionDefaultsFacetNone.java
@@ -35,7 +35,7 @@ public class ActionDefaultsFacetNone extends ActionDefaultsFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/DescribedAsFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/DescribedAsFacetNone.java
index 28fdde8..134bc5a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/DescribedAsFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/DescribedAsFacetNone.java
@@ -32,7 +32,7 @@ public class DescribedAsFacetNone extends DescribedAsFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/HelpFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/HelpFacetNone.java
index 8a5afc1..c7c8a3d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/HelpFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/HelpFacetNone.java
@@ -37,7 +37,7 @@ public class HelpFacetNone extends HelpFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MaxLengthFacetUnlimited.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MaxLengthFacetUnlimited.java
index 336e88e..aac40b6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MaxLengthFacetUnlimited.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MaxLengthFacetUnlimited.java
@@ -39,7 +39,7 @@ public class MaxLengthFacetUnlimited extends MaxLengthFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MultiLineFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MultiLineFacetNone.java
index 266df36..0a1520b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MultiLineFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/MultiLineFacetNone.java
@@ -29,7 +29,7 @@ public class MultiLineFacetNone extends MultiLineFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/NamedFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/NamedFacetNone.java
index b1edc2c..aff30a3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/NamedFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/NamedFacetNone.java
@@ -37,7 +37,7 @@ public class NamedFacetNone extends NamedFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/TitleFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/TitleFacetNone.java
index 9b7d030..8e7eba9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/TitleFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/fallback/TitleFacetNone.java
@@ -35,7 +35,7 @@ public class TitleFacetNone extends TitleFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
index 0b49655..81be8e0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
@@ -35,7 +35,7 @@ public class DisableForSessionFacetNone extends DisableForSessionFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
index ebb7ee5..cde4381 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetNone.java
@@ -42,7 +42,7 @@ public class DisableForContextFacetNone extends DisableForContextFacetAbstract {
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
index fe3610e..3ad0dcd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
@@ -38,7 +38,7 @@ public class HideForSessionFacetNone extends HideForSessionFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
index 429a3d2..260b80f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetNone.java
@@ -38,7 +38,7 @@ public class HideForContextFacetNone extends HideForContextFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
index 89af660..4ded728 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
@@ -62,7 +62,7 @@ implements MetaModelRefiner {
objectActions
.filter(objectAction->{
final BookmarkPolicyFacet bookmarkFacet = objectAction.getFacet(BookmarkPolicyFacet.class);
- if(bookmarkFacet == null || bookmarkFacet.isNoop() ||
+ if(bookmarkFacet == null || bookmarkFacet.isFallback() ||
bookmarkFacet.value() == BookmarkPolicy.NEVER) {
return false;
}
@@ -70,7 +70,7 @@ implements MetaModelRefiner {
})
.forEach(objectAction->{
final ActionSemanticsFacet semanticsFacet = objectAction.getFacet(ActionSemanticsFacet.class);
- if(semanticsFacet == null || semanticsFacet.isNoop() || !semanticsFacet.value().isSafeInNature()) {
+ if(semanticsFacet == null || semanticsFacet.isFallback() || !semanticsFacet.value().isSafeInNature()) {
validator.onFailure(objectAction,
objectAction.getIdentifier(),
"%s: action is bookmarkable but action semantics are not explicitly indicated as being safe. " +
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 842ea49..b66291f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -544,7 +544,7 @@ implements MetaModelRefiner, PostConstructMethodCache, ObjectSpecIdFacetFactory
}
final AutoCompleteFacet autoCompleteFacet = thisSpec.getFacet(AutoCompleteFacet.class);
- if(autoCompleteFacet != null && !autoCompleteFacet.isNoop() && autoCompleteFacet instanceof AutoCompleteFacetAbstract) {
+ if(autoCompleteFacet != null && !autoCompleteFacet.isFallback() && autoCompleteFacet instanceof AutoCompleteFacetAbstract) {
val autoCompleteFacetAbstract = (AutoCompleteFacetForDomainObjectAnnotation) autoCompleteFacet;
val repositoryClass = autoCompleteFacetAbstract.getRepositoryClass();
val isRepositoryResolvable = getServiceRegistry()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java
index aa8c41b..738fccb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/projection/ProjectionFacetFromProjectingProperty.java
@@ -50,7 +50,7 @@ public class ProjectionFacetFromProjectingProperty extends ProjectionFacetAbstra
return objectSpecification.streamProperties(Contributed.EXCLUDED)
.filter(propertySpec -> {
val projectingFacet = propertySpec.getFacet(ProjectingFacet.class);
- return projectingFacet != null && !projectingFacet.isNoop()
+ return projectingFacet != null && !projectingFacet.isFallback()
&& projectingFacet.value() == Projecting.PROJECTED;
})
.findFirst()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
index f9bfde4..a3d22be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
@@ -69,7 +69,7 @@ public class TitleFacetViaMethodsFactory extends MethodPrefixBasedFacetFactoryAb
// may have a facet by virtue of @Title, say.
final TitleFacet existingTitleFacet = facetHolder.getFacet(TitleFacet.class);
- if(existingTitleFacet != null && !existingTitleFacet.isNoop()) {
+ if(existingTitleFacet != null && !existingTitleFacet.isFallback()) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
index 406f484..90342d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
@@ -58,7 +58,7 @@ public class TitleFacetViaToStringMethod extends TitleFacetAbstract implements I
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
index 782064f..46127a5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/param/choices/ActionParameterChoicesFacetNone.java
@@ -41,7 +41,7 @@ public class ActionParameterChoicesFacetNone extends ActionParameterChoicesFacet
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java
index f329162..6cb9a81 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/PropertyDefaultFacetNone.java
@@ -38,7 +38,7 @@ public class PropertyDefaultFacetNone extends PropertyDefaultFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
index 3229744..da09069 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
@@ -42,7 +42,7 @@ public class PropertyDefaultFacetDerivedFromTypeFactory extends FacetFactoryAbst
public void process(final ProcessMethodContext processMethodContext) {
// don't overwrite any defaults that might already picked up
final PropertyDefaultFacet existingDefaultFacet = processMethodContext.getFacetHolder().getFacet(PropertyDefaultFacet.class);
- if (existingDefaultFacet != null && !existingDefaultFacet.isNoop()) {
+ if (existingDefaultFacet != null && !existingDefaultFacet.isFallback()) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
index 47b69f4..059090c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/PropertyValidateFacetAbstract.java
@@ -48,7 +48,7 @@ public abstract class PropertyValidateFacetAbstract extends FacetAbstract implem
if(proposed == null) {
// skip validation if null value and optional property.
MandatoryFacet mandatoryFacet = getFacetHolder().getFacet(MandatoryFacet.class);
- if(mandatoryFacet == null || mandatoryFacet.isNoop() || mandatoryFacet.isInvertedSemantics()) {
+ if(mandatoryFacet == null || mandatoryFacet.isFallback() || mandatoryFacet.isInvertedSemantics()) {
return null;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/PropertyValidateFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/PropertyValidateFacetNone.java
index 26f8584..64cf6bc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/PropertyValidateFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/properties/validating/PropertyValidateFacetNone.java
@@ -40,7 +40,7 @@ public class PropertyValidateFacetNone extends PropertyValidateFacetAbstract {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return true;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProvider.java
index 3a12eb7..c954346 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/image/ImageValueSemanticsProvider.java
@@ -83,7 +83,7 @@ public class ImageValueSemanticsProvider extends ImageValueSemanticsProviderAbst
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
index b953281..4724cef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/value/imageawt/JavaAwtImageValueSemanticsProvider.java
@@ -65,7 +65,7 @@ public class JavaAwtImageValueSemanticsProvider extends ImageValueSemanticsProvi
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
index 6c123b1..7ce5cdb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
@@ -248,7 +248,7 @@ implements ObjectSpecificationPostProcessor, MetaModelContextAware {
}
private static boolean canOverwrite(final Facet facet) {
- return facet == null || facet.isNoop() || facet.isDerived();
+ return facet == null || facet.isFallback() || facet.isDerived();
}
private void tweakActionDomainEventForMixin(
@@ -606,7 +606,7 @@ implements ObjectSpecificationPostProcessor, MetaModelContextAware {
}
private static boolean existsAndIsDoOp(final Facet facet) {
- return facet != null && !facet.isNoop();
+ return facet != null && !facet.isFallback();
}
private List<ActionType> inferActionTypes() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index afe4ef6..606495c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -369,7 +369,7 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
protected boolean isHidden(final ObjectSpecification spec) {
final HiddenFacet facet = spec.getFacet(HiddenFacet.class);
return facet != null &&
- !facet.isNoop() &&
+ !facet.isFallback() &&
(facet.where() == Where.EVERYWHERE || facet.where() == Where.ANYWHERE);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
index 6a6c904..2b71d7c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -466,7 +466,7 @@ implements GridSystemService<G> {
}
private static boolean isDoOp(final Facet facet) {
- return facet != null && !facet.isNoop();
+ return facet != null && !facet.isFallback();
}
protected void setBookmarkingIfAny(
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
index 5c528fd..ed471b5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/DomainMemberDefault.java
@@ -267,7 +267,7 @@ public class DomainMemberDefault implements DomainMember {
}
private static String interpretFacet(final Facet facet) {
- if (facet == null || facet.isNoop()) {
+ if (facet == null || facet.isFallback()) {
return "";
}
if (facet instanceof ImperativeFacet) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
index 21caa92..15bf530 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/metamodel/MetaModelExporter.java
@@ -373,7 +373,7 @@ class MetaModelExporter {
final List<org.apache.isis.schema.metamodel.v1.Facet> facetList = facets.getFacet();
facetHolder.streamFacets()
- .filter(facet -> !facet.isNoop() || !config.isIgnoreNoop())
+ .filter(facet -> !facet.isFallback() || !config.isIgnoreNoop())
.map(facet -> asXsdType(facet, config))
.forEach(facetList::add);
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 0a07d70..a9d9d52 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -568,7 +568,7 @@ public class FacetedMethodsBuilder {
*/
private boolean isMixinMain(Method method) {
val mixinFacet = inspectedTypeSpec.getFacet(MixinFacet.class);
- if(mixinFacet==null || mixinFacet.isNoop()) {
+ if(mixinFacet==null || mixinFacet.isFallback()) {
return false;
}
if(inspectedTypeSpec.isLessThan(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED)) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionDefault.java
index 1320f78..4de111e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -469,7 +469,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
final Object[] parameterDefaultPojos;
final ActionDefaultsFacet facet = getFacet(ActionDefaultsFacet.class);
- if (!facet.isNoop()) {
+ if (!facet.isFallback()) {
// use the old defaultXxx approach
parameterDefaultPojos = facet.getDefaults(target);
if (parameterDefaultPojos.length != parameterCount) {
@@ -491,7 +491,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
parameterDefaultPojos = new Object[parameterCount];
for (int i = 0; i < parameterCount; i++) {
final ActionParameterDefaultsFacet paramFacet = parameters.get(i).getFacet(ActionParameterDefaultsFacet.class);
- if (paramFacet != null && !paramFacet.isNoop()) {
+ if (paramFacet != null && !paramFacet.isFallback()) {
parameterDefaultPojos[i] = paramFacet.getDefault(target, null, null);
} else {
parameterDefaultPojos[i] = null;
@@ -547,7 +547,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
final ActionChoicesFacet facet = getFacet(ActionChoicesFacet.class);
final List<ObjectActionParameter> parameters = getParameters();
- if (!facet.isNoop()) {
+ if (!facet.isFallback()) {
// using the old choicesXxx() approach
parameterChoicesPojos = facet.getChoices(target,
interactionInitiatedBy);
@@ -567,7 +567,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
parameterChoicesPojos = new Object[parameterCount][];
for (int i = 0; i < parameterCount; i++) {
final ActionParameterChoicesFacet paramFacet = parameters.get(i).getFacet(ActionParameterChoicesFacet.class);
- if (paramFacet != null && !paramFacet.isNoop()) {
+ if (paramFacet != null && !paramFacet.isFallback()) {
parameterChoicesPojos[i] = paramFacet.getChoices(target, null,
interactionInitiatedBy);
} else {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index 406d689..ee7a53f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -169,7 +169,7 @@ implements ObjectMember, MetaModelContext.Delegating, FacetHolder.Delegating {
public boolean isAlwaysHidden() {
final HiddenFacet facet = getFacet(HiddenFacet.class);
return facet != null &&
- !facet.isNoop() &&
+ !facet.isFallback() &&
(facet.where() == Where.EVERYWHERE || facet.where() == Where.ANYWHERE)
;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 6a087f8..7529992 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -572,7 +572,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if(facet==null) {
return false;
}
- if(!facet.isNoop()) {
+ if(!facet.isFallback()) {
return true;
}
if(noopFacet == null) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index df16063..6b3a845 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -234,7 +234,7 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
// if no default on the association, attempt to find a default on the
// specification (eg an int should
// default to 0).
- if (propertyDefaultFacet == null || propertyDefaultFacet.isNoop()) {
+ if (propertyDefaultFacet == null || propertyDefaultFacet.isFallback()) {
propertyDefaultFacet = this.getSpecification().getFacet(PropertyDefaultFacet.class);
}
if (propertyDefaultFacet == null) {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index ef43e40..8bfe0b3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -235,7 +235,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
Assert.assertThat(facet.isDisabled(), is(true));
Assert.assertThat(facet.alwaysReplace(), is(true));
- Assert.assertThat(facet.isNoop(), is(false));
+ Assert.assertThat(facet.isFallback(), is(false));
Assert.assertThat(facet.isDerived(), is(false));
expectNoMethodsRemoved();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
index 23df184..6abc9d7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
@@ -99,7 +99,7 @@ public class TitleFacetViaMethodsFactoryTest extends AbstractFacetFactoryTest {
* a none no-op implementation.
*/
public void testTitleFacetMethodUsingToStringIsClassifiedAsANoop() {
- assertTrue(new TitleFacetViaToStringMethod(null, facetedMethod).isNoop());
+ assertTrue(new TitleFacetViaToStringMethod(null, facetedMethod).isFallback());
}
public void testNoExplicitTitleOrToStringMethod() {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index 89ef5e0..50ad28e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -115,7 +115,7 @@ class TestImageSemanticsProvider extends ImageValueSemanticsProviderAbstract<int
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return false;
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 841f9f6..56a7587 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -227,7 +227,7 @@ public class ObjectAssociationAbstractTest_alwaysHidden {
}
@Override
- public boolean isNoop() {
+ public boolean isFallback() {
return noop;
}
};
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
index a7c2207..86a6ca1 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
@@ -33,7 +33,7 @@ public class ObjectSpecIdFacetForJdoPersistenceCapableAnnotation extends ObjectS
final JdoPersistenceCapableFacet persistenceCapableFacet,
final FacetHolder holder) {
- if(persistenceCapableFacet.isNoop()) {
+ if(persistenceCapableFacet.isFallback()) {
return null;
}
final String schema = persistenceCapableFacet.getSchema();
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
index b12cfcd..d3dd0e3 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -69,7 +69,7 @@ implements MetaModelRefiner {
.orElse(null);
if (jdoColumnAnnotation == null) {
- if(existingFacet != null && !existingFacet.isNoop()) {
+ if(existingFacet != null && !existingFacet.isFallback()) {
// do nothing
} else {
final BigDecimalValueFacet facet = new BigDecimalFacetFallback(holder);
@@ -82,7 +82,7 @@ implements MetaModelRefiner {
// if there was an *explicit* value defined on the @Column annotation that is incompatible with existing.
Integer existingLength = null;
Integer existingScale = null;
- if(existingFacet != null && !existingFacet.isNoop()) {
+ if(existingFacet != null && !existingFacet.isFallback()) {
existingLength = existingFacet.getPrecision();
existingScale = existingFacet.getScale();
}
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
index 8361ff2..6540504 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -80,7 +80,7 @@ implements MetaModelRefiner {
final MaxLengthFacet facet = new MaxLengthFacetDerivedFromJdoColumn(jdoColumnAnnotation.length(), holder);
- if(!existingFacet.isNoop()) {
+ if(!existingFacet.isFallback()) {
// will raise violation later
facet.setUnderlyingFacet(existingFacet);
}
diff --git a/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
index 0e5ac6d..a9030de 100644
--- a/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
+++ b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/ActionParameterDescriptionReprRenderer.java
@@ -84,7 +84,7 @@ public class ActionParameterDescriptionReprRenderer extends AbstractTypeFeatureR
representation.mapPut("number", getObjectFeature().getNumber());
representation.mapPut("optional", getObjectFeature().isOptional());
final MaxLengthFacet maxLength = getObjectFeature().getFacet(MaxLengthFacet.class);
- if (maxLength != null && !maxLength.isNoop()) {
+ if (maxLength != null && !maxLength.isFallback()) {
representation.mapPut("maxLength", maxLength.value());
}
}
diff --git a/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
index 6a05bd9..581e11e 100644
--- a/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
+++ b/core/viewer-restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/PropertyDescriptionReprRenderer.java
@@ -50,7 +50,7 @@ public class PropertyDescriptionReprRenderer extends AbstractTypeMemberReprRende
protected void addPropertiesSpecificToFeature() {
representation.mapPut("optional", !getObjectFeature().isMandatory());
final MaxLengthFacet maxLength = getObjectFeature().getFacet(MaxLengthFacet.class);
- if (maxLength != null && !maxLength.isNoop()) {
+ if (maxLength != null && !maxLength.isFallback()) {
representation.mapPut("maxLength", maxLength.value());
}
}
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index 2864d69..eb6f9f9 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -190,7 +190,7 @@ public class PropertyGroup extends PanelAbstract<EntityModel> implements HasDyna
return false;
}
final HiddenFacet facet = objectAssociation.getFacet(HiddenFacet.class);
- if(facet != null && !facet.isNoop()) {
+ if(facet != null && !facet.isFallback()) {
// static invisible.
if(facet.where() == Where.EVERYWHERE || facet.where() == Where.OBJECT_FORMS) {
return false;
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
index 701886d..6621ce2 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanelFactory.java
@@ -36,7 +36,7 @@ public class StringPanelFactory extends ComponentFactoryScalarAbstract {
@Override
public Component createComponent(final String id, final ScalarModel scalarModel) {
final MultiLineFacet multiLineFacet = scalarModel.getFacet(MultiLineFacet.class);
- if (multiLineFacet != null && !multiLineFacet.isNoop()) {
+ if (multiLineFacet != null && !multiLineFacet.isFallback()) {
return new MultiLineStringPanel(id, scalarModel);
} else {
return new StringPanel(id, scalarModel);