This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch CAUSEWAY-3955 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 094a691c9d397c5c65a3d6e2979a63d7bc92ba87 Author: andi-huber <[email protected]> AuthorDate: Thu Jan 15 13:54:08 2026 +0100 CAUSEWAY-3955: [v2] refactors internally no longer to use deprecations in Identifier --- .../causeway/applib/services/appfeat/ApplicationFeatureId.java | 4 ++-- .../causeway/applib/services/wrapper/events/InteractionEvent.java | 4 ++-- .../src/test/java/org/apache/causeway/applib/IdentifierTests.java | 2 +- .../causeway/core/config/progmodel/ProgrammingModelConstants.java | 2 +- .../apache/causeway/core/metamodel/facets/DomainEventHelper.java | 2 +- .../facets/actions/action/ActionOverloadingValidator.java | 2 +- .../facets/actions/action/invocation/IdentifierUtil.java | 2 +- .../facets/fallback/NamedFacetFallbackFromMemberName.java | 2 +- .../core/metamodel/facets/object/value/CompositeValueUpdater.java | 4 ++-- .../causeway/core/metamodel/interactions/InteractionUtils.java | 2 +- .../metamodel/postprocessors/all/MixinSanityChecksValidator.java | 2 +- .../causeway/core/metamodel/spec/feature/ObjectAssociation.java | 2 +- .../causeway/core/metamodel/spec/feature/OneToOneAssociation.java | 2 +- .../core/metamodel/spec/feature/memento/CollectionMemento.java | 4 ++-- .../core/metamodel/spec/feature/memento/PropertyMemento.java | 4 ++-- .../causeway/core/metamodel/specloader/SpecificationLoader.java | 6 +++--- .../core/metamodel/specloader/SpecificationLoaderDefault.java | 4 ++-- .../core/metamodel/specloader/specimpl/ObjectActionDefault.java | 2 +- .../core/metamodel/specloader/specimpl/ObjectActionMixedIn.java | 4 ++-- .../core/metamodel/specloader/specimpl/ObjectMemberAbstract.java | 2 +- .../specloader/specimpl/dflt/_AssociationsAsColumns.java | 4 ++-- .../core/metamodel/specloader/validator/ValidationFailure.java | 2 +- .../core/metamodel/tabular/interactive/DataTableInteractive.java | 8 ++++---- .../core/metamodel/facetapi/FeatureTypeTest_identifierFor.java | 4 ++-- .../menubars/bootstrap/MenuBarsServiceBootstrap.java | 2 +- .../core/security/authorization/manager/AuthorizationManager.java | 2 +- .../metamodel/facets/AutoCompleteGeneratedQueryFacetFactory.java | 2 +- .../causeway/security/shiro/authorization/AuthorizorShiro.java | 2 +- .../apache/causeway/viewer/commons/model/scalar/UiProperty.java | 2 +- .../causeway/viewer/wicket/model/models/ScalarPropertyModel.java | 2 +- .../apache/causeway/viewer/wicket/model/models/UiObjectWkt.java | 2 +- .../wicket/model/models/interaction/act/ActionInteractionWkt.java | 4 ++-- .../main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java | 4 ++-- 33 files changed, 49 insertions(+), 49 deletions(-) diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java index e7b296036c2..a355e9d3ed9 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeat/ApplicationFeatureId.java @@ -84,10 +84,10 @@ public static ApplicationFeatureId fromIdentifier(final @NonNull Identifier iden val logicalTypeName = identifier.logicalTypeName(); - if(identifier.getType().isClass()) { + if(identifier.type().isClass()) { return newType(logicalTypeName); } - return newMember(logicalTypeName, identifier.getMemberLogicalName()); + return newMember(logicalTypeName, identifier.memberLogicalName()); } public static ApplicationFeatureId newFeature( diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/events/InteractionEvent.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/events/InteractionEvent.java index d972651849c..70014ee98d1 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/events/InteractionEvent.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/events/InteractionEvent.java @@ -90,7 +90,7 @@ public String getClassNaturalName() { * @see #getIdentifier */ public String getMemberName() { - return identifier.getMemberLogicalName(); + return identifier.memberLogicalName(); } /** @@ -105,7 +105,7 @@ public String getMemberNaturalName() { * class name} of the {@link #getIdentifier() identifier}. */ public Can<String> getMemberParameterNames() { - return identifier.getMemberParameterClassNames(); + return identifier.memberParameterClassNames(); } /** diff --git a/api/applib/src/test/java/org/apache/causeway/applib/IdentifierTests.java b/api/applib/src/test/java/org/apache/causeway/applib/IdentifierTests.java index c550c2ec74b..c5bc42802b5 100644 --- a/api/applib/src/test/java/org/apache/causeway/applib/IdentifierTests.java +++ b/api/applib/src/test/java/org/apache/causeway/applib/IdentifierTests.java @@ -54,7 +54,7 @@ void classIdentifierClassNameIsSet() { void memberParameterNames() { val domainClass = SomeDomainClass.class; identifier = Identifier.actionIdentifier(LogicalType.fqcn(domainClass), "placeOrder", int.class, String.class); - assertThat(identifier.getMemberParameterClassNames(), is(Can.of("int", "java.lang.String"))); + assertThat(identifier.memberParameterClassNames(), is(Can.of("int", "java.lang.String"))); } @Test diff --git a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java index 299766094db..247b8d9f1fc 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/progmodel/ProgrammingModelConstants.java @@ -529,7 +529,7 @@ public ViolationBuilder addVariable(final String name, final Number value) { */ public ViolationBuilder addVariablesFor(final Identifier featureIdentifier) { addVariable("type", featureIdentifier.getLogicalType().className()); - addVariable("member", featureIdentifier.getMemberLogicalName()); + addVariable("member", featureIdentifier.memberLogicalName()); return this; } public String buildMessage() { diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/DomainEventHelper.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/DomainEventHelper.java index dcb962dfaac..d94f20428e3 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/DomainEventHelper.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/DomainEventHelper.java @@ -221,7 +221,7 @@ public void postEventForAction( return uncheckedCast(event); } - log.error("Unable to locate constructor of ActionDomainEvent subclass.\n* event's class name : {}\n* source's class name: {}\n* identifier : {}\n", type.getName(), source.getClass().getName(), identifier.getMemberLogicalName()); + log.error("Unable to locate constructor of ActionDomainEvent subclass.\n* event's class name : {}\n* source's class name: {}\n* identifier : {}\n", type.getName(), source.getClass().getName(), identifier.memberLogicalName()); return null; } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionOverloadingValidator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionOverloadingValidator.java index 433b55b8216..24b19f5ae7c 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionOverloadingValidator.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionOverloadingValidator.java @@ -58,7 +58,7 @@ public void validateObjectEnter(final @NonNull ObjectSpecification spec) { _Blackhole.consume( // not strictly required, just to mark this as call with side-effects spec.streamActions(ActionScope.ANY, MixedIn.EXCLUDED, oa->{ - overloadedNames.add(oa.getFeatureIdentifier().getMemberLogicalName()); + overloadedNames.add(oa.getFeatureIdentifier().memberLogicalName()); }) .count() // consumes the stream ); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java index c36152bdb82..8afa0477482 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/invocation/IdentifierUtil.java @@ -124,7 +124,7 @@ public String logicalMemberIdentifierFor( private String logicalMemberIdentifierFor( final ObjectSpecification onType, final ObjectMember objectMember) { final String logicalTypeName = onType.logicalTypeName(); - final String localId = objectMember.getFeatureIdentifier().getMemberLogicalName(); + final String localId = objectMember.getFeatureIdentifier().memberLogicalName(); return logicalTypeName + "#" + localId; } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/NamedFacetFallbackFromMemberName.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/NamedFacetFallbackFromMemberName.java index 9b3f7fd60f5..94989985c70 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/NamedFacetFallbackFromMemberName.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/fallback/NamedFacetFallbackFromMemberName.java @@ -27,7 +27,7 @@ public class NamedFacetFallbackFromMemberName public NamedFacetFallbackFromMemberName(final FacetHolder holder) { super( - _Strings.asNaturalName.apply(holder.getFeatureIdentifier().getMemberLogicalName()), + _Strings.asNaturalName.apply(holder.getFeatureIdentifier().memberLogicalName()), holder, Precedence.FALLBACK); } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdater.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdater.java index 4d20fe3386b..b9c09a8eead 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdater.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/CompositeValueUpdater.java @@ -60,8 +60,8 @@ public Identifier getFeatureIdentifier() { return Identifier .actionIdentifier( id.getLogicalType(), - id.getMemberLogicalName(), - id.getMemberParameterClassNames()); + id.memberLogicalName(), + id.memberParameterClassNames()); } public ManagedObject executeWithRuleChecking( diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionUtils.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionUtils.java index fb7d24774e3..b773b823aec 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionUtils.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionUtils.java @@ -153,7 +153,7 @@ private static String guardAgainstEmptyReasonString( if("".equals(reason)) { val msg = ProgrammingModelConstants.MessageTemplate.INVALID_USE_OF_VALIDATION_SUPPORT_METHOD.builder() .addVariable("className", identifier.getClassName()) - .addVariable("memberName", identifier.getMemberLogicalName()) + .addVariable("memberName", identifier.memberLogicalName()) .buildMessage(); log.error(msg); return msg; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/postprocessors/all/MixinSanityChecksValidator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/postprocessors/all/MixinSanityChecksValidator.java index 0093aef8761..a1d2f7cabf6 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/postprocessors/all/MixinSanityChecksValidator.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/postprocessors/all/MixinSanityChecksValidator.java @@ -117,7 +117,7 @@ private void checkMixinMainMethod(final ObjectSpecification objSpec, final Ident val mixinFacet = ((ObjectSpecificationAbstract)objSpec).mixinFacet().orElseThrow(); val expectedMethodName = mixinFacet.getMainMethodName(); - val actualMethodName = memberIdentifier.getMemberLogicalName(); + val actualMethodName = memberIdentifier.memberLogicalName(); if(!expectedMethodName.equals(actualMethodName)) { ValidationFailure.raiseFormatted(objSpec, diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAssociation.java index 0d63119fea5..b46a4083dc1 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAssociation.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAssociation.java @@ -161,7 +161,7 @@ public static Predicate<ObjectAssociation> staticallyVisible(final Where where) } static Where whereContextFor(final Identifier memberIdentifier) { - return memberIdentifier.getType().isAction() + return memberIdentifier.type().isAction() ? STANDALONE_TABLES : PARENTED_TABLES; } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/OneToOneAssociation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/OneToOneAssociation.java index c5c965c9028..6118c77ef38 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/OneToOneAssociation.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/OneToOneAssociation.java @@ -70,7 +70,7 @@ default boolean isIncludedWithSnapshots() { default String getCssClass(final String prefix) { final String ownerObjectType = getDeclaringType().logicalTypeName().replace(".", "-"); - final String memberId = getFeatureIdentifier().getMemberLogicalName(); + final String memberId = getFeatureIdentifier().memberLogicalName(); return prefix + ownerObjectType + "-" + memberId; } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/CollectionMemento.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/CollectionMemento.java index 55f33840c22..5ec1f2e6f41 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/CollectionMemento.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/CollectionMemento.java @@ -67,7 +67,7 @@ public OneToManyAssociation getCollection(final @NonNull Supplier<SpecificationL if (collection == null) { collection = specLoader.get() .specForLogicalTypeElseFail(getIdentifier().getLogicalType()) - .getCollectionElseFail(getIdentifier().getMemberLogicalName()); + .getCollectionElseFail(getIdentifier().memberLogicalName()); } return collection; } @@ -76,7 +76,7 @@ public OneToManyAssociation getCollection(final @NonNull Supplier<SpecificationL @Override public String toString() { - return getIdentifier().logicalTypeName() + "#" + getIdentifier().getMemberLogicalName(); + return getIdentifier().logicalTypeName() + "#" + getIdentifier().memberLogicalName(); } } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/PropertyMemento.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/PropertyMemento.java index ad146b893d6..f5a34e3f790 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/PropertyMemento.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/PropertyMemento.java @@ -66,7 +66,7 @@ public OneToOneAssociation getProperty(final @NonNull Supplier<SpecificationLoad if (property == null) { property = specLoader.get() .specForLogicalTypeElseFail(getIdentifier().getLogicalType()) - .getPropertyElseFail(getIdentifier().getMemberLogicalName()); + .getPropertyElseFail(getIdentifier().memberLogicalName()); } return property; } @@ -75,7 +75,7 @@ public OneToOneAssociation getProperty(final @NonNull Supplier<SpecificationLoad @Override public String toString() { - return getIdentifier().logicalTypeName() + "#" + getIdentifier().getMemberLogicalName(); + return getIdentifier().logicalTypeName() + "#" + getIdentifier().memberLogicalName(); } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java index d8066a1e9ee..d69bd475581 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoader.java @@ -247,14 +247,14 @@ default Optional<ObjectFeature> loadFeature(final @Nullable Identifier featureId if(typeSpec==null) { return Optional.empty(); } - val member = typeSpec.getMember(featureIdentifier.getMemberLogicalName()).orElse(null); + val member = typeSpec.getMember(featureIdentifier.memberLogicalName()).orElse(null); if(member==null) { return Optional.empty(); } - final int paramIndex = featureIdentifier.getParameterIndex(); + final int paramIndex = featureIdentifier.parameterIndex(); - return featureIdentifier.getParameterIndex()<0 + return featureIdentifier.parameterIndex()<0 ? Optional.of(member) : Optional.of(((ObjectAction)member).getParameters().getElseFail(paramIndex)); } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java index 120fb49c7a6..7f5d182c074 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/SpecificationLoaderDefault.java @@ -527,11 +527,11 @@ private ValidationFailures runMetaModelValidators() { @Override public Optional<SemanticsOf> getActionSemanticsOf(final Identifier identifier) { - if(!identifier.getType().isAction()) { + if(!identifier.type().isAction()) { return Optional.empty(); } return specForLogicalType(identifier.getLogicalType()) - .flatMap(objSpec->objSpec.getAction(identifier.getMemberLogicalName())) + .flatMap(objSpec->objSpec.getAction(identifier.memberLogicalName())) .map(ObjectAction::getSemantics); } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java index 57880a7c12c..01e3f72947b 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java @@ -469,7 +469,7 @@ public ManagedObject execute( bookmarkIfAny.ifPresent(bookmark -> { // should always be true log.info("Executing: {}#{} {} {}", getFeatureIdentifier().logicalTypeName(), - getFeatureIdentifier().getMemberLogicalName(), + getFeatureIdentifier().memberLogicalName(), UtilStr.entityAsStr(bookmark, getSpecificationLoader()), argsFor(getParameters(), argumentAdapters)); }); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java index 34192ec18bf..924b354a9d1 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java @@ -104,7 +104,7 @@ public ObjectActionMixedIn( mixeeSpec.getCorrespondingClass(), mixeeSpec.logicalTypeName()), _MixedInMemberNamingStrategy.mixinMemberId(mixinAction), - mixinAction.getFacetedMethod().getFeatureIdentifier().getMemberParameterClassNames()), + mixinAction.getFacetedMethod().getFeatureIdentifier().memberParameterClassNames()), mixinAction.getFacetedMethod(), false, false); this.facetHolder = FacetHolder.layered( @@ -189,7 +189,7 @@ public ManagedObject execute( bookmarkIfAny.ifPresent(bookmark -> { // should always be true log.info("Executing: {}#{} {} {}", getFeatureIdentifier().logicalTypeName(), - getFeatureIdentifier().getMemberLogicalName(), + getFeatureIdentifier().memberLogicalName(), UtilStr.entityAsStr(bookmark, getSpecificationLoader()), argsFor(getParameters(), argumentAdapters)); }); diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java index 4b278a22767..cd89c7f4639 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java @@ -85,7 +85,7 @@ protected ObjectMemberAbstract( @Override public final String getId() { - return getFeatureIdentifier().getMemberLogicalName(); + return getFeatureIdentifier().memberLogicalName(); } // -- INTERACTION HEAD diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/_AssociationsAsColumns.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/_AssociationsAsColumns.java index ca9fe2ff8b7..9d27367fac1 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/_AssociationsAsColumns.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/dflt/_AssociationsAsColumns.java @@ -153,7 +153,7 @@ private void sortColumnsUsingSpi( propertyIdsInOrder) : tableColumnOrderService.orderParented( parentObject.getPojo(), - memberIdentifier.getMemberLogicalName(), + memberIdentifier.memberLogicalName(), elementType, propertyIdsInOrder)) .filter(_NullSafe::isPresent) @@ -167,7 +167,7 @@ private void sortColumnsUsingSpi( } static Where whereContextFor(final Identifier memberIdentifier) { - return memberIdentifier.getType().isAction() + return memberIdentifier.type().isAction() ? STANDALONE_TABLES : PARENTED_TABLES; } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/ValidationFailure.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/ValidationFailure.java index 6a91764b353..aa6e3c7d2b0 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/ValidationFailure.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/validator/ValidationFailure.java @@ -78,7 +78,7 @@ public static void raiseFormatted( private static final Comparator<ValidationFailure> comparator = Comparator .<ValidationFailure, String>comparing(failure->failure.getOrigin().getClassName(), nullsFirst(naturalOrder())) - .<String>thenComparing(failure->failure.getOrigin().getMemberLogicalName(), nullsFirst(naturalOrder())) + .<String>thenComparing(failure->failure.getOrigin().memberLogicalName(), nullsFirst(naturalOrder())) .thenComparing(ValidationFailure::getMessage); // -- CONTRACT diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/interactive/DataTableInteractive.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/interactive/DataTableInteractive.java index 2857da80e2f..860786d4f0c 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/interactive/DataTableInteractive.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/tabular/interactive/DataTableInteractive.java @@ -251,11 +251,11 @@ public Can<ManagedObject> getSelected() { public ActionInteraction startAssociatedActionInteraction(final String actionId, final Where where) { val featureId = managedMember.getIdentifier(); - if(!featureId.getType().isPropertyOrCollection()) { + if(!featureId.type().isPropertyOrCollection()) { return ActionInteraction.empty(String.format("[no such collection %s; instead got %s;" + "(while searching for an associated action %s)]", featureId, - featureId.getType(), + featureId.type(), actionId)); } return ActionInteraction.startWithMultiselect(managedMember.getOwner(), actionId, where, this); @@ -320,9 +320,9 @@ public DataTableInteractive getDataTableModel(final ManagedObject owner) { throw _Exceptions.illegalArgument("cannot recreate from memento for deleted object"); } - val memberId = featureId.getMemberLogicalName(); + val memberId = featureId.memberLogicalName(); - if(featureId.getType().isPropertyOrCollection()) { + if(featureId.type().isPropertyOrCollection()) { // bypass domain events val collInteraction = CollectionInteraction.start(owner, memberId, where); val managedColl = collInteraction.getManagedCollection().orElseThrow(); diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java index 760f789d4f4..7a0017d25cd 100644 --- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java +++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facetapi/FeatureTypeTest_identifierFor.java @@ -59,7 +59,7 @@ public void property_whenMethodNameIs_XYyyZzz() throws Exception { final Method method = SomeDomainClass.class.getMethod("getABigDecimal"); final Identifier identifierFor = FeatureType.PROPERTY.identifierFor( LogicalType.fqcn(SomeDomainClass.class), _MethodFacades.testing.regular(method)); - assertThat(identifierFor.getMemberLogicalName(), is("ABigDecimal")); // very + assertThat(identifierFor.memberLogicalName(), is("ABigDecimal")); // very // odd // compared // to @@ -82,7 +82,7 @@ public void property_whenMethodNameIs_XxxxYyyZzz() throws Exception { final Method method = SomeDomainClass.class.getMethod("getAnotherBigDecimal"); final Identifier identifierFor = FeatureType.PROPERTY.identifierFor( LogicalType.fqcn(SomeDomainClass.class), _MethodFacades.testing.regular(method)); - assertThat(identifierFor.getMemberLogicalName(), is("anotherBigDecimal")); + assertThat(identifierFor.memberLogicalName(), is("anotherBigDecimal")); } } diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java index 050edbfb0f2..6d70077bd31 100644 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java @@ -195,7 +195,7 @@ private BSMenuBars updateFacetsFromActionLayoutXml(final BSMenuBars menuBarsFrom val serviceActionIdentifier = objectAction.getFeatureIdentifier(); val actionId = serviceActionIdentifier.logicalTypeName() - + "#" + serviceActionIdentifier.getMemberLogicalName(); + + "#" + serviceActionIdentifier.memberLogicalName(); val layoutData = serviceActionLayoutDataByActionId.get(actionId); diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java index 2a81cfec520..771829e7ebb 100644 --- a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java +++ b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java @@ -122,7 +122,7 @@ public boolean isVisible( return true; } // no-op if is visibility context check at object-level - if (identifier.getMemberLogicalName().equals("")) { + if (identifier.memberLogicalName().equals("")) { return true; } if(containsSudoSuperuserRole(authentication)) { diff --git a/persistence/querydsl/metamodel/src/main/java/org/apache/causeway/persistence/querydsl/metamodel/facets/AutoCompleteGeneratedQueryFacetFactory.java b/persistence/querydsl/metamodel/src/main/java/org/apache/causeway/persistence/querydsl/metamodel/facets/AutoCompleteGeneratedQueryFacetFactory.java index a5a57454d3f..5bb09ddd610 100644 --- a/persistence/querydsl/metamodel/src/main/java/org/apache/causeway/persistence/querydsl/metamodel/facets/AutoCompleteGeneratedQueryFacetFactory.java +++ b/persistence/querydsl/metamodel/src/main/java/org/apache/causeway/persistence/querydsl/metamodel/facets/AutoCompleteGeneratedQueryFacetFactory.java @@ -108,7 +108,7 @@ public void process(ProcessMethodContext processMethodContext) { .ifPresent(property -> { val queryDslAutoCompletePolicy = property.queryDslAutoComplete(); if(queryDslAutoCompletePolicy.isIncluded()) { - updateAutoCompleteQueryDslFacet(declaringSpec, facetedMethod.getFeatureIdentifier().getMemberLogicalName(), queryDslAutoCompletePolicy); + updateAutoCompleteQueryDslFacet(declaringSpec, facetedMethod.getFeatureIdentifier().memberLogicalName(), queryDslAutoCompletePolicy); } }); } diff --git a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java index 3d40e66d33a..7ed67a330a2 100644 --- a/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java +++ b/security/shiro/src/main/java/org/apache/causeway/security/shiro/authorization/AuthorizorShiro.java @@ -87,7 +87,7 @@ private boolean isPermitted(String userName, Identifier identifier, String quali private String asPermissionsString(Identifier identifier) { val logicalTypeName = identifier.getLogicalType().getLogicalTypeNameFormatted(":", ":"); - return logicalTypeName + ":" + identifier.getMemberLogicalName(); + return logicalTypeName + ":" + identifier.memberLogicalName(); } // -- DEPS diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiProperty.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiProperty.java index de569a5cc8d..de9c88f80bd 100644 --- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiProperty.java +++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/scalar/UiProperty.java @@ -46,7 +46,7 @@ default ManagedProperty getManagedProperty() { @Override default String getIdentifier() { - return getMetaModel().getFeatureIdentifier().getMemberLogicalName(); + return getMetaModel().getFeatureIdentifier().memberLogicalName(); } @Override diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarPropertyModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarPropertyModel.java index 1afc4835a6d..e435ec1d70a 100644 --- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarPropertyModel.java +++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ScalarPropertyModel.java @@ -80,7 +80,7 @@ public String validate(final ManagedObject proposedNewValue) { public String toStringOf() { val featureId = uiProperty.getMetaModel().getFeatureIdentifier(); return getFriendlyName() + ": " + - featureId.logicalTypeName() + "#" + featureId.getMemberLogicalName(); + featureId.logicalTypeName() + "#" + featureId.memberLogicalName(); } diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java index 7384f01b0e4..cf3e8c80c63 100644 --- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java +++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/UiObjectWkt.java @@ -242,7 +242,7 @@ public ScalarModel getPropertyModel( val propertyInteractionModel = new PropertyInteractionWkt( bookmarkedObjectModel, - pm.getIdentifier().getMemberLogicalName(), + pm.getIdentifier().memberLogicalName(), renderingHint.asWhere()); final long modelsAdded = propertyInteractionModel.streamPropertyUiModels() diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java index 8b06d9db6a0..6cf8b24a00b 100644 --- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java +++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java @@ -97,11 +97,11 @@ public static ActionInteractionWkt forEntity( final EntityCollectionModel associatedWithCollectionIfAny) { val onwerSpec = parentEntityModel.getBookmarkedOwner().objSpec(); - val objectAction = onwerSpec.getAction(actionIdentifier.getMemberLogicalName()); + val objectAction = onwerSpec.getAction(actionIdentifier.memberLogicalName()); return new ActionInteractionWkt( parentEntityModel.bookmarkedObjectModel(), - actionIdentifier.getMemberLogicalName(), + actionIdentifier.memberLogicalName(), where, objectAction, associatedWithPropertyIfAny, diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java index a58e3625c1a..6ff61144b96 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java @@ -592,9 +592,9 @@ public static String cssNormalize(final Identifier identifier) { val sb = new StringBuilder(); sb.append("causeway-"); sb.append(identifier.getLogicalType().logicalName()); - if(_Strings.isNullOrEmpty(identifier.getMemberLogicalName())) { + if(_Strings.isNullOrEmpty(identifier.memberLogicalName())) { sb.append("-"); - sb.append(identifier.getMemberLogicalName()); + sb.append(identifier.memberLogicalName()); } return cssNormalize(sb.toString()); }
