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:18:50 UTC
[isis] branch master updated: ISIS-2871: simplify some facet names
('inferred')
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 6694f60 ISIS-2871: simplify some facet names ('inferred')
6694f60 is described below
commit 6694f60d1db3f3e225cca65918324d6c3e7430f3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Nov 7 11:18:41 2021 +0100
ISIS-2871: simplify some facet names ('inferred')
---
.../metamodel/facets/actcoll/typeof/TypeOfFacet.java | 4 ++--
...tInferredFromArray.java => TypeOfFacetFromArray.java} | 5 +++--
...redFromGenerics.java => TypeOfFacetFromGenerics.java} | 5 +++--
...omType.java => DescribedAsFacetOnMemberFromType.java} | 6 +++---
.../LogicalTypeFacetDerivedFromClassNameFactory.java | 6 +++---
...ClassName.java => LogicalTypeFacetFromClassName.java} | 6 +++---
...y.java => LogicalTypeFacetFromIoCNamingStrategy.java} | 4 ++--
...nFacet.java => CssClassFacetFromProjectionFacet.java} | 4 ++--
.../facets/object/support/ObjectSupportFacetFactory.java | 4 ++--
...ringMethod.java => TitleFacetFromToStringMethod.java} | 6 +++---
...ineFacet.java => LabelAtFacetFromMultiLineFacet.java} | 5 +++--
...ype.java => DescribedAsFacetOnParameterFromType.java} | 6 +++---
...e.java => TypicalLengthFacetOnParameterFromType.java} | 8 ++++----
...sabledFacetOnPropertyDerivedFromImmutableFactory.java | 2 +-
...le.java => DisabledFacetOnPropertyFromImmutable.java} | 8 ++++----
...ava => DisabledFacetOnPropertyFromMissingSetter.java} | 4 ++--
.../inferred/DisabledFacetOnPropertyInferredFactory.java | 2 +-
...pe.java => TypicalLengthFacetOnPropertyFromType.java} | 8 ++++----
.../all/DeriveDescribedAsFromTypePostProcessor.java | 10 +++++-----
.../DeriveDisabledFromImmutablePostProcessor.java | 4 ++--
.../DeriveTypicalLengthFromTypePostProcessor.java | 8 ++++----
.../action/ActionAnnotationFacetFactoryTest_TypeOf.java | 8 ++++----
.../collection/CollectionAnnotationFacetFactoryTest.java | 8 ++++----
.../CollectionAnnotationFacetFactoryTest_typeOf.java | 16 ++++++++--------
.../ident/title/TitleFacetViaMethodsFactoryTest.java | 8 ++++----
.../LogicalTypeFacetDerivedFromClassNameFactoryTest.java | 6 +++---
.../JdoDiscriminatorAnnotationFacetFactory.java | 6 +++---
...calTypeFacetFromJdoDiscriminatorValueAnnotation.java} | 4 ++--
...calTypeFacetFromJdoPersistenceCapableAnnotation.java} | 6 +++---
.../JdoPersistenceCapableFacetFactory.java | 4 ++--
...cimalInferredFromJdoColumnAnnotationFacetFactory.java | 2 +-
... MandatoryFacetFromAbsenceOfJdoColumnAnnotation.java} | 4 ++--
.../MandatoryFromJdoColumnAnnotationFacetFactory.java | 6 +++---
...LengthDerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
...a => MaxTotalDigitsFacetFromJdoColumnAnnotation.java} | 6 +++---
...ava => DisabledFacetFromJdoPrimaryKeyAnnotation.java} | 4 ++--
.../primarykey/JdoPrimaryKeyAnnotationFacetFactory.java | 4 ++--
...ava => OptionalFacetFromJdoPrimaryKeyAnnotation.java} | 4 ++--
.../GivenJdoDiscriminatorAnnotationFacetFactoryTest.java | 2 +-
...alDerivedFromJdoColumnAnnotationFacetFactoryTest.java | 2 +-
...ryDerivedFromJdoColumnAnnotationFacetFactoryTest.java | 4 ++--
.../GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java | 4 ++--
.../persistence/jpa/metamodel/JpaProgrammingModel.java | 4 ++--
...> BigDecimalFromJpaColumnAnnotationFacetFactory.java} | 8 ++++----
...> MaxFractionDigitsFacetFromJpaColumnAnnotation.java} | 6 +++---
...a => MaxTotalDigitsFacetFromJpaColumnAnnotation.java} | 6 +++---
46 files changed, 126 insertions(+), 123 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java
index 885a29e..2ea1008 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacet.java
@@ -45,13 +45,13 @@ public interface TypeOfFacet extends SingleClassValueFacet {
static TypeOfFacet inferredFromArray(
final Class<?> elementType,
final FacetHolder holder) {
- return new TypeOfFacetInferredFromArray(elementType, holder);
+ return new TypeOfFacetFromArray(elementType, holder);
}
static TypeOfFacet inferredFromGenerics(
final Class<?> elementType,
final FacetHolder holder) {
- return new TypeOfFacetInferredFromGenerics(elementType, holder);
+ return new TypeOfFacetFromGenerics(elementType, holder);
}
static Optional<TypeOfFacet> inferFromParameterType(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromArray.java
similarity index 86%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromArray.java
index b424e68..64c07aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromArray.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromArray.java
@@ -20,9 +20,10 @@ package org.apache.isis.core.metamodel.facets.actcoll.typeof;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public class TypeOfFacetInferredFromArray extends TypeOfFacetAbstract {
+public class TypeOfFacetFromArray
+extends TypeOfFacetAbstract {
- TypeOfFacetInferredFromArray(final Class<?> type, final FacetHolder holder) {
+ TypeOfFacetFromArray(final Class<?> type, final FacetHolder holder) {
super(type, holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromGenerics.java
similarity index 86%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromGenerics.java
index 989866d..0951fa0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetInferredFromGenerics.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromGenerics.java
@@ -20,9 +20,10 @@ package org.apache.isis.core.metamodel.facets.actcoll.typeof;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public class TypeOfFacetInferredFromGenerics extends TypeOfFacetAbstract {
+public class TypeOfFacetFromGenerics
+extends TypeOfFacetAbstract {
- TypeOfFacetInferredFromGenerics(final Class<?> type, final FacetHolder holder) {
+ TypeOfFacetFromGenerics(final Class<?> type, final FacetHolder holder) {
super(type, holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberInferredFromType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromType.java
similarity index 90%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberInferredFromType.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromType.java
index 2a5a90a..7d96bd5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberInferredFromType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/described/annotprop/DescribedAsFacetOnMemberFromType.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.facets.all.described.ObjectDescribedFacet;
import lombok.val;
-public class DescribedAsFacetOnMemberInferredFromType
+public class DescribedAsFacetOnMemberFromType
extends MemberDescribedFacetWithStaticTextAbstract {
public static Optional<MemberDescribedFacet> create(
@@ -39,11 +39,11 @@ extends MemberDescribedFacetWithStaticTextAbstract {
return Optional.ofNullable(describedIfAny)
.map(described->
- new DescribedAsFacetOnMemberInferredFromType(described, holder));
+ new DescribedAsFacetOnMemberFromType(described, holder));
}
- private DescribedAsFacetOnMemberInferredFromType(
+ private DescribedAsFacetOnMemberFromType(
final String described,
final FacetHolder holder) {
super(described, holder, Precedence.INFERRED);
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/LogicalTypeFacetDerivedFromClassNameFactory.java
index b3e10a5..66ed7a2 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/LogicalTypeFacetDerivedFromClassNameFactory.java
@@ -96,11 +96,11 @@ implements
val isService = serviceId!=null;
return isService
- ? new LogicalTypeFacetInferredFromIoCNamingStrategy(
+ ? new LogicalTypeFacetFromIoCNamingStrategy(
LogicalType
.eager(substitutedClass, serviceId),
facetHolder)
- : new LogicalTypeFacetInferredFromClassName(substitutedClass, facetHolder);
+ : new LogicalTypeFacetFromClassName(substitutedClass, facetHolder);
}
private static String getServiceId(final FacetHolder facetHolder) {
@@ -128,7 +128,7 @@ implements
}
val logicalTypeFacet = objectSpec.getFacet(LogicalTypeFacet.class);
- if(logicalTypeFacet instanceof LogicalTypeFacetInferredFromClassName) {
+ if(logicalTypeFacet instanceof LogicalTypeFacetFromClassName) {
ValidationFailure.raiseFormatted(
objectSpec,
"%s: the object type must be specified explicitly ('%s' config property). "
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetInferredFromClassName.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassName.java
similarity index 84%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetInferredFromClassName.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassName.java
index 7fc5079..030d913 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetInferredFromClassName.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromClassName.java
@@ -23,14 +23,14 @@ import org.apache.isis.core.metamodel.commons.ClassUtil;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacetAbstract;
-public class LogicalTypeFacetInferredFromClassName
+public class LogicalTypeFacetFromClassName
extends LogicalTypeFacetAbstract {
- public LogicalTypeFacetInferredFromClassName(final Class<?> cls, final FacetHolder holder) {
+ public LogicalTypeFacetFromClassName(final Class<?> cls, final FacetHolder holder) {
this(LogicalType.eager(cls, ClassUtil.getCanonicalName_friendlyToInnerClasses(cls)), holder);
}
- public LogicalTypeFacetInferredFromClassName(final LogicalType logicalType, final FacetHolder holder) {
+ public LogicalTypeFacetFromClassName(final LogicalType logicalType, final FacetHolder holder) {
super(logicalType, holder, Precedence.INFERRED);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetInferredFromIoCNamingStrategy.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromIoCNamingStrategy.java
similarity index 92%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetInferredFromIoCNamingStrategy.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromIoCNamingStrategy.java
index 37ac4dd..8e43e63 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetInferredFromIoCNamingStrategy.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/logicaltype/classname/LogicalTypeFacetFromIoCNamingStrategy.java
@@ -25,10 +25,10 @@ import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacet
/**
* @since 2.0
*/
-public class LogicalTypeFacetInferredFromIoCNamingStrategy
+public class LogicalTypeFacetFromIoCNamingStrategy
extends LogicalTypeFacetAbstract {
- LogicalTypeFacetInferredFromIoCNamingStrategy(
+ LogicalTypeFacetFromIoCNamingStrategy(
final LogicalType logicalType, final FacetHolder holder) {
super(logicalType, holder, Precedence.INFERRED);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/CssClassFacetInferredFromProjectionFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/CssClassFacetFromProjectionFacet.java
similarity index 95%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/CssClassFacetInferredFromProjectionFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/CssClassFacetFromProjectionFacet.java
index 36f9aae..24eca12 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/CssClassFacetInferredFromProjectionFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/projection/ident/CssClassFacetFromProjectionFacet.java
@@ -28,12 +28,12 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.val;
-public class CssClassFacetInferredFromProjectionFacet
+public class CssClassFacetFromProjectionFacet
extends CssClassFacetAbstract {
private final ProjectionFacet projectionFacet;
- public CssClassFacetInferredFromProjectionFacet(
+ public CssClassFacetFromProjectionFacet(
final ProjectionFacet projectionFacet,
final FacetHolder holder) {
super(holder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/support/ObjectSupportFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/support/ObjectSupportFacetFactory.java
index 2b527a6..03e755e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/support/ObjectSupportFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/support/ObjectSupportFacetFactory.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.facets.object.hidden.HiddenObjectFacet;
import org.apache.isis.core.metamodel.facets.object.hidden.method.HiddenObjectFacetViaMethod;
import org.apache.isis.core.metamodel.facets.object.icon.method.IconFacetViaIconNameMethod;
import org.apache.isis.core.metamodel.facets.object.layout.LayoutFacetViaLayoutMethod;
-import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetInferredFromToStringMethod;
+import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetFromToStringMethod;
import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetViaTitleMethod;
import org.apache.isis.core.metamodel.methods.MethodFinder;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactoryAbstract;
@@ -119,7 +119,7 @@ extends MethodPrefixBasedFacetFactoryAbstract {
.streamMethodsMatchingSignature(NO_ARG)
.peek(processClassContext::removeMethod)
.forEach(method->{
- addFacetIfPresent(TitleFacetInferredFromToStringMethod
+ addFacetIfPresent(TitleFacetFromToStringMethod
.create(method, processClassContext.getFacetHolder()));
});
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetInferredFromToStringMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java
similarity index 94%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetInferredFromToStringMethod.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java
index a6ec914..ff3e2e9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetInferredFromToStringMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetFromToStringMethod.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleRenderRequest;
import lombok.Getter;
import lombok.NonNull;
-public class TitleFacetInferredFromToStringMethod
+public class TitleFacetFromToStringMethod
extends TitleFacetAbstract
implements HasImperativeAspect {
@@ -48,12 +48,12 @@ implements HasImperativeAspect {
return Optional.ofNullable(methodIfAny)
.filter(method->!ClassExtensions.isJavaClass(method.getDeclaringClass()))
.map(method->
- new TitleFacetInferredFromToStringMethod(
+ new TitleFacetFromToStringMethod(
ImperativeAspect.singleMethod(method, Intent.UI_HINT),
holder));
}
- private TitleFacetInferredFromToStringMethod(
+ private TitleFacetFromToStringMethod(
final ImperativeAspect imperativeAspect,
final FacetHolder holder) {
super(holder, Precedence.INFERRED);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetInferredFromMultiLineFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetFromMultiLineFacet.java
similarity index 88%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetInferredFromMultiLineFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetFromMultiLineFacet.java
index aa271b9..fce87ab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetInferredFromMultiLineFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/labelat/LabelAtFacetFromMultiLineFacet.java
@@ -28,9 +28,10 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
* This can still be overridden using the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation / layout.json.
* </p>
*/
-public class LabelAtFacetInferredFromMultiLineFacet extends LabelAtFacetAbstract {
+public class LabelAtFacetFromMultiLineFacet
+extends LabelAtFacetAbstract {
- public LabelAtFacetInferredFromMultiLineFacet(final FacetHolder holder) {
+ public LabelAtFacetFromMultiLineFacet(final FacetHolder holder) {
super(LabelPosition.TOP, holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterInferredFromType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterFromType.java
similarity index 90%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterInferredFromType.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterFromType.java
index bae7443..a4a2c35 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterInferredFromType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/described/annotderived/DescribedAsFacetOnParameterFromType.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.facets.all.described.ParamDescribedFacetAb
import lombok.val;
-public class DescribedAsFacetOnParameterInferredFromType
+public class DescribedAsFacetOnParameterFromType
extends ParamDescribedFacetAbstract {
public static Optional<ParamDescribedFacet> create(
@@ -39,10 +39,10 @@ extends ParamDescribedFacetAbstract {
return Optional.ofNullable(describedIfAny)
.map(described->
- new DescribedAsFacetOnParameterInferredFromType(described, holder));
+ new DescribedAsFacetOnParameterFromType(described, holder));
}
- private DescribedAsFacetOnParameterInferredFromType(
+ private DescribedAsFacetOnParameterFromType(
final String described,
final FacetHolder holder) {
super(described, holder, Precedence.INFERRED);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterInferredFromType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterFromType.java
similarity index 88%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterInferredFromType.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterFromType.java
index c714c8c..8cd6176 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterInferredFromType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/fromtype/TypicalLengthFacetOnParameterFromType.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFace
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract;
-public class TypicalLengthFacetOnParameterInferredFromType
+public class TypicalLengthFacetOnParameterFromType
extends TypicalLengthFacetAbstract {
// -- FACTORIES
@@ -35,7 +35,7 @@ extends TypicalLengthFacetAbstract {
* based on the assumption, that all MultiLineFacet processing already has settled
* on the peer (action parameter meta-data)
*/
- public static TypicalLengthFacetOnParameterInferredFromType createWhilePostprocessing(
+ public static TypicalLengthFacetOnParameterFromType createWhilePostprocessing(
final TypicalLengthFacet typicalLengthFacet,
final FacetHolder holder) {
@@ -44,7 +44,7 @@ extends TypicalLengthFacetAbstract {
.orElse(1);
final int typicalLength = numberOfLines * typicalLengthFacet.value();
- return new TypicalLengthFacetOnParameterInferredFromType(typicalLength, typicalLengthFacet, holder);
+ return new TypicalLengthFacetOnParameterFromType(typicalLength, typicalLengthFacet, holder);
}
// -- FIELDS
@@ -56,7 +56,7 @@ extends TypicalLengthFacetAbstract {
// -- CONSTRUCTOR
- private TypicalLengthFacetOnParameterInferredFromType(
+ private TypicalLengthFacetOnParameterFromType(
final int typicalLength,
final TypicalLengthFacet typicalLengthFacet,
final FacetHolder holder) {
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/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
index 2b8e24c..4c31b77 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/DisabledFacetOnPropertyDerivedFromImmutableFactory.java
@@ -53,7 +53,7 @@ extends FacetFactoryAbstract {
return;
}
addFacet(
- DisabledFacetOnPropertyInferredFromImmutable
+ DisabledFacetOnPropertyFromImmutable
.forImmutable(facetHolder, immutableFacet));
});
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyInferredFromImmutable.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
similarity index 89%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyInferredFromImmutable.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
index 41eca55..894a89c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyInferredFromImmutable.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/fromimmutable/DisabledFacetOnPropertyFromImmutable.java
@@ -29,16 +29,16 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.NonNull;
import lombok.val;
-public class DisabledFacetOnPropertyInferredFromImmutable
+public class DisabledFacetOnPropertyFromImmutable
extends DisabledFacetAbstract {
// -- FACTORY
- public static DisabledFacetOnPropertyInferredFromImmutable forImmutable(
+ public static DisabledFacetOnPropertyFromImmutable forImmutable(
final @NonNull FacetedMethod facetedMethodFor,
final @NonNull ImmutableFacet immutableFacet) {
- return new DisabledFacetOnPropertyInferredFromImmutable(facetedMethodFor, immutableFacet);
+ return new DisabledFacetOnPropertyFromImmutable(facetedMethodFor, immutableFacet);
}
// -- FIELDS
@@ -47,7 +47,7 @@ extends DisabledFacetAbstract {
// -- CONSTRUCTOR
- private DisabledFacetOnPropertyInferredFromImmutable(
+ private DisabledFacetOnPropertyFromImmutable(
final @NonNull FacetHolder holder,
final @NonNull ImmutableFacet reasonProvidingImmutableFacet) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferredFromMissingSetter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyFromMissingSetter.java
similarity index 88%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferredFromMissingSetter.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyFromMissingSetter.java
index ac7ff47..654b774 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferredFromMissingSetter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyFromMissingSetter.java
@@ -22,10 +22,10 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstract;
-public class DisabledFacetOnPropertyInferredFromMissingSetter
+public class DisabledFacetOnPropertyFromMissingSetter
extends DisabledFacetAbstract {
- public DisabledFacetOnPropertyInferredFromMissingSetter(final FacetHolder holder) {
+ public DisabledFacetOnPropertyFromMissingSetter(final FacetHolder holder) {
super(Where.ANYWHERE, ALWAYS_DISABLED_REASON, holder);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferredFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferredFactory.java
index 1c702a9..e12696c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferredFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/disabled/inferred/DisabledFacetOnPropertyInferredFactory.java
@@ -54,7 +54,7 @@ extends FacetFactoryAbstract {
}
// else, infer that this is not modifiable
- FacetUtil.addFacet(new DisabledFacetOnPropertyInferredFromMissingSetter(property));
+ FacetUtil.addFacet(new DisabledFacetOnPropertyFromMissingSetter(property));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyInferredFromType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java
similarity index 90%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyInferredFromType.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java
index d37bcc0..8a0040e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyInferredFromType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/fromtype/TypicalLengthFacetOnPropertyFromType.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFace
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacetAbstract;
-public class TypicalLengthFacetOnPropertyInferredFromType
+public class TypicalLengthFacetOnPropertyFromType
extends TypicalLengthFacetAbstract {
// -- FACTORY
@@ -36,7 +36,7 @@ extends TypicalLengthFacetAbstract {
* based on the assumption, that all MultiLineFacet processing already has settled
* on the peer (property meta-data)
*/
- public static TypicalLengthFacetOnPropertyInferredFromType createWhilePostprocessing(
+ public static TypicalLengthFacetOnPropertyFromType createWhilePostprocessing(
final TypicalLengthFacet typicalLengthFacet,
final FacetedMethod peer) {
@@ -45,7 +45,7 @@ extends TypicalLengthFacetAbstract {
.orElse(1);
final int typicalLength = numberOfLines * typicalLengthFacet.value();
- return new TypicalLengthFacetOnPropertyInferredFromType(
+ return new TypicalLengthFacetOnPropertyFromType(
typicalLength, typicalLengthFacet, peer);
}
@@ -58,7 +58,7 @@ extends TypicalLengthFacetAbstract {
// -- CONSTRUCTOR
- private TypicalLengthFacetOnPropertyInferredFromType(
+ private TypicalLengthFacetOnPropertyFromType(
final int typicalLength,
final TypicalLengthFacet typicalLengthFacet,
final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveDescribedAsFromTypePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveDescribedAsFromTypePostProcessor.java
index 0ac3f14..cc13a79 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveDescribedAsFromTypePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveDescribedAsFromTypePostProcessor.java
@@ -25,8 +25,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.all.described.MemberDescribedFacet;
import org.apache.isis.core.metamodel.facets.all.described.ObjectDescribedFacet;
import org.apache.isis.core.metamodel.facets.all.described.ParamDescribedFacet;
-import org.apache.isis.core.metamodel.facets.members.described.annotprop.DescribedAsFacetOnMemberInferredFromType;
-import org.apache.isis.core.metamodel.facets.param.described.annotderived.DescribedAsFacetOnParameterInferredFromType;
+import org.apache.isis.core.metamodel.facets.members.described.annotprop.DescribedAsFacetOnMemberFromType;
+import org.apache.isis.core.metamodel.facets.param.described.annotderived.DescribedAsFacetOnParameterFromType;
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;
@@ -56,7 +56,7 @@ extends ObjectSpecificationPostProcessorAbstract {
objectAction.getReturnType()
.lookupNonFallbackFacet(ObjectDescribedFacet.class)
.ifPresent(specFacet -> FacetUtil.addFacetIfPresent(
- DescribedAsFacetOnMemberInferredFromType
+ DescribedAsFacetOnMemberFromType
.create(
specFacet,
facetedMethodFor(objectAction))));
@@ -71,7 +71,7 @@ extends ObjectSpecificationPostProcessorAbstract {
paramSpec.lookupNonFallbackFacet(ObjectDescribedFacet.class)
.ifPresent(describedAsFacet->{
FacetUtil.addFacetIfPresent(
- DescribedAsFacetOnParameterInferredFromType
+ DescribedAsFacetOnParameterFromType
.create(describedAsFacet, peerFor(parameter)));
});
}
@@ -93,7 +93,7 @@ extends ObjectSpecificationPostProcessorAbstract {
objectAssociation.getElementType()
.lookupNonFallbackFacet(ObjectDescribedFacet.class)
.ifPresent(specFacet -> FacetUtil.addFacetIfPresent(
- DescribedAsFacetOnMemberInferredFromType
+ DescribedAsFacetOnMemberFromType
.create(specFacet, facetedMethodFor(objectAssociation))));
}
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 ae1cb7e..876eb98 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
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.facets.object.domainobject.editing.Immutab
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.DisabledFacetOnPropertyInferredFromImmutable;
+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;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -88,7 +88,7 @@ extends ObjectSpecificationPostProcessorAbstract {
}
- FacetUtil.addFacet(DisabledFacetOnPropertyInferredFromImmutable
+ FacetUtil.addFacet(DisabledFacetOnPropertyFromImmutable
.forImmutable(facetedMethodFor(property), immutableFacet));
});
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveTypicalLengthFromTypePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveTypicalLengthFromTypePostProcessor.java
index d59e0e1..950855d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveTypicalLengthFromTypePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveTypicalLengthFromTypePostProcessor.java
@@ -23,8 +23,8 @@ import javax.inject.Inject;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.facets.param.typicallen.fromtype.TypicalLengthFacetOnParameterInferredFromType;
-import org.apache.isis.core.metamodel.facets.properties.typicallen.fromtype.TypicalLengthFacetOnPropertyInferredFromType;
+import org.apache.isis.core.metamodel.facets.param.typicallen.fromtype.TypicalLengthFacetOnParameterFromType;
+import org.apache.isis.core.metamodel.facets.properties.typicallen.fromtype.TypicalLengthFacetOnPropertyFromType;
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;
@@ -58,7 +58,7 @@ extends ObjectSpecificationPostProcessorAbstract {
.lookupNonFallbackFacet(TypicalLengthFacet.class)
.ifPresent(typicalLengthFacet ->
FacetUtil.addFacet(
- TypicalLengthFacetOnParameterInferredFromType
+ TypicalLengthFacetOnParameterFromType
.createWhilePostprocessing(typicalLengthFacet, peerFor(parameter))));
}
@@ -72,7 +72,7 @@ extends ObjectSpecificationPostProcessorAbstract {
.lookupNonFallbackFacet(TypicalLengthFacet.class)
.ifPresent(typicalLengthFacet ->
FacetUtil.addFacet(
- TypicalLengthFacetOnPropertyInferredFromType
+ TypicalLengthFacetOnPropertyFromType
.createWhilePostprocessing(typicalLengthFacet, facetedMethodFor(property))));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
index 76d3764..47210d9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_TypeOf.java
@@ -28,8 +28,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromArray;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromGenerics;
import org.apache.isis.core.metamodel.facets.actions.action.typeof.TypeOfFacetForActionAnnotation;
import static org.apache.isis.core.metamodel.commons.matchers.IsisMatchers.classEqualTo;
@@ -145,7 +145,7 @@ public class ActionAnnotationFacetFactoryTest_TypeOf extends ActionAnnotationFac
// then
final TypeOfFacet facet = facetedMethod.getFacet(TypeOfFacet.class);
Assert.assertNotNull(facet);
- Assert.assertTrue(facet instanceof TypeOfFacetInferredFromArray);
+ Assert.assertTrue(facet instanceof TypeOfFacetFromArray);
assertThat(facet.value(), classEqualTo(Order.class));
}
@@ -173,7 +173,7 @@ public class ActionAnnotationFacetFactoryTest_TypeOf extends ActionAnnotationFac
// then
final TypeOfFacet facet = facetedMethod.getFacet(TypeOfFacet.class);
Assert.assertNotNull(facet);
- Assert.assertEquals(TypeOfFacetInferredFromGenerics.class, facet.getClass());
+ Assert.assertEquals(TypeOfFacetFromGenerics.class, facet.getClass());
assertThat(facet.value(), classEqualTo(Order.class));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index 914a392..38724ca 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromArray;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromGenerics;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
import org.apache.isis.core.metamodel.facets.collections.collection.typeof.TypeOfFacetOnCollectionFromCollectionAnnotation;
@@ -210,7 +210,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
// then
final TypeOfFacet facet = facetedMethod.getFacet(TypeOfFacet.class);
Assert.assertNotNull(facet);
- Assert.assertTrue(facet instanceof TypeOfFacetInferredFromArray);
+ Assert.assertTrue(facet instanceof TypeOfFacetFromArray);
assertThat(facet.value(), IsisMatchers.classEqualTo(Order.class));
}
@@ -240,7 +240,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
// then
final TypeOfFacet facet = facetedMethod.getFacet(TypeOfFacet.class);
Assert.assertNotNull(facet);
- Assert.assertTrue(facet instanceof TypeOfFacetInferredFromGenerics);
+ Assert.assertTrue(facet instanceof TypeOfFacetFromGenerics);
assertThat(facet.value(), IsisMatchers.classEqualTo(Order.class));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
index ae28bbb..e7417f9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
@@ -28,8 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromArray;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromGenerics;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class CollectionAnnotationFacetFactoryTest_typeOf
@@ -71,8 +71,8 @@ extends AbstractFacetFactoryTest {
final Facet facet = facetedMethod.getFacet(TypeOfFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof TypeOfFacetInferredFromGenerics);
- final TypeOfFacetInferredFromGenerics typeOfFacetInferredFromGenerics = (TypeOfFacetInferredFromGenerics) facet;
+ assertTrue(facet instanceof TypeOfFacetFromGenerics);
+ final TypeOfFacetFromGenerics typeOfFacetInferredFromGenerics = (TypeOfFacetFromGenerics) facet;
assertEquals(Order.class, typeOfFacetInferredFromGenerics.value());
}
@@ -99,8 +99,8 @@ extends AbstractFacetFactoryTest {
final Facet facet = facetedMethod.getFacet(TypeOfFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof TypeOfFacetInferredFromGenerics);
- final TypeOfFacetInferredFromGenerics typeOfFacetInferredFromGenerics = (TypeOfFacetInferredFromGenerics) facet;
+ assertTrue(facet instanceof TypeOfFacetFromGenerics);
+ final TypeOfFacetFromGenerics typeOfFacetInferredFromGenerics = (TypeOfFacetFromGenerics) facet;
assertEquals(Order.class, typeOfFacetInferredFromGenerics.value());
}
@@ -129,8 +129,8 @@ extends AbstractFacetFactoryTest {
final Facet facet = facetedMethod.getFacet(TypeOfFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof TypeOfFacetInferredFromArray);
- final TypeOfFacetInferredFromArray typeOfFacetInferredFromArray = (TypeOfFacetInferredFromArray) facet;
+ assertTrue(facet instanceof TypeOfFacetFromArray);
+ final TypeOfFacetFromArray typeOfFacetInferredFromArray = (TypeOfFacetFromArray) facet;
assertEquals(Order.class, typeOfFacetInferredFromArray.value());
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
index b733918..2b94c33 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodsFactoryTest.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.support.ObjectSupportFacetFactoryTestAbstract;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
-import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetInferredFromToStringMethod;
+import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetFromToStringMethod;
public class TitleFacetViaMethodsFactoryTest
extends ObjectSupportFacetFactoryTestAbstract {
@@ -55,8 +55,8 @@ extends ObjectSupportFacetFactoryTestAbstract {
final Facet facet = facetedMethod.getFacet(TitleFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof TitleFacetInferredFromToStringMethod);
- final TitleFacetInferredFromToStringMethod titleFacetViaTitleMethod = (TitleFacetInferredFromToStringMethod) facet;
+ assertTrue(facet instanceof TitleFacetFromToStringMethod);
+ final TitleFacetFromToStringMethod titleFacetViaTitleMethod = (TitleFacetFromToStringMethod) facet;
assertEquals(toStringMethod, titleFacetViaTitleMethod.getMethods().getFirstOrFail());
assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(toStringMethod));
@@ -66,7 +66,7 @@ extends ObjectSupportFacetFactoryTestAbstract {
final Method sampleMethod = Object.class
.getMethod("toString", _Constants.emptyClasses);
- assertFalse(TitleFacetInferredFromToStringMethod
+ assertFalse(TitleFacetFromToStringMethod
.create(sampleMethod, facetedMethod)
.isPresent());
}
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/LogicalTypeFacetDerivedFromClassNameFactoryTest.java
index df8a31f..44d665e 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/LogicalTypeFacetDerivedFromClassNameFactoryTest.java
@@ -30,7 +30,7 @@ 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.LogicalTypeFacetInferredFromClassName;
+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;
@@ -54,7 +54,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
final LogicalTypeFacet facet = facetHolder.getFacet(LogicalTypeFacet.class);
assertThat(facet, is(not(nullValue())));
- assertThat(facet instanceof LogicalTypeFacetInferredFromClassName, is(true));
+ assertThat(facet instanceof LogicalTypeFacetFromClassName, is(true));
assertThat(facet.value(), is(Customer.class.getCanonicalName()));
}
@@ -74,7 +74,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
final LogicalTypeFacet facet = facetHolder.getFacet(LogicalTypeFacet.class);
assertThat(facet, is(not(nullValue())));
- assertThat(facet instanceof LogicalTypeFacetInferredFromClassName, is(true));
+ assertThat(facet instanceof LogicalTypeFacetFromClassName, is(true));
assertThat(facet.value(), is(ValueExample1.class.getCanonicalName()));
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
index 65ffa0c..25799ce 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.ObjectTypeFacetFactory;
import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacet;
-import org.apache.isis.core.metamodel.facets.object.logicaltype.classname.LogicalTypeFacetInferredFromClassName;
+import org.apache.isis.core.metamodel.facets.object.logicaltype.classname.LogicalTypeFacetFromClassName;
import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
import org.apache.isis.persistence.jdo.provider.entities.JdoFacetContext;
@@ -71,7 +71,7 @@ implements ObjectTypeFacetFactory {
final String annotationValue = annotation.value();
final LogicalTypeFacet logicalTypeFacet; // non-null
if (!_Strings.isNullOrEmpty(annotationValue)) {
- logicalTypeFacet = new LogicalTypeFacetInferredFromJdoDiscriminatorValueAnnotation(
+ logicalTypeFacet = new LogicalTypeFacetFromJdoDiscriminatorValueAnnotation(
LogicalType.eager(cls, annotationValue),
facetHolder);
} else {
@@ -81,7 +81,7 @@ implements ObjectTypeFacetFactory {
}
val substituted = substitute.apply(cls);
- logicalTypeFacet = new LogicalTypeFacetInferredFromClassName(
+ logicalTypeFacet = new LogicalTypeFacetFromClassName(
LogicalType.eager(substituted, substituted.getCanonicalName()),
facetHolder);
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/LogicalTypeFacetInferredFromJdoDiscriminatorValueAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/LogicalTypeFacetFromJdoDiscriminatorValueAnnotation.java
similarity index 89%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/LogicalTypeFacetInferredFromJdoDiscriminatorValueAnnotation.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/LogicalTypeFacetFromJdoDiscriminatorValueAnnotation.java
index 17855f8..bc5942e 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/LogicalTypeFacetInferredFromJdoDiscriminatorValueAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/LogicalTypeFacetFromJdoDiscriminatorValueAnnotation.java
@@ -22,10 +22,10 @@ import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacetAbstract;
-public class LogicalTypeFacetInferredFromJdoDiscriminatorValueAnnotation
+public class LogicalTypeFacetFromJdoDiscriminatorValueAnnotation
extends LogicalTypeFacetAbstract {
- public LogicalTypeFacetInferredFromJdoDiscriminatorValueAnnotation(
+ public LogicalTypeFacetFromJdoDiscriminatorValueAnnotation(
final LogicalType logicalType,
final FacetHolder holder) {
super(logicalType, holder);
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetInferredFromJdoPersistenceCapableAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableAnnotation.java
similarity index 90%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetInferredFromJdoPersistenceCapableAnnotation.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableAnnotation.java
index 78bb761..5fa7115 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetInferredFromJdoPersistenceCapableAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableAnnotation.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacet
import org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacetAbstract;
import org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-public class LogicalTypeFacetInferredFromJdoPersistenceCapableAnnotation
+public class LogicalTypeFacetFromJdoPersistenceCapableAnnotation
extends LogicalTypeFacetAbstract {
public static Optional<LogicalTypeFacet> create(
@@ -45,12 +45,12 @@ extends LogicalTypeFacetAbstract {
}
final String logicalTypeName =
schema.toLowerCase(Locale.ROOT) + "." + persistenceCapableFacet.getTable();
- return Optional.of(new LogicalTypeFacetInferredFromJdoPersistenceCapableAnnotation(
+ return Optional.of(new LogicalTypeFacetFromJdoPersistenceCapableAnnotation(
LogicalType.eager(correspondingClass, logicalTypeName),
holder));
}
- private LogicalTypeFacetInferredFromJdoPersistenceCapableAnnotation(
+ private LogicalTypeFacetFromJdoPersistenceCapableAnnotation(
final LogicalType logicalType,
final FacetHolder holder) {
super(logicalType, holder, Precedence.INFERRED);
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
index d319030..d67990b 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.ObjectTypeFacetFactory;
import org.apache.isis.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
-import org.apache.isis.persistence.jdo.metamodel.facets.object.domainobject.objectspecid.LogicalTypeFacetInferredFromJdoPersistenceCapableAnnotation;
+import org.apache.isis.persistence.jdo.metamodel.facets.object.domainobject.objectspecid.LogicalTypeFacetFromJdoPersistenceCapableAnnotation;
import org.apache.isis.persistence.jdo.provider.entities.JdoFacetContext;
import lombok.val;
@@ -74,7 +74,7 @@ implements ObjectTypeFacetFactory {
.ifPresent(jdoPersistenceCapableFacet->{
FacetUtil.addFacetIfPresent(
- LogicalTypeFacetInferredFromJdoPersistenceCapableAnnotation
+ LogicalTypeFacetFromJdoPersistenceCapableAnnotation
.create(jdoPersistenceCapableFacet, cls, facetHolder));
FacetUtil.addFacet(
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/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java
index bb921c5..11cd6b9 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/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java
@@ -61,7 +61,7 @@ implements MetaModelRefiner {
val jdoColumnIfAny = processMethodContext.synthesizeOnMethod(Column.class);
addFacetIfPresent(
- MaxTotalDigitsFacetInferredFromJdoColumn
+ MaxTotalDigitsFacetFromJdoColumnAnnotation
.create(jdoColumnIfAny, holder));
addFacetIfPresent(
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumnAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfJdoColumnAnnotation.java
similarity index 90%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumnAnnotation.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfJdoColumnAnnotation.java
index dea8b4e..9a2c6d9 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumnAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfJdoColumnAnnotation.java
@@ -24,10 +24,10 @@ import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFace
/**
* Inferred from absence of an <tt>@Column</tt> method.
*/
-public class MandatoryFacetInferredFromAbsenceOfJdoColumnAnnotation
+public class MandatoryFacetFromAbsenceOfJdoColumnAnnotation
extends MandatoryFacetAbstract {
- public MandatoryFacetInferredFromAbsenceOfJdoColumnAnnotation(
+ public MandatoryFacetFromAbsenceOfJdoColumnAnnotation(
final FacetHolder holder, final Semantics semantics, Precedence precedence) {
super(holder, semantics, precedence);
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
index c266b57..12bc8ad 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
-import org.apache.isis.persistence.jdo.metamodel.facets.prop.primarykey.OptionalFacetInferredFromJdoPrimaryKeyAnnotation;
+import org.apache.isis.persistence.jdo.metamodel.facets.prop.primarykey.OptionalFacetFromJdoPrimaryKeyAnnotation;
import org.apache.isis.persistence.jdo.provider.entities.JdoFacetContext;
import org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
import org.apache.isis.persistence.jdo.provider.metamodel.facets.prop.notpersistent.JdoNotPersistentFacet;
@@ -76,7 +76,7 @@ implements MetaModelRefiner {
final MandatoryFacet existingFacet = holder.getFacet(MandatoryFacet.class);
if(existingFacet != null) {
- if (existingFacet instanceof OptionalFacetInferredFromJdoPrimaryKeyAnnotation) {
+ if (existingFacet instanceof OptionalFacetFromJdoPrimaryKeyAnnotation) {
// do not replace this facet;
// we must keep an optional facet here for different reasons
return;
@@ -95,7 +95,7 @@ implements MetaModelRefiner {
FacetUtil.addFacet(
columnIfAny.isPresent()
? new MandatoryFacetFromJdoColumnAnnotation(holder, semantics)
- : new MandatoryFacetInferredFromAbsenceOfJdoColumnAnnotation(
+ : new MandatoryFacetFromAbsenceOfJdoColumnAnnotation(
holder,
semantics,
semantics.isRequired()
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/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
index fee1f90..e43b680 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/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -67,7 +67,7 @@ implements MetaModelRefiner {
val facetHolder = processMethodContext.getFacetHolder();
FacetUtil.addFacetIfPresent(
- MaxTotalDigitsFacetInferredFromJdoColumn
+ MaxTotalDigitsFacetFromJdoColumnAnnotation
.create(jdoColumnIfAny, facetHolder));
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetInferredFromJdoColumn.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJdoColumnAnnotation.java
similarity index 90%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetInferredFromJdoColumn.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJdoColumnAnnotation.java
index f6f390a..7490be5 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetInferredFromJdoColumn.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJdoColumnAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacetAbstract;
-public class MaxTotalDigitsFacetInferredFromJdoColumn
+public class MaxTotalDigitsFacetFromJdoColumnAnnotation
extends MaxTotalDigitsFacetAbstract {
public static Optional<MaxTotalDigitsFacet> create(
@@ -36,11 +36,11 @@ extends MaxTotalDigitsFacetAbstract {
return jdoColumnIfAny
.filter(jdoColumn->jdoColumn.length()>=0)
.map(jdoColumn->
- new MaxTotalDigitsFacetInferredFromJdoColumn(
+ new MaxTotalDigitsFacetFromJdoColumnAnnotation(
jdoColumn.length(), holder));
}
- private MaxTotalDigitsFacetInferredFromJdoColumn(
+ private MaxTotalDigitsFacetFromJdoColumnAnnotation(
final int maxTotalDigits, final FacetHolder holder) {
super(maxTotalDigits, holder);
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/DisabledFacetInferredFromJdoPrimaryKeyAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/DisabledFacetFromJdoPrimaryKeyAnnotation.java
similarity index 89%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/DisabledFacetInferredFromJdoPrimaryKeyAnnotation.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/DisabledFacetFromJdoPrimaryKeyAnnotation.java
index 342b1e1..78c8799 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/DisabledFacetInferredFromJdoPrimaryKeyAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/DisabledFacetFromJdoPrimaryKeyAnnotation.java
@@ -26,10 +26,10 @@ import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstr
/**
* Derived by the presence of the primary key.
*/
-public class DisabledFacetInferredFromJdoPrimaryKeyAnnotation
+public class DisabledFacetFromJdoPrimaryKeyAnnotation
extends DisabledFacetAbstract {
- public DisabledFacetInferredFromJdoPrimaryKeyAnnotation(final FacetHolder holder) {
+ public DisabledFacetFromJdoPrimaryKeyAnnotation(final FacetHolder holder) {
super(Where.ANYWHERE, "Primary-keys are immutable", holder);
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
index fc6c298..e0c5395 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
@@ -61,7 +61,7 @@ extends FacetFactoryAbstract {
val facetHolder = processMethodContext.getFacetHolder();
addFacet(new JdoPrimaryKeyFacetAnnotation(facetHolder));
- addFacet(new OptionalFacetInferredFromJdoPrimaryKeyAnnotation(facetHolder));
- addFacet(new DisabledFacetInferredFromJdoPrimaryKeyAnnotation(facetHolder));
+ addFacet(new OptionalFacetFromJdoPrimaryKeyAnnotation(facetHolder));
+ addFacet(new DisabledFacetFromJdoPrimaryKeyAnnotation(facetHolder));
}
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetInferredFromJdoPrimaryKeyAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java
similarity index 91%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetInferredFromJdoPrimaryKeyAnnotation.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java
index 47bf326..de94f80 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetInferredFromJdoPrimaryKeyAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/OptionalFacetFromJdoPrimaryKeyAnnotation.java
@@ -33,10 +33,10 @@ import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefault
* the property as optional, meaning that the {@link PrimaryKey} property is left
* untouched by Isis.
*/
-public class OptionalFacetInferredFromJdoPrimaryKeyAnnotation
+public class OptionalFacetFromJdoPrimaryKeyAnnotation
extends MandatoryFacetAbstract {
- public OptionalFacetInferredFromJdoPrimaryKeyAnnotation(final FacetHolder holder) {
+ public OptionalFacetFromJdoPrimaryKeyAnnotation(final FacetHolder holder) {
super(holder, Semantics.OPTIONAL, Precedence.INFERRED);
}
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
index 80e5d75..f9cda31 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
@@ -79,7 +79,7 @@ public class GivenJdoDiscriminatorAnnotationFacetFactoryTest extends AbstractFac
final Facet facet = facetHolder.getFacet(LogicalTypeFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof LogicalTypeFacetInferredFromJdoDiscriminatorValueAnnotation);
+ assertTrue(facet instanceof LogicalTypeFacetFromJdoDiscriminatorValueAnnotation);
}
public void testIfNoEntityAnnotationThenNoFacet() {
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/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
index 79c07b1..8becb59 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/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
@@ -105,7 +105,7 @@ extends AbstractFacetFactoryTest {
if(maxTotalDigits>=0) {
final MaxTotalDigitsFacet facet = facetedMethod.getFacet(MaxTotalDigitsFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MaxTotalDigitsFacetInferredFromJdoColumn);
+ assertTrue(facet instanceof MaxTotalDigitsFacetFromJdoColumnAnnotation);
assertThat(facet.maxTotalDigits(), is(maxTotalDigits));
} else {
assertNull(facetedMethod.getFacet(MaxTotalDigitsFacet.class));
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/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
index b9d3751..ab24c06 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/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java
@@ -66,7 +66,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MandatoryFacetInferredFromAbsenceOfJdoColumnAnnotation);
+ assertTrue(facet instanceof MandatoryFacetFromAbsenceOfJdoColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(false));
}
@@ -110,7 +110,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet = facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MandatoryFacetInferredFromAbsenceOfJdoColumnAnnotation);
+ assertTrue(facet instanceof MandatoryFacetFromAbsenceOfJdoColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(true));
}
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
index 5479db9..73f20df 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
@@ -78,7 +78,7 @@ extends AbstractFacetFactoryTest {
final Facet facet = facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof OptionalFacetInferredFromJdoPrimaryKeyAnnotation);
+ assertTrue(facet instanceof OptionalFacetFromJdoPrimaryKeyAnnotation);
}
public void testDisabledDerivedFromId() throws Exception {
@@ -89,7 +89,7 @@ extends AbstractFacetFactoryTest {
final Facet facet = facetedMethod.getFacet(DisabledFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof DisabledFacetInferredFromJdoPrimaryKeyAnnotation);
+ assertTrue(facet instanceof DisabledFacetFromJdoPrimaryKeyAnnotation);
}
public void testIfNoIdAnnotationThenNoFacet() throws Exception {
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/JpaProgrammingModel.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/JpaProgrammingModel.java
index 1dcda26..af5cec5 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/JpaProgrammingModel.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/JpaProgrammingModel.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel.Marker;
-import org.apache.isis.persistence.jpa.metamodel.facets.prop.column.BigDecimalInferredFromJpaColumnAnnotationFacetFactory;
+import org.apache.isis.persistence.jpa.metamodel.facets.prop.column.BigDecimalFromJpaColumnAnnotationFacetFactory;
import org.apache.isis.persistence.jpa.metamodel.facets.prop.column.MandatoryFromJpaColumnAnnotationFacetFactory;
import org.apache.isis.persistence.jpa.metamodel.facets.prop.transients.JpaTransientAnnotationFacetFactory;
import org.apache.isis.persistence.jpa.metamodel.object.table.JpaTableAnnotationFacetFactory;
@@ -44,7 +44,7 @@ public class JpaProgrammingModel implements MetaModelRefiner {
pm.addFactory(step, new JpaTableAnnotationFacetFactory(mmc), Marker.JPA);
pm.addFactory(step, new JpaTransientAnnotationFacetFactory(mmc), Marker.JPA);
pm.addFactory(step, new MandatoryFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA);
- pm.addFactory(step, new BigDecimalInferredFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA);
+ pm.addFactory(step, new BigDecimalFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA);
}
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/BigDecimalInferredFromJpaColumnAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java
similarity index 87%
rename from persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/BigDecimalInferredFromJpaColumnAnnotationFacetFactory.java
rename to persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java
index 8a2a033..cf7d908 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/BigDecimalInferredFromJpaColumnAnnotationFacetFactory.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/BigDecimalFromJpaColumnAnnotationFacetFactory.java
@@ -30,11 +30,11 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
import lombok.val;
-public class BigDecimalInferredFromJpaColumnAnnotationFacetFactory
+public class BigDecimalFromJpaColumnAnnotationFacetFactory
extends FacetFactoryAbstract {
@Inject
- public BigDecimalInferredFromJpaColumnAnnotationFacetFactory(final MetaModelContext mmc) {
+ public BigDecimalFromJpaColumnAnnotationFacetFactory(final MetaModelContext mmc) {
super(mmc, FeatureType.PROPERTIES_ONLY);
}
@@ -50,11 +50,11 @@ extends FacetFactoryAbstract {
val jpaColumnIfAny = processMethodContext.synthesizeOnMethod(Column.class);
addFacetIfPresent(
- MaxTotalDigitsFacetInferredFromJpaColumn
+ MaxTotalDigitsFacetFromJpaColumnAnnotation
.create(jpaColumnIfAny, holder));
addFacetIfPresent(
- MaxFractionDigitsFacetInferredFromJpaColumn
+ MaxFractionDigitsFacetFromJpaColumnAnnotation
.create(jpaColumnIfAny, holder));
}
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJpaColumn.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetFromJpaColumnAnnotation.java
similarity index 90%
rename from persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJpaColumn.java
rename to persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetFromJpaColumnAnnotation.java
index e94cfdd..40d0f0c 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJpaColumn.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetFromJpaColumnAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacetAbstract;
-public class MaxFractionDigitsFacetInferredFromJpaColumn
+public class MaxFractionDigitsFacetFromJpaColumnAnnotation
extends MaxFractionalDigitsFacetAbstract {
public static Optional<MaxFractionalDigitsFacet> create(
@@ -36,12 +36,12 @@ extends MaxFractionalDigitsFacetAbstract {
return jpaColumnIfAny
.filter(jpaColumn->jpaColumn.scale()>=0)
.map(jdoColumn->{
- return new MaxFractionDigitsFacetInferredFromJpaColumn(
+ return new MaxFractionDigitsFacetFromJpaColumnAnnotation(
jdoColumn.scale(), holder);
});
}
- private MaxFractionDigitsFacetInferredFromJpaColumn(
+ private MaxFractionDigitsFacetFromJpaColumnAnnotation(
final int maxFractionalDigits, final FacetHolder holder) {
super(maxFractionalDigits, holder);
}
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxTotalDigitsFacetInferredFromJpaColumn.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJpaColumnAnnotation.java
similarity index 90%
rename from persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxTotalDigitsFacetInferredFromJpaColumn.java
rename to persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJpaColumnAnnotation.java
index 1d33289..117f0b4 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxTotalDigitsFacetInferredFromJpaColumn.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJpaColumnAnnotation.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacetAbstract;
-public class MaxTotalDigitsFacetInferredFromJpaColumn
+public class MaxTotalDigitsFacetFromJpaColumnAnnotation
extends MaxTotalDigitsFacetAbstract {
public static Optional<MaxTotalDigitsFacet> create(
@@ -36,11 +36,11 @@ extends MaxTotalDigitsFacetAbstract {
return jpaColumnIfAny
.filter(jpaColumn->jpaColumn.length()>=0)
.map(jdoColumn->
- new MaxTotalDigitsFacetInferredFromJpaColumn(
+ new MaxTotalDigitsFacetFromJpaColumnAnnotation(
jdoColumn.length(), holder));
}
- private MaxTotalDigitsFacetInferredFromJpaColumn(
+ private MaxTotalDigitsFacetFromJpaColumnAnnotation(
final int maxTotalDigits, final FacetHolder holder) {
super(maxTotalDigits, holder);
}