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 2022/05/02 17:23:17 UTC
[isis] branch master updated: ISIS-2902: split factory method Identifier.propertyOrCollectionIdentifier(..) into Identifier.propertyIdentifier(..) and Identifier.collectionIdentifier(..)
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 d9cde2e1dc ISIS-2902: split factory method Identifier.propertyOrCollectionIdentifier(..) into Identifier.propertyIdentifier(..) and Identifier.collectionIdentifier(..)
d9cde2e1dc is described below
commit d9cde2e1dccc9a00fdc836ebe0c742de4469fb15
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon May 2 19:23:10 2022 +0200
ISIS-2902: split factory method
Identifier.propertyOrCollectionIdentifier(..)
into Identifier.propertyIdentifier(..) and
Identifier.collectionIdentifier(..)
---
.../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 3 +++
.../java/org/apache/isis/applib/Identifier.java | 24 +++++++++++++----
.../isis/core/metamodel/facetapi/FeatureType.java | 31 +++++++++++-----------
.../actions/action/invocation/IdentifierUtil.java | 8 ++++--
.../schema/SchemaValueMarshallerAbstract.java | 2 +-
.../specimpl/OneToManyAssociationMixedIn.java | 2 +-
.../specimpl/OneToOneAssociationMixedIn.java | 2 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 2 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 2 +-
...HelperTest_newCollectionDomainEvent_forAdd.java | 6 ++---
...perTest_newCollectionDomainEvent_forRemove.java | 6 ++---
...HelperTest_newPropertyDomainEvent_forClear.java | 4 +--
...elperTest_newPropertyDomainEvent_forModify.java | 4 +--
.../objects/OneToManyAssociationDefaultTest.java | 2 +-
.../testing/AbstractFacetFactoryTest.java | 2 +-
.../DomainModelTest_usingBadDomain.java | 2 +-
.../stubs/ExecutionPublishingTestAbstract.java | 2 +-
17 files changed, 62 insertions(+), 42 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
index 34f06e7651..121bd34fff 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
@@ -40,6 +40,9 @@ public class SeedService implements MetamodelListener {
}
----
+| Factory method `Identifier.propertyOrCollectionIdentifier(..)`
+| was slit up into `Identifier.propertyIdentifier(..)` and `Identifier.collectionIdentifier(..)`
+
|===
== Commons
diff --git a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
index bc41623e45..80a7a1f1fe 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
@@ -72,14 +72,20 @@ implements
*/
ACTION_PARAMETER,
/**
- * <i>Association</i> (of any cardinality), either declared or mixed in.
+ * <i>One to One Association (Property)</i> (of any cardinality), either declared or mixed in.
*/
- PROPERTY_OR_COLLECTION
+ PROPERTY,
+ /**
+ * <i>One to Many Association (Collection)</i> (of any cardinality), either declared or mixed in.
+ */
+ COLLECTION
;
public boolean isClass() { return this == CLASS; }
public boolean isAction() { return this == ACTION; }
public boolean isActionParameter() { return this == ACTION_PARAMETER; }
- public boolean isPropertyOrCollection() { return this == PROPERTY_OR_COLLECTION;}
+ public boolean isProperty() { return this == PROPERTY;}
+ public boolean isCollection() { return this == COLLECTION;}
+ public boolean isPropertyOrCollection() { return this == PROPERTY || this == COLLECTION;}
}
// -- FACTORY METHODS
@@ -88,13 +94,21 @@ implements
return new Identifier(typeIdentifier, "", Can.empty(), Type.CLASS);
}
- public static Identifier propertyOrCollectionIdentifier(
+ public static Identifier propertyIdentifier(
+ final LogicalType typeIdentifier,
+ final String propertyOrCollectionName) {
+ return new Identifier(typeIdentifier, propertyOrCollectionName, Can.empty(),
+ Type.PROPERTY);
+ }
+
+ public static Identifier collectionIdentifier(
final LogicalType typeIdentifier,
final String propertyOrCollectionName) {
return new Identifier(typeIdentifier, propertyOrCollectionName, Can.empty(),
- Type.PROPERTY_OR_COLLECTION);
+ Type.COLLECTION);
}
+
/** for reporting orphaned methods */
public static Identifier methodIdentifier(
final LogicalType typeIdentifier,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
index 1fa3a325d4..4d88bf879c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FeatureType.java
@@ -49,13 +49,13 @@ public enum FeatureType {
PROPERTY("Property") {
@Override
public Identifier identifierFor(final LogicalType typeIdentifier, final Method method) {
- return propertyOrCollectionIdentifierFor(typeIdentifier, method);
+ return propertyIdentifierFor(typeIdentifier, method);
}
},
COLLECTION("Collection") {
@Override
public Identifier identifierFor(final LogicalType typeIdentifier, final Method method) {
- return propertyOrCollectionIdentifierFor(typeIdentifier, method);
+ return collectionIdentifierFor(typeIdentifier, method);
}
},
ACTION("Action") {
@@ -119,29 +119,28 @@ public enum FeatureType {
this.name = name;
}
- private static Identifier propertyOrCollectionIdentifierFor(
+ private static Identifier propertyIdentifierFor(
final LogicalType typeIdentifier,
final Method method) {
-
final String capitalizedName = StringExtensions.asJavaBaseName(method.getName());
final String beanName = Introspector.decapitalize(capitalizedName);
- return Identifier.propertyOrCollectionIdentifier(typeIdentifier, beanName);
- }
-
- public boolean isProperty() {
- return this == PROPERTY;
- }
-
- public boolean isCollection() {
- return this == COLLECTION;
+ return Identifier.propertyIdentifier(typeIdentifier, beanName);
}
- public boolean isAction() {
- return this == ACTION;
+ private static Identifier collectionIdentifierFor(
+ final LogicalType typeIdentifier,
+ final Method method) {
+ final String capitalizedName = StringExtensions.asJavaBaseName(method.getName());
+ final String beanName = Introspector.decapitalize(capitalizedName);
+ return Identifier.collectionIdentifier(typeIdentifier, beanName);
}
+ public boolean isProperty() { return this == PROPERTY; }
+ public boolean isCollection() { return this == COLLECTION; }
+ public boolean isAction() { return this == ACTION; }
public boolean isActionParameter() {
- return this == ACTION_PARAMETER_SCALAR || this == ACTION_PARAMETER_COLLECTION;
+ return this == ACTION_PARAMETER_SCALAR
+ || this == ACTION_PARAMETER_COLLECTION;
}
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
index 75162ef50a..b8964823de 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java
@@ -94,8 +94,12 @@ public class IdentifierUtil {
return Identifier.actionIdentifier(logicalType, memberId);
}
- if(indentifierType.isPropertyOrCollection()) {
- return Identifier.propertyOrCollectionIdentifier(logicalType, memberId);
+ if(indentifierType.isProperty()) {
+ return Identifier.propertyIdentifier(logicalType, memberId);
+ }
+
+ if(indentifierType.isCollection()) {
+ return Identifier.collectionIdentifier(logicalType, memberId);
}
throw _Exceptions.illegalArgument("unsupported identifier type %s (logicalMemberIdentifier=%s)",
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
index 6a07d2f308..5f3679ae37 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/schema/SchemaValueMarshallerAbstract.java
@@ -205,7 +205,7 @@ implements SchemaValueMarshaller {
@Override
public final Identifier propertyIdentifier(final @NonNull PropertyDto propertyDto) {
return IdentifierUtil.memberIdentifierFor(getSpecificationLoader(),
- Type.PROPERTY_OR_COLLECTION,
+ Type.PROPERTY,
propertyDto.getLogicalMemberIdentifier());
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index 590f700cf8..e96f592dd1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -90,7 +90,7 @@ implements MixedInMember {
final Class<?> mixinType,
final String mixinMethodName) {
- super(Identifier.propertyOrCollectionIdentifier(
+ super(Identifier.collectionIdentifier(
LogicalType.eager(
mixeeSpec.getCorrespondingClass(),
mixeeSpec.getLogicalTypeName()),
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
index ebf2502a91..8ee7f5dd91 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
@@ -73,7 +73,7 @@ implements MixedInMember {
final Class<?> mixinType,
final String mixinMethodName) {
- super(Identifier.propertyOrCollectionIdentifier(
+ super(Identifier.propertyIdentifier(
LogicalType.eager(
mixeeSpec.getCorrespondingClass(),
mixeeSpec.getLogicalTypeName()),
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index 596105ec4a..b84e9acfe4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -82,7 +82,7 @@ implements HasMetaModelContext {
facetHolder = FacetHolderAbstract.simple(
metaModelContext,
- Identifier.propertyOrCollectionIdentifier(LogicalType.fqcn(Customer.class), "firstName"));
+ Identifier.propertyIdentifier(LogicalType.fqcn(Customer.class), "firstName"));
facetedMethod = FacetedMethod.createForProperty(metaModelContext, AbstractFacetFactoryTest.Customer.class, "firstName");
facetedMethodParameter = new FacetedMethodParameter(metaModelContext, FeatureType.ACTION_PARAMETER_SCALAR, facetedMethod.getOwningType(), facetedMethod.getMethod(), String.class, 0);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index 0dec4da0ee..2e503efd67 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -105,7 +105,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
facetHolder = FacetHolderAbstract.simple(
metaModelContext,
- Identifier.propertyOrCollectionIdentifier(LogicalType.fqcn(Customer.class), "firstName"));
+ Identifier.propertyIdentifier(LogicalType.fqcn(Customer.class), "firstName"));
facetedMethod = FacetedMethod.createForProperty(metaModelContext, Customer.class, "firstName");
facetedMethodParameter = new FacetedMethodParameter(
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
index 26f2c9f6e4..91ffe405cf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
@@ -44,7 +44,7 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
public void defaultEventType() throws Exception {
final SomeDomainObject sdo = new SomeDomainObject();
final SomeReferencedObject other = new SomeReferencedObject();
- final Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ final Identifier identifier = Identifier.collectionIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "references");
final CollectionDomainEvent<Object, Object> ev = Utils.domainEventHelper().newCollectionDomainEvent(
@@ -57,7 +57,7 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
public void collectionAddedToDefaultEventType() throws Exception {
final SomeDomainObject sdo = new SomeDomainObject();
final SomeReferencedObject other = new SomeReferencedObject();
- final Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ final Identifier identifier = Identifier.collectionIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "references");
final CollectionDomainEvent<Object, Object> ev = Utils.domainEventHelper().newCollectionDomainEvent(
@@ -70,7 +70,7 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
public void customEventType() throws Exception {
final SomeDomainObject sdo = new SomeDomainObject();
final SomeReferencedObject other = new SomeReferencedObject();
- final Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ final Identifier identifier = Identifier.collectionIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "references");
final CollectionDomainEvent<SomeDomainObject, SomeReferencedObject> ev = Utils.domainEventHelper().newCollectionDomainEvent(
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
index 066a565079..fdf0dce082 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
@@ -44,7 +44,7 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
public void defaultEventType() throws Exception {
SomeDomainObject sdo = new SomeDomainObject();
SomeReferencedObject other = new SomeReferencedObject();
- Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ Identifier identifier = Identifier.collectionIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "references");
final CollectionDomainEvent<Object, Object> ev = Utils.domainEventHelper().newCollectionDomainEvent(
@@ -57,7 +57,7 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
public void collectionRemovedFromDefaultEventType() throws Exception {
SomeDomainObject sdo = new SomeDomainObject();
SomeReferencedObject other = new SomeReferencedObject();
- Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ Identifier identifier = Identifier.collectionIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "references");
final CollectionDomainEvent<Object, Object> ev = Utils.domainEventHelper().newCollectionDomainEvent(
@@ -70,7 +70,7 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
public void customEventType() throws Exception {
SomeDomainObject sdo = new SomeDomainObject();
SomeReferencedObject other = new SomeReferencedObject();
- Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ Identifier identifier = Identifier.collectionIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "references");
final CollectionDomainEvent<SomeDomainObject, SomeReferencedObject> ev = Utils.domainEventHelper().newCollectionDomainEvent(
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
index 416dd30801..f03a17972e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forClear.java
@@ -43,7 +43,7 @@ public class DomainEventHelperTest_newPropertyDomainEvent_forClear {
public void defaultEventType() throws Exception {
SomeDomainObject sdo = new SomeDomainObject();
- Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ Identifier identifier = Identifier.propertyIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "someDateProperty");
LocalDate oldValue = LocalDate.of(2013,4,1);
LocalDate newValue = null;
@@ -62,7 +62,7 @@ public class DomainEventHelperTest_newPropertyDomainEvent_forClear {
public void customEventType() throws Exception {
SomeDomainObject sdo = new SomeDomainObject();
- Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ Identifier identifier = Identifier.propertyIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "someDateProperty");
LocalDate oldValue = LocalDate.of(2013,4,1);
LocalDate newValue = null;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
index a6d2e4724a..8deb003f55 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newPropertyDomainEvent_forModify.java
@@ -40,7 +40,7 @@ public class DomainEventHelperTest_newPropertyDomainEvent_forModify {
public void defaultEventType() throws Exception {
SomeDomainObject sdo = new SomeDomainObject();
- Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ Identifier identifier = Identifier.propertyIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "someDateProperty");
LocalDate oldValue = LocalDate.of(2013,4,1);
LocalDate newValue = LocalDate.of(2013,5,2);
@@ -59,7 +59,7 @@ public class DomainEventHelperTest_newPropertyDomainEvent_forModify {
public void customEventType() throws Exception {
SomeDomainObject sdo = new SomeDomainObject();
- Identifier identifier = Identifier.propertyOrCollectionIdentifier(
+ Identifier identifier = Identifier.propertyIdentifier(
LogicalType.fqcn(SomeDomainObject.class), "someDateProperty");
LocalDate oldValue = LocalDate.of(2013,4,1);
LocalDate newValue = LocalDate.of(2013,5,2);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
index edb35f1ac9..80282e6b6e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/objects/OneToManyAssociationDefaultTest.java
@@ -65,7 +65,7 @@ extends MetaModelTestAbstract {
when(mockPeer.getMetaModelContext()).thenReturn(getMetaModelContext());
when(mockPeer.getFeatureIdentifier()).thenReturn(
Identifier
- .propertyOrCollectionIdentifier(
+ .collectionIdentifier(
TypeIdentifierTestFactory.newCustomer(),
COLLECTION_ID));
when(mockPeer.getFacet(MemberNamedFacet.class)).thenReturn(mockNamedFacet);
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
index 51601ef26a..b769472315 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/testing/AbstractFacetFactoryTest.java
@@ -104,7 +104,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
facetHolder = FacetHolderAbstract.simple(
metaModelContext,
- Identifier.propertyOrCollectionIdentifier(LogicalType.fqcn(Customer.class), "firstName"));
+ Identifier.propertyIdentifier(LogicalType.fqcn(Customer.class), "firstName"));
facetedMethod = FacetedMethod.createForProperty(metaModelContext, Customer.class, "firstName");
facetedMethodParameter = new FacetedMethodParameter(
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index e0074c47b8..9ecfbdb3ae 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -245,7 +245,7 @@ class DomainModelTest_usingBadDomain {
final String annotationLiteral = "@" + annotationType.getSimpleName();
validator.assertAnyFailuresContaining(
- Identifier.propertyOrCollectionIdentifier(LogicalType.fqcn(mixinClass), mixinMethodName),
+ Identifier.propertyIdentifier(LogicalType.fqcn(mixinClass), mixinMethodName),
String.format("Annotation %s on both method and type level is not allowed", annotationLiteral));
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/ExecutionPublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/ExecutionPublishingTestAbstract.java
index e1e735b009..57ddeb01d5 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/ExecutionPublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/ExecutionPublishingTestAbstract.java
@@ -80,7 +80,7 @@ extends PublishingTestAbstract {
switch(changeScenario) {
case PROPERTY_UPDATE: {
- Identifier propertyId = Identifier.propertyOrCollectionIdentifier(
+ Identifier propertyId = Identifier.propertyIdentifier(
LogicalType.fqcn(bookClass), "name");
Object argValue = "Book #2";