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 8f3dcba430edca8d94d2b9088eb790d8084f2d14 Author: andi-huber <[email protected]> AuthorDate: Thu Jan 15 14:00:54 2026 +0100 CAUSEWAY-3955: [v2] refactors internally no longer to use deprecations in Identifier (part 2) --- .../causeway/core/config/progmodel/ProgrammingModelConstants.java | 2 +- .../core/metamodel/facets/object/value/CompositeValueUpdater.java | 2 +- .../causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java | 2 +- .../core/metamodel/methods/_OrphanedSupportingMethodValidator.java | 2 +- .../causeway/core/metamodel/spec/feature/memento/ActionMemento.java | 2 +- .../causeway/core/metamodel/spec/feature/memento/CollectionMemento.java | 2 +- .../core/metamodel/spec/feature/memento/ObjectMemberMemento.java | 2 +- .../causeway/core/metamodel/spec/feature/memento/PropertyMemento.java | 2 +- .../apache/causeway/core/metamodel/specloader/SpecificationLoader.java | 2 +- .../causeway/core/metamodel/specloader/SpecificationLoaderDefault.java | 2 +- .../metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java | 2 +- .../apache/causeway/security/shiro/authorization/AuthorizorShiro.java | 2 +- .../testing/integtestsupport/applib/validate/DomainModelValidator.java | 2 +- .../ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) 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 247b8d9f1fc..0ddc7d67f01 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 @@ -528,7 +528,7 @@ public ViolationBuilder addVariable(final String name, final Number value) { * Populates 'type' and 'member' keys (for template variable resolution). */ public ViolationBuilder addVariablesFor(final Identifier featureIdentifier) { - addVariable("type", featureIdentifier.getLogicalType().className()); + addVariable("type", featureIdentifier.logicalType().className()); addVariable("member", featureIdentifier.memberLogicalName()); return this; } 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 b9c09a8eead..d64c885aaa5 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 @@ -59,7 +59,7 @@ public Identifier getFeatureIdentifier() { val id = delegate.getFeatureIdentifier(); return Identifier .actionIdentifier( - id.getLogicalType(), + id.logicalType(), id.memberLogicalName(), id.memberParameterClassNames()); } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java index a5f43251ef2..475284efe92 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/value/ValueFacetAbstract.java @@ -118,7 +118,7 @@ public void visitAttributes(final BiConsumer<String, Object> visitor) { @Override public final LogicalType getLogicalType() { - return getFacetHolder().getFeatureIdentifier().getLogicalType(); + return getFacetHolder().getFeatureIdentifier().logicalType(); } @Override diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/_OrphanedSupportingMethodValidator.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/_OrphanedSupportingMethodValidator.java index 44bb2c6fa16..b786aa9a274 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/_OrphanedSupportingMethodValidator.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/methods/_OrphanedSupportingMethodValidator.java @@ -60,7 +60,7 @@ static void validate( .forEach(orphanedMethod->{ val methodIdentifier = Identifier - .methodIdentifier(spec.getFeatureIdentifier().getLogicalType(), orphanedMethod); + .methodIdentifier(spec.getFeatureIdentifier().logicalType(), orphanedMethod); ValidationFailure.raise( spec, diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/ActionMemento.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/ActionMemento.java index 591ff8d0689..b25bd72dcb6 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/ActionMemento.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/ActionMemento.java @@ -65,7 +65,7 @@ public static ActionMemento forAction(final @NonNull ObjectAction action) { public ObjectAction getAction(final @NonNull Supplier<SpecificationLoader> specLoader) { if (action == null) { action = specLoader.get() - .specForLogicalTypeElseFail(getIdentifier().getLogicalType()) + .specForLogicalTypeElseFail(getIdentifier().logicalType()) .getActionElseFail( getIdentifier().getMemberNameAndParameterClassNamesIdentityString()); } 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 5ec1f2e6f41..0a132a858b2 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 @@ -66,7 +66,7 @@ public static CollectionMemento forCollection(final @NonNull OneToManyAssociatio public OneToManyAssociation getCollection(final @NonNull Supplier<SpecificationLoader> specLoader) { if (collection == null) { collection = specLoader.get() - .specForLogicalTypeElseFail(getIdentifier().getLogicalType()) + .specForLogicalTypeElseFail(getIdentifier().logicalType()) .getCollectionElseFail(getIdentifier().memberLogicalName()); } return collection; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/ObjectMemberMemento.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/ObjectMemberMemento.java index 60fc3abc7eb..92f517facdc 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/ObjectMemberMemento.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/memento/ObjectMemberMemento.java @@ -65,7 +65,7 @@ public static ObjectMemberMemento forMember(final @NonNull ObjectMember objectMe public ObjectMember getObjectMember(final @NonNull Supplier<SpecificationLoader> specLoader) { if (objectMember == null) { objectMember = specLoader.get() - .specForLogicalTypeElseFail(getIdentifier().getLogicalType()) + .specForLogicalTypeElseFail(getIdentifier().logicalType()) .getMemberElseFail( getIdentifier().getMemberNameAndParameterClassNamesIdentityString()); } 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 f5a34e3f790..e2355a9bfdb 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 @@ -65,7 +65,7 @@ public static PropertyMemento forProperty(final @NonNull OneToOneAssociation pro public OneToOneAssociation getProperty(final @NonNull Supplier<SpecificationLoader> specLoader) { if (property == null) { property = specLoader.get() - .specForLogicalTypeElseFail(getIdentifier().getLogicalType()) + .specForLogicalTypeElseFail(getIdentifier().logicalType()) .getPropertyElseFail(getIdentifier().memberLogicalName()); } return property; 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 d69bd475581..0860009d016 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 @@ -243,7 +243,7 @@ default Optional<ObjectFeature> loadFeature(final @Nullable Identifier featureId if(featureIdentifier==null) { return Optional.empty(); } - val typeSpec = specForLogicalType(featureIdentifier.getLogicalType()).orElse(null); + val typeSpec = specForLogicalType(featureIdentifier.logicalType()).orElse(null); if(typeSpec==null) { return Optional.empty(); } 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 7f5d182c074..7b763b339ea 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 @@ -530,7 +530,7 @@ public Optional<SemanticsOf> getActionSemanticsOf(final Identifier identifier) { if(!identifier.type().isAction()) { return Optional.empty(); } - return specForLogicalType(identifier.getLogicalType()) + return specForLogicalType(identifier.logicalType()) .flatMap(objSpec->objSpec.getAction(identifier.memberLogicalName())) .map(ObjectAction::getSemantics); } diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java index 7f65cf0785d..41488899001 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/_MixedInMemberNamingStrategy.java @@ -55,7 +55,7 @@ String mixinMemberId(final @NonNull String mixinClassSimpleName) { // -- HELPER private String mixinClassSimpleName(final ObjectActionDefault mixinActionAsRegular) { - return mixinActionAsRegular.getFeatureIdentifier().getLogicalType().correspondingClass().getSimpleName(); + return mixinActionAsRegular.getFeatureIdentifier().logicalType().correspondingClass().getSimpleName(); } private String lastWord(final String mixinClassSimpleName) { 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 7ed67a330a2..c6da655f7d3 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 @@ -86,7 +86,7 @@ private boolean isPermitted(String userName, Identifier identifier, String quali } private String asPermissionsString(Identifier identifier) { - val logicalTypeName = identifier.getLogicalType().getLogicalTypeNameFormatted(":", ":"); + val logicalTypeName = identifier.logicalType().getLogicalTypeNameFormatted(":", ":"); return logicalTypeName + ":" + identifier.memberLogicalName(); } diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java index b10dea1d27f..9cca6d909c8 100644 --- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java +++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/validate/DomainModelValidator.java @@ -175,7 +175,7 @@ public void assertAnyFailuresContaining( val logicalType = specificationLoader.specForTypeElseFail(domainType) .logicalType(); - final Predicate<Identifier> filterByLogicalType = id->id.getLogicalType().equals(logicalType); + final Predicate<Identifier> filterByLogicalType = id->id.logicalType().equals(logicalType); boolean matchFound = streamFailures(filterByLogicalType) .anyMatch(failure-> 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 6ff61144b96..f980b40189a 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 @@ -591,7 +591,7 @@ public <T extends Component> T cssReplace(final T component, final @Nullable Str public static String cssNormalize(final Identifier identifier) { val sb = new StringBuilder(); sb.append("causeway-"); - sb.append(identifier.getLogicalType().logicalName()); + sb.append(identifier.logicalType().logicalName()); if(_Strings.isNullOrEmpty(identifier.memberLogicalName())) { sb.append("-"); sb.append(identifier.memberLogicalName());
