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/11/07 10:29:13 UTC
[isis] branch master updated: ISIS-2871: simplify some facet names
('derived')
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 5a2ea59 ISIS-2871: simplify some facet names ('derived')
5a2ea59 is described below
commit 5a2ea5900653b495405b8ab5da9e887f5cd28934
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Nov 7 11:29:05 2021 +0100
ISIS-2871: simplify some facet names ('derived')
---
....java => ContributingFacetFromMixinFacetFactory.java} | 4 ++--
... => NotInServiceMenuFacetFromDomainServiceFacet.java} | 4 ++--
...InServiceMenuFacetFromDomainServiceFacetFactory.java} | 6 +++---
...zation.java => HiddenTypeFacetFromAuthorization.java} | 4 ++--
...java => HiddenTypeFacetFromAuthorizationFactory.java} | 8 ++++----
...ry.java => LogicalTypeFacetFromClassNameFactory.java} | 8 ++++----
...ctionFacet.java => IconFacetFromProjectionFacet.java} | 8 ++++----
...tionFacet.java => TitleFacetFromProjectionFacet.java} | 4 ++--
...ionParameterChoicesFacetFromChoicesFacetFactory.java} | 4 ++--
...et.java => PropertyChoicesFacetFromChoicesFacet.java} | 5 +++--
... => PropertyChoicesFacetFromChoicesFacetFactory.java} | 6 +++---
....java => PropertyDefaultFacetFromDefaultedFacet.java} | 8 ++++----
...ory.java => PropertyDefaultFacetFromTypeFactory.java} | 6 +++---
... => DisabledFacetOnPropertyFromImmutableFactory.java} | 4 ++--
...DeriveNavigationFacetFromHiddenTypePostProcessor.java | 4 ++--
...iddenType.java => NavigationFacetFromHiddenType.java} | 4 ++--
.../object/DeriveProjectionFacetsPostProcessor.java | 10 +++++-----
.../DeriveDisabledFromImmutablePostProcessor.java | 4 ++--
.../DeriveChoicesFromExistingChoicesPostProcessor.java | 12 ++++++------
.../propparam/DeriveDefaultFromTypePostProcessor.java | 8 ++++----
.../progmodels/dflt/ProgrammingModelFacetsJava11.java | 16 ++++++++--------
...rviceMenuFacetFromDomainServiceFacetFactoryTest.java} | 6 +++---
...ava => LogicalTypeFacetFromClassNameFactoryTest.java} | 8 ++++----
.../testing/dom/CustomerAsProxiedByDataNucleus.java | 4 ++--
.../persistence/jdo/metamodel/JdoProgrammingModel.java | 8 ++++----
...> BigDecimalFromJdoColumnAnnotationFacetFactory.java} | 4 ++--
...n.java => MaxLengthFacetFromJdoColumnAnnotation.java} | 6 +++---
...=> MaxLengthFromJdoColumnAnnotationFacetFactory.java} | 4 ++--
...gDecimalFromJdoColumnAnnotationFacetFactoryTest.java} | 6 +++---
...andatoryFromJdoColumnAnnotationFacetFactoryTest.java} | 2 +-
...n.java => MandatoryFacetFromJpaColumnAnnotation.java} | 5 +++--
.../MandatoryFromJpaColumnAnnotationFacetFactory.java | 2 +-
32 files changed, 97 insertions(+), 95 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
similarity index 94%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
index 0701b46..05e1089 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetFromMixinFacetFactory.java
@@ -32,11 +32,11 @@ import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
import lombok.val;
-public class ContributingFacetDerivedFromMixinFacetFactory
+public class ContributingFacetFromMixinFacetFactory
extends FacetFactoryAbstract {
@Inject
- public ContributingFacetDerivedFromMixinFacetFactory(final MetaModelContext mmc) {
+ public ContributingFacetFromMixinFacetFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.ACTIONS_ONLY);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacet.java
similarity index 94%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacet.java
index 28b3b41..0870468 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacet.java
@@ -27,12 +27,12 @@ import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServi
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-public class NotInServiceMenuFacetDerivedFromDomainServiceFacet
+public class NotInServiceMenuFacetFromDomainServiceFacet
extends NotInServiceMenuFacetAbstract {
private final NatureOfService natureOfService;
- public NotInServiceMenuFacetDerivedFromDomainServiceFacet(
+ public NotInServiceMenuFacetFromDomainServiceFacet(
final NatureOfService natureOfService, final FacetHolder holder) {
super(holder, Precedence.HIGH); // facet has final say, don't override
this.natureOfService = natureOfService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactory.java
similarity index 89%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactory.java
index 4a2faec..1288310 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactory.java
@@ -31,11 +31,11 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory
+public class NotInServiceMenuFacetFromDomainServiceFacetFactory
extends FacetFactoryAbstract {
@Inject
- public NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory(final MetaModelContext mmc) {
+ public NotInServiceMenuFacetFromDomainServiceFacetFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.ACTIONS_ONLY);
}
@@ -58,7 +58,7 @@ extends FacetFactoryAbstract {
}
final FacetedMethod facetHolder = processMethodContext.getFacetHolder();
- FacetUtil.addFacet(new NotInServiceMenuFacetDerivedFromDomainServiceFacet(natureOfService, facetHolder));
+ FacetUtil.addFacet(new NotInServiceMenuFacetFromDomainServiceFacet(natureOfService, facetHolder));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetDerivedFromAuthorization.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorization.java
similarity index 95%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetDerivedFromAuthorization.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorization.java
index f5f900e..6b303a0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetDerivedFromAuthorization.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorization.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import lombok.val;
-public class HiddenTypeFacetDerivedFromAuthorization
+public class HiddenTypeFacetFromAuthorization
extends FacetAbstract
implements HiddenTypeFacet {
@@ -36,7 +36,7 @@ implements HiddenTypeFacet {
return HiddenTypeFacet.class;
}
- public HiddenTypeFacetDerivedFromAuthorization(final FacetHolder holder) {
+ public HiddenTypeFacetFromAuthorization(final FacetHolder holder) {
super(type(), holder, Precedence.HIGH); // facet has final say, don't override
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetDerivedFromAuthorizationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorizationFactory.java
similarity index 84%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetDerivedFromAuthorizationFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorizationFactory.java
index 7a3637f..713baf4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetDerivedFromAuthorizationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/HiddenTypeFacetFromAuthorizationFactory.java
@@ -28,21 +28,21 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
/**
- * Installs the {@link HiddenTypeFacetDerivedFromAuthorization} on the
+ * Installs the {@link HiddenTypeFacetFromAuthorization} on the
* {@link ObjectSpecification}.
*/
-public class HiddenTypeFacetDerivedFromAuthorizationFactory
+public class HiddenTypeFacetFromAuthorizationFactory
extends FacetFactoryAbstract {
@Inject
- public HiddenTypeFacetDerivedFromAuthorizationFactory(final MetaModelContext mmc) {
+ public HiddenTypeFacetFromAuthorizationFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.OBJECTS_ONLY);
}
@Override
public void process(final ProcessClassContext processClassContext) {
final FacetHolder facetHolder = processClassContext.getFacetHolder();
- FacetUtil.addFacet(new HiddenTypeFacetDerivedFromAuthorization(facetHolder));
+ FacetUtil.addFacet(new HiddenTypeFacetFromAuthorization(facetHolder));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
similarity index 96%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetDerivedFromClassNameFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
index 66ed7a2..bc20506 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassNameFactory.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
import lombok.val;
-public class LogicalTypeFacetDerivedFromClassNameFactory
+public class LogicalTypeFacetFromClassNameFactory
extends FacetFactoryAbstract
implements
ObjectTypeFacetFactory,
@@ -51,7 +51,7 @@ implements
private ClassSubstitutorRegistry classSubstitutorRegistry;
@Inject
- public LogicalTypeFacetDerivedFromClassNameFactory(
+ public LogicalTypeFacetFromClassNameFactory(
final MetaModelContext mmc,
final ClassSubstitutorRegistry classSubstitutorRegistry) {
super(mmc, FeatureType.OBJECTS_ONLY);
@@ -60,9 +60,9 @@ implements
// -- JUNIT SUPPORT
- public static LogicalTypeFacetDerivedFromClassNameFactory forTesting(
+ public static LogicalTypeFacetFromClassNameFactory forTesting(
final MetaModelContext mmc) {
- return new LogicalTypeFacetDerivedFromClassNameFactory(
+ return new LogicalTypeFacetFromClassNameFactory(
mmc,
new ClassSubstitutorRegistry(Collections.singletonList(new ClassSubstitutorDefault())));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/IconFacetDerivedFromProjectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/IconFacetFromProjectionFacet.java
similarity index 89%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/IconFacetDerivedFromProjectionFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/IconFacetFromProjectionFacet.java
index 2dfdf6e..c86c9bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/IconFacetDerivedFromProjectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/IconFacetFromProjectionFacet.java
@@ -29,12 +29,12 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.NonNull;
import lombok.val;
-public class IconFacetDerivedFromProjectionFacet
+public class IconFacetFromProjectionFacet
extends IconFacetAbstract {
private final @NonNull ProjectionFacet projectionFacet;
- public IconFacetDerivedFromProjectionFacet(
+ public IconFacetFromProjectionFacet(
final ProjectionFacet projectionFacet,
final FacetHolder holder) {
super(holder);
@@ -55,9 +55,9 @@ extends IconFacetAbstract {
@Override
public boolean semanticEquals(final @NonNull Facet other) {
- return other instanceof IconFacetDerivedFromProjectionFacet
+ return other instanceof IconFacetFromProjectionFacet
? this.projectionFacet
- .semanticEquals(((IconFacetDerivedFromProjectionFacet)other).projectionFacet)
+ .semanticEquals(((IconFacetFromProjectionFacet)other).projectionFacet)
: false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/TitleFacetDerivedFromProjectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/TitleFacetFromProjectionFacet.java
similarity index 95%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/TitleFacetDerivedFromProjectionFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/TitleFacetFromProjectionFacet.java
index 60499f4..9bd880e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/TitleFacetDerivedFromProjectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/TitleFacetFromProjectionFacet.java
@@ -28,12 +28,12 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.val;
-public class TitleFacetDerivedFromProjectionFacet
+public class TitleFacetFromProjectionFacet
extends TitleFacetAbstract {
private final ProjectionFacet projectionFacet;
- public TitleFacetDerivedFromProjectionFacet(
+ public TitleFacetFromProjectionFacet(
final ProjectionFacet projectionFacet,
final FacetHolder holder) {
super(holder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetFromChoicesFacetFactory.java
similarity index 91%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetFromChoicesFacetFactory.java
index 5e7aec3..5a9fc98 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetDerivedFromChoicesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/enums/ActionParameterChoicesFacetFromChoicesFacetFactory.java
@@ -27,11 +27,11 @@ import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import lombok.val;
-public class ActionParameterChoicesFacetDerivedFromChoicesFacetFactory
+public class ActionParameterChoicesFacetFromChoicesFacetFactory
extends FacetFactoryAbstract {
@Inject
- public ActionParameterChoicesFacetDerivedFromChoicesFacetFactory(final MetaModelContext mmc) {
+ public ActionParameterChoicesFacetFromChoicesFacetFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.PARAMETERS_ONLY);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java
similarity index 91%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java
index a559261..13f9e04 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacet.java
@@ -28,9 +28,10 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.val;
-public class PropertyChoicesFacetDerivedFromChoicesFacet extends PropertyChoicesFacetAbstract {
+public class PropertyChoicesFacetFromChoicesFacet
+extends PropertyChoicesFacetAbstract {
- public PropertyChoicesFacetDerivedFromChoicesFacet(final FacetHolder holder) {
+ public PropertyChoicesFacetFromChoicesFacet(final FacetHolder holder) {
super(holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacetFactory.java
similarity index 86%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacetFactory.java
index 9a263ff..04b822d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacetFactory.java
@@ -25,11 +25,11 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
-public class PropertyChoicesFacetDerivedFromChoicesFacetFactory
+public class PropertyChoicesFacetFromChoicesFacetFactory
extends FacetFactoryAbstract {
@Inject
- public PropertyChoicesFacetDerivedFromChoicesFacetFactory(final MetaModelContext mmc) {
+ public PropertyChoicesFacetFromChoicesFacetFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.PROPERTIES_ONLY);
}
@@ -43,7 +43,7 @@ extends FacetFactoryAbstract {
}
addFacet(
- new PropertyChoicesFacetDerivedFromChoicesFacet(processMethodContext.getFacetHolder()));
+ new PropertyChoicesFacetFromChoicesFacet(processMethodContext.getFacetHolder()));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromDefaultedFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetFromDefaultedFacet.java
similarity index 88%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromDefaultedFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetFromDefaultedFacet.java
index 6784240..0c050e5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromDefaultedFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetFromDefaultedFacet.java
@@ -29,13 +29,13 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.NonNull;
-public class PropertyDefaultFacetDerivedFromDefaultedFacet
+public class PropertyDefaultFacetFromDefaultedFacet
extends FacetAbstract
implements PropertyDefaultFacet {
private final @NonNull DefaultedFacet typeFacet;
- public PropertyDefaultFacetDerivedFromDefaultedFacet(
+ public PropertyDefaultFacetFromDefaultedFacet(
final DefaultedFacet typeFacet, final FacetHolder holder) {
super(PropertyDefaultFacet.class, holder);
@@ -62,9 +62,9 @@ implements PropertyDefaultFacet {
@Override
public boolean semanticEquals(final @NonNull Facet other) {
- return other instanceof PropertyDefaultFacetDerivedFromDefaultedFacet
+ return other instanceof PropertyDefaultFacetFromDefaultedFacet
? this.typeFacet
- .semanticEquals(((PropertyDefaultFacetDerivedFromDefaultedFacet)other).typeFacet)
+ .semanticEquals(((PropertyDefaultFacetFromDefaultedFacet)other).typeFacet)
: false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetFromTypeFactory.java
similarity index 93%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetFromTypeFactory.java
index 649b78e..6d53216 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetFromTypeFactory.java
@@ -28,11 +28,11 @@ import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet;
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-public class PropertyDefaultFacetDerivedFromTypeFactory
+public class PropertyDefaultFacetFromTypeFactory
extends FacetFactoryAbstract {
@Inject
- public PropertyDefaultFacetDerivedFromTypeFactory(final MetaModelContext mmc) {
+ public PropertyDefaultFacetFromTypeFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.PROPERTIES_ONLY);
}
@@ -56,7 +56,7 @@ extends FacetFactoryAbstract {
final DefaultedFacet returnTypeDefaultedFacet = getDefaultedFacet(returnType);
if (returnTypeDefaultedFacet != null) {
FacetUtil.addFacet(
- new PropertyDefaultFacetDerivedFromDefaultedFacet(
+ new PropertyDefaultFacetFromDefaultedFacet(
returnTypeDefaultedFacet, processMethodContext.getFacetHolder()));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutableFactory.java
similarity index 93%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutableFactory.java
index 4c31b77..257d892 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutableFactory.java
@@ -28,11 +28,11 @@ import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import lombok.val;
-public class DisabledFacetOnPropertyDerivedFromImmutableFactory
+public class DisabledFacetOnPropertyFromImmutableFactory
extends FacetFactoryAbstract {
@Inject
- public DisabledFacetOnPropertyDerivedFromImmutableFactory(final MetaModelContext mmc) {
+ public DisabledFacetOnPropertyFromImmutableFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.PROPERTIES_ONLY);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/DeriveNavigationFacetFromHiddenTypePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/DeriveNavigationFacetFromHiddenTypePostProcessor.java
index b740039..9f98e1e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/DeriveNavigationFacetFromHiddenTypePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/DeriveNavigationFacetFromHiddenTypePostProcessor.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
/**
- * Installs the {@link NavigationFacetDerivedFromHiddenType} on all of the
+ * Installs the {@link NavigationFacetFromHiddenType} on all of the
* {@link ObjectMember}s of the {@link ObjectSpecification}.
*/
public class DeriveNavigationFacetFromHiddenTypePostProcessor extends ObjectSpecificationPostProcessorAbstract {
@@ -68,7 +68,7 @@ public class DeriveNavigationFacetFromHiddenTypePostProcessor extends ObjectSpec
private static void addFacetIfRequired(final FacetHolder facetHolder, final ObjectSpecification navigatedType) {
if(navigatedType.containsNonFallbackFacet(HiddenTypeFacet.class)) {
- FacetUtil.addFacet(new NavigationFacetDerivedFromHiddenType(facetHolder, navigatedType));
+ FacetUtil.addFacet(new NavigationFacetFromHiddenType(facetHolder, navigatedType));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetDerivedFromHiddenType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetFromHiddenType.java
similarity index 93%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetDerivedFromHiddenType.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetFromHiddenType.java
index 857dc3e..0c2f5ea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetDerivedFromHiddenType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetFromHiddenType.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import lombok.val;
-public class NavigationFacetDerivedFromHiddenType
+public class NavigationFacetFromHiddenType
extends FacetAbstract
implements
NavigationFacet {
@@ -41,7 +41,7 @@ implements
return NavigationFacet.class;
}
- public NavigationFacetDerivedFromHiddenType(final FacetHolder holder, final ObjectSpecification navigatedType) {
+ public NavigationFacetFromHiddenType(final FacetHolder holder, final ObjectSpecification navigatedType) {
super(type(), holder);
this.navigatedType = navigatedType;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/DeriveProjectionFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/DeriveProjectionFacetsPostProcessor.java
index 788ed12..3ace111 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/DeriveProjectionFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/DeriveProjectionFacetsPostProcessor.java
@@ -27,8 +27,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
import org.apache.isis.core.metamodel.facets.object.projection.ProjectionFacetFromProjectingProperty;
-import org.apache.isis.core.metamodel.facets.object.projection.ident.IconFacetDerivedFromProjectionFacet;
-import org.apache.isis.core.metamodel.facets.object.projection.ident.TitleFacetDerivedFromProjectionFacet;
+import org.apache.isis.core.metamodel.facets.object.projection.ident.IconFacetFromProjectionFacet;
+import org.apache.isis.core.metamodel.facets.object.projection.ident.TitleFacetFromProjectionFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -56,15 +56,15 @@ extends ObjectSpecificationPostProcessorAbstract {
FacetUtil.addFacet(projectionFacet);
val titleFacet = objectSpecification.getFacet(TitleFacet.class);
if(canOverwrite(titleFacet)) {
- FacetUtil.addFacet(new TitleFacetDerivedFromProjectionFacet(projectionFacet, objectSpecification));
+ FacetUtil.addFacet(new TitleFacetFromProjectionFacet(projectionFacet, objectSpecification));
}
val iconFacet = objectSpecification.getFacet(IconFacet.class);
if(canOverwrite(iconFacet)) {
- FacetUtil.addFacet(new IconFacetDerivedFromProjectionFacet(projectionFacet, objectSpecification));
+ FacetUtil.addFacet(new IconFacetFromProjectionFacet(projectionFacet, objectSpecification));
}
val cssClassFacet = objectSpecification.getFacet(CssClassFacet.class);
if(canOverwrite(cssClassFacet)) {
- FacetUtil.addFacet(new IconFacetDerivedFromProjectionFacet(projectionFacet, objectSpecification));
+ FacetUtil.addFacet(new IconFacetFromProjectionFacet(projectionFacet, objectSpecification));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DeriveDisabledFromImmutablePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DeriveDisabledFromImmutablePostProcessor.java
index 876eb98..5a8a28b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DeriveDisabledFromImmutablePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DeriveDisabledFromImmutablePostProcessor.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration;
import org.apache.isis.core.metamodel.facets.object.immutable.EditingEnabledFacet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.core.metamodel.facets.properties.disabled.fromimmutable.DisabledFacetOnPropertyDerivedFromImmutableFactory;
+import org.apache.isis.core.metamodel.facets.properties.disabled.fromimmutable.DisabledFacetOnPropertyFromImmutableFactory;
import org.apache.isis.core.metamodel.facets.properties.disabled.fromimmutable.DisabledFacetOnPropertyFromImmutable;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -39,7 +39,7 @@ import lombok.val;
/**
- * Replaces {@link DisabledFacetOnPropertyDerivedFromImmutableFactory}
+ * Replaces {@link DisabledFacetOnPropertyFromImmutableFactory}
*/
public class DeriveDisabledFromImmutablePostProcessor
extends ObjectSpecificationPostProcessorAbstract {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveChoicesFromExistingChoicesPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveChoicesFromExistingChoicesPostProcessor.java
index 2da024a..7252e80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveChoicesFromExistingChoicesPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveChoicesFromExistingChoicesPostProcessor.java
@@ -24,11 +24,11 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet;
-import org.apache.isis.core.metamodel.facets.param.choices.enums.ActionParameterChoicesFacetDerivedFromChoicesFacetFactory;
+import org.apache.isis.core.metamodel.facets.param.choices.enums.ActionParameterChoicesFacetFromChoicesFacetFactory;
import org.apache.isis.core.metamodel.facets.param.choices.enums.ActionParameterChoicesFacetInferredFromChoicesFacet;
import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
-import org.apache.isis.core.metamodel.facets.properties.choices.enums.PropertyChoicesFacetDerivedFromChoicesFacet;
-import org.apache.isis.core.metamodel.facets.properties.choices.enums.PropertyChoicesFacetDerivedFromChoicesFacetFactory;
+import org.apache.isis.core.metamodel.facets.properties.choices.enums.PropertyChoicesFacetFromChoicesFacet;
+import org.apache.isis.core.metamodel.facets.properties.choices.enums.PropertyChoicesFacetFromChoicesFacetFactory;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
/**
- * Replaces {@link ActionParameterChoicesFacetDerivedFromChoicesFacetFactory}
- * and {@link PropertyChoicesFacetDerivedFromChoicesFacetFactory}
+ * Replaces {@link ActionParameterChoicesFacetFromChoicesFacetFactory}
+ * and {@link PropertyChoicesFacetFromChoicesFacetFactory}
*/
public class DeriveChoicesFromExistingChoicesPostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@@ -75,7 +75,7 @@ extends ObjectSpecificationPostProcessorAbstract {
property.getElementType()
.lookupNonFallbackFacet(ChoicesFacet.class)
.ifPresent(specFacet -> FacetUtil
- .addFacet(new PropertyChoicesFacetDerivedFromChoicesFacet(facetedMethodFor(property))));
+ .addFacet(new PropertyChoicesFacetFromChoicesFacet(facetedMethodFor(property))));
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveDefaultFromTypePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveDefaultFromTypePostProcessor.java
index adda0d0..4f7aa24 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveDefaultFromTypePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveDefaultFromTypePostProcessor.java
@@ -24,8 +24,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet;
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
-import org.apache.isis.core.metamodel.facets.properties.defaults.fromtype.PropertyDefaultFacetDerivedFromDefaultedFacet;
-import org.apache.isis.core.metamodel.facets.properties.defaults.fromtype.PropertyDefaultFacetDerivedFromTypeFactory;
+import org.apache.isis.core.metamodel.facets.properties.defaults.fromtype.PropertyDefaultFacetFromDefaultedFacet;
+import org.apache.isis.core.metamodel.facets.properties.defaults.fromtype.PropertyDefaultFacetFromTypeFactory;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
/**
- * Installs {@link PropertyDefaultFacetDerivedFromTypeFactory} as a fallback.
+ * Installs {@link PropertyDefaultFacetFromTypeFactory} as a fallback.
*/
public class DeriveDefaultFromTypePostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@@ -60,7 +60,7 @@ extends ObjectSpecificationPostProcessorAbstract {
}
property.getElementType()
.lookupNonFallbackFacet(DefaultedFacet.class)
- .ifPresent(specFacet -> FacetUtil.addFacet(new PropertyDefaultFacetDerivedFromDefaultedFacet(
+ .ifPresent(specFacet -> FacetUtil.addFacet(new PropertyDefaultFacetFromDefaultedFacet(
specFacet, facetedMethodFor(property))));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
index 336ee59..18888b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
@@ -21,10 +21,10 @@ import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationFace
import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationShouldEnforceConcreteTypeToBeIncludedWithMetamodelValidator;
import org.apache.isis.core.metamodel.facets.actions.action.ActionChoicesForCollectionParameterFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.action.ActionOverloadingValidator;
-import org.apache.isis.core.metamodel.facets.actions.contributing.derived.ContributingFacetDerivedFromMixinFacetFactory;
+import org.apache.isis.core.metamodel.facets.actions.contributing.derived.ContributingFacetFromMixinFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.homepage.annotation.HomePageFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
-import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived.NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory;
+import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived.NotInServiceMenuFacetFromDomainServiceFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.validate.method.ActionValidationFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.collections.accessor.CollectionAccessorFacetViaAccessorFactory;
import org.apache.isis.core.metamodel.facets.collections.collection.CollectionAnnotationFacetFactory;
@@ -49,11 +49,11 @@ import org.apache.isis.core.metamodel.facets.object.domainobjectlayout.DomainObj
import org.apache.isis.core.metamodel.facets.object.domainservice.annotation.DomainServiceFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.object.grid.GridFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.hidden.HiddenTypeFacetDerivedFromAuthorizationFactory;
+import org.apache.isis.core.metamodel.facets.object.hidden.HiddenTypeFacetFromAuthorizationFactory;
import org.apache.isis.core.metamodel.facets.object.ignore.annotation.RemoveAnnotatedMethodsFacetFactory;
import org.apache.isis.core.metamodel.facets.object.ignore.javalang.IteratorFilteringFacetFactory;
import org.apache.isis.core.metamodel.facets.object.ignore.javalang.RemoveMethodsFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.logicaltype.classname.LogicalTypeFacetDerivedFromClassNameFactory;
+import org.apache.isis.core.metamodel.facets.object.logicaltype.classname.LogicalTypeFacetFromClassNameFactory;
import org.apache.isis.core.metamodel.facets.object.navparent.annotation.NavigableParentAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImplFactory;
import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacetFactory;
@@ -130,7 +130,7 @@ extends ProgrammingModelAbstract {
// FacetFactorys later.
addFactory(FacetProcessingOrder.A1_FALLBACK_DEFAULTS, new FallbackFacetFactory(mmc));
- addFactory(FacetProcessingOrder.B1_OBJECT_NAMING, new LogicalTypeFacetDerivedFromClassNameFactory(mmc, classSubstitutorRegistry));
+ addFactory(FacetProcessingOrder.B1_OBJECT_NAMING, new LogicalTypeFacetFromClassNameFactory(mmc, classSubstitutorRegistry));
addFactory(FacetProcessingOrder.B1_OBJECT_NAMING, new DomainServiceFacetAnnotationFactory(mmc));
addFactory(FacetProcessingOrder.B1_OBJECT_NAMING, new ValueFacetForValueAnnotationOrAnyMatchingValueSemanticsFacetFactory(mmc));
@@ -187,7 +187,7 @@ extends ProgrammingModelAbstract {
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new BigDecimalFacetOnParameterFromJavaxValidationAnnotationFactory(mmc));
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new BigDecimalFacetOnPropertyFromJavaxValidationDigitsAnnotationFactory(mmc));
- addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory(mmc));
+ addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new NotInServiceMenuFacetFromDomainServiceFacetFactory(mmc));
// must come after CssClassFacetOnMemberFactory
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new CssClassFacetOnActionFromConfiguredRegexFactory(mmc));
@@ -211,9 +211,9 @@ extends ProgrammingModelAbstract {
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new ParameterAnnotationFacetFactory(mmc));
// must come after DomainObjectAnnotationFacetFactory & MixinFacetFactory
- addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new ContributingFacetDerivedFromMixinFacetFactory(mmc));
+ addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new ContributingFacetFromMixinFacetFactory(mmc));
- addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new HiddenTypeFacetDerivedFromAuthorizationFactory(mmc));
+ addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new HiddenTypeFacetFromAuthorizationFactory(mmc));
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, new ValueSemanticsAnnotationFacetFactory(mmc));
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactoryTest.java
similarity index 96%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactoryTest.java
index bc43907..7a4f1f1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetFromDomainServiceFacetFactoryTest.java
@@ -36,14 +36,14 @@ import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServi
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
-public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest
+public class NotInServiceMenuFacetFromDomainServiceFacetFactoryTest
extends AbstractFacetFactoryJUnit4TestCase {
- private NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory facetFactory;
+ private NotInServiceMenuFacetFromDomainServiceFacetFactory facetFactory;
@Before
public void setUp() throws Exception {
- facetFactory = new NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory(metaModelContext);
+ facetFactory = new NotInServiceMenuFacetFromDomainServiceFacetFactory(metaModelContext);
}
//TODO[2142] NatureOfService.VIEW_CONTRIBUTIONS_ONLY was deprecated, remove ?
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacetDerivedFromClassNameFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacetFromClassNameFactoryTest.java
similarity index 92%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacetDerivedFromClassNameFactoryTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacetFromClassNameFactoryTest.java
index 44d665e..484f10e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacetDerivedFromClassNameFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/logicaltype/LogicalTypeFacetFromClassNameFactoryTest.java
@@ -29,12 +29,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.ObjectTypeFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.logicaltype.classname.LogicalTypeFacetDerivedFromClassNameFactory;
+import org.apache.isis.core.metamodel.facets.object.logicaltype.classname.LogicalTypeFacetFromClassNameFactory;
import org.apache.isis.core.metamodel.facets.object.logicaltype.classname.LogicalTypeFacetFromClassName;
import org.apache.isis.core.metamodel.facets.value.annotation.LogicalTypeFacetForValueAnnotation;
import org.apache.isis.core.metamodel.facets.value.annotation.ValueAnnotationFacetFactory;
-public class LogicalTypeFacetDerivedFromClassNameFactoryTest
+public class LogicalTypeFacetFromClassNameFactoryTest
extends AbstractFacetFactoryJUnit4TestCase {
private ObjectTypeFacetFactory facetFactory;
@@ -45,7 +45,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
@Test
public void installsFacet_passedThroughClassSubstitutor() {
- facetFactory = LogicalTypeFacetDerivedFromClassNameFactory.forTesting(metaModelContext);
+ facetFactory = LogicalTypeFacetFromClassNameFactory.forTesting(metaModelContext);
expectNoMethodsRemoved();
@@ -65,7 +65,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
@Test
public void installsFacet_onValues() {
- facetFactory = LogicalTypeFacetDerivedFromClassNameFactory.forTesting(metaModelContext);
+ facetFactory = LogicalTypeFacetFromClassNameFactory.forTesting(metaModelContext);
expectNoMethodsRemoved();
diff --git a/core/metamodel/src/test/java/org/datanucleus/testing/dom/CustomerAsProxiedByDataNucleus.java b/core/metamodel/src/test/java/org/datanucleus/testing/dom/CustomerAsProxiedByDataNucleus.java
index e4d36d5..a014336 100644
--- a/core/metamodel/src/test/java/org/datanucleus/testing/dom/CustomerAsProxiedByDataNucleus.java
+++ b/core/metamodel/src/test/java/org/datanucleus/testing/dom/CustomerAsProxiedByDataNucleus.java
@@ -18,8 +18,8 @@
*/
package org.datanucleus.testing.dom;
-import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacetDerivedFromClassNameFactoryTest;
+import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacetFromClassNameFactoryTest;
public class CustomerAsProxiedByDataNucleus
-extends LogicalTypeFacetDerivedFromClassNameFactoryTest.Customer {
+extends LogicalTypeFacetFromClassNameFactoryTest.Customer {
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
index b2df933..7a8835c 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
@@ -36,9 +36,9 @@ import org.apache.isis.persistence.jdo.metamodel.facets.object.datastoreidentity
import org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetFactory;
import org.apache.isis.persistence.jdo.metamodel.facets.object.query.JdoQueryAnnotationFacetFactory;
import org.apache.isis.persistence.jdo.metamodel.facets.object.version.JdoVersionAnnotationFacetFactory;
-import org.apache.isis.persistence.jdo.metamodel.facets.prop.column.BigDecimalInferredFromJdoColumnAnnotationFacetFactory;
+import org.apache.isis.persistence.jdo.metamodel.facets.prop.column.BigDecimalFromJdoColumnAnnotationFacetFactory;
import org.apache.isis.persistence.jdo.metamodel.facets.prop.column.MandatoryFromJdoColumnAnnotationFacetFactory;
-import org.apache.isis.persistence.jdo.metamodel.facets.prop.column.MaxLengthDerivedFromJdoColumnAnnotationFacetFactory;
+import org.apache.isis.persistence.jdo.metamodel.facets.prop.column.MaxLengthFromJdoColumnAnnotationFacetFactory;
import org.apache.isis.persistence.jdo.metamodel.facets.prop.notpersistent.JdoNotPersistentAnnotationFacetFactory;
import org.apache.isis.persistence.jdo.metamodel.facets.prop.primarykey.JdoPrimaryKeyAnnotationFacetFactory;
import org.apache.isis.persistence.jdo.provider.entities.JdoFacetContext;
@@ -82,8 +82,8 @@ public class JdoProgrammingModel implements MetaModelRefiner {
pm.addFactory(step2, new JdoQueryAnnotationFacetFactory(mmc, jdoFacetContext), Marker.JDO);
- pm.addFactory(step2, new BigDecimalInferredFromJdoColumnAnnotationFacetFactory(mmc), Marker.JDO);
- pm.addFactory(step2, new MaxLengthDerivedFromJdoColumnAnnotationFacetFactory(mmc), Marker.JDO);
+ pm.addFactory(step2, new BigDecimalFromJdoColumnAnnotationFacetFactory(mmc), Marker.JDO);
+ pm.addFactory(step2, new MaxLengthFromJdoColumnAnnotationFacetFactory(mmc), Marker.JDO);
// must appear after JdoPrimaryKeyAnnotationFacetFactory (above)
// and also MandatoryFacetOnPropertyMandatoryAnnotationFactory
// and also PropertyAnnotationFactory
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactory.java
similarity index 96%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactory.java
index 11cd6b9..29a21d9 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactory.java
@@ -40,12 +40,12 @@ import org.apache.isis.persistence.jdo.provider.metamodel.facets.prop.notpersist
import lombok.val;
-public class BigDecimalInferredFromJdoColumnAnnotationFacetFactory
+public class BigDecimalFromJdoColumnAnnotationFacetFactory
extends FacetFactoryAbstract
implements MetaModelRefiner {
@Inject
- public BigDecimalInferredFromJdoColumnAnnotationFacetFactory(final MetaModelContext mmc) {
+ public BigDecimalFromJdoColumnAnnotationFacetFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.PROPERTIES_ONLY);
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetFromJdoColumnAnnotation.java
similarity index 90%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetFromJdoColumnAnnotation.java
index 8f3c6ba..7371dbc 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetFromJdoColumnAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacetAbstract;
-public class MaxLengthFacetDerivedFromJdoColumn
+public class MaxLengthFacetFromJdoColumnAnnotation
extends MaxLengthFacetAbstract {
public static Optional<MaxLengthFacet> create(
@@ -35,11 +35,11 @@ extends MaxLengthFacetAbstract {
return jdoColumnIfAny
.map(jdoColumn->
- new MaxLengthFacetDerivedFromJdoColumn(
+ new MaxLengthFacetFromJdoColumnAnnotation(
jdoColumn.length(), holder));
}
- private MaxLengthFacetDerivedFromJdoColumn(
+ private MaxLengthFacetFromJdoColumnAnnotation(
final int maxLength, final FacetHolder holder) {
super(maxLength, holder);
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
similarity index 96%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
index e43b680..6824fb6 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
@@ -40,13 +40,13 @@ import org.apache.isis.persistence.jdo.provider.metamodel.facets.prop.notpersist
import lombok.val;
-public class MaxLengthDerivedFromJdoColumnAnnotationFacetFactory
+public class MaxLengthFromJdoColumnAnnotationFacetFactory
extends FacetFactoryAbstract
implements MetaModelRefiner {
@Inject private JdoFacetContext jdoFacetContext;
- public MaxLengthDerivedFromJdoColumnAnnotationFacetFactory(final MetaModelContext mmc) {
+ public MaxLengthFromJdoColumnAnnotationFacetFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.PROPERTIES_ONLY);
}
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
similarity index 95%
rename from persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
rename to persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
index 8becb59..def2f7e 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
@@ -33,17 +33,17 @@ import org.apache.isis.persistence.jdo.metamodel.testing.AbstractFacetFactoryTes
import lombok.val;
-public class BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest
+public class BigDecimalFromJdoColumnAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
- private BigDecimalInferredFromJdoColumnAnnotationFacetFactory facetFactory;
+ private BigDecimalFromJdoColumnAnnotationFacetFactory facetFactory;
@Override
protected void setUp() throws Exception {
super.setUp();
val mmc = MetaModelContext_forTesting.buildDefault();
- facetFactory = new BigDecimalInferredFromJdoColumnAnnotationFacetFactory(mmc);
+ facetFactory = new BigDecimalFromJdoColumnAnnotationFacetFactory(mmc);
}
@Override
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
similarity index 98%
rename from persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
rename to persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
index ab24c06..dd4d23a 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.persistence.jdo.metamodel.testing.AbstractFacetFactoryTes
import lombok.val;
-public class MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest
+public class MandatoryFromJdoColumnAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
private MandatoryFromJdoColumnAnnotationFacetFactory facetFactory;
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetDerivedFromJpaColumn.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetFromJpaColumnAnnotation.java
similarity index 86%
rename from persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetDerivedFromJpaColumn.java
rename to persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetFromJpaColumnAnnotation.java
index 0f4c4af..5475fbd 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetDerivedFromJpaColumn.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFacetFromJpaColumnAnnotation.java
@@ -24,10 +24,11 @@ import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFace
/**
* Derived by presence of an <tt>@Column</tt> method.
*/
-public class MandatoryFacetDerivedFromJpaColumn extends MandatoryFacetAbstract {
+public class MandatoryFacetFromJpaColumnAnnotation
+extends MandatoryFacetAbstract {
- public MandatoryFacetDerivedFromJpaColumn(final FacetHolder holder, final boolean required) {
+ public MandatoryFacetFromJpaColumnAnnotation(final FacetHolder holder, final boolean required) {
super(holder, Semantics.of(required));
}
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java
index e054a09..c46b7b2 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MandatoryFromJpaColumnAnnotationFacetFactory.java
@@ -58,7 +58,7 @@ extends FacetFactoryAbstract {
val nullable = nullable1.orElseGet(nullable2::get);
val facetHolder = processMethodContext.getFacetHolder();
- FacetUtil.addFacet(new MandatoryFacetDerivedFromJpaColumn(
+ FacetUtil.addFacet(new MandatoryFacetFromJpaColumnAnnotation(
facetHolder,
!nullable));
}