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 3311c949f6a80836db94a6c593521680360d60cc Author: andi-huber <[email protected]> AuthorDate: Thu Jan 15 13:45:44 2026 +0100 CAUSEWAY-3955: [v2] refactors internally no longer to use deprecations in ValueSemanticsProvider --- .../causeway/applib/value/semantics/ValueSemanticsAbstract.java | 2 +- .../causeway/applib/value/semantics/ValueSemanticsProvider.java | 3 ++- .../core/metamodel/valuesemantics/BigDecimalValueSemantics.java | 2 +- .../core/metamodel/valuesemantics/LocaleValueSemantics.java | 2 +- .../valuesemantics/temporal/TemporalValueSemanticsProvider.java | 8 ++++---- .../fullcalendar/applib/value/CalendarEventSemantics.java | 4 ++-- .../causeway/testdomain/value/ActionInteractionProbeImpl.java | 4 ++-- .../apache/causeway/testdomain/value/ValueSemanticsTester.java | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java index 4aada99c236..080c6deae4d 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java @@ -113,7 +113,7 @@ public IdStringifier<T> getIdStringifier() { */ protected UserLocale getUserLocale(final @Nullable ValueSemanticsProvider.Context context) { return Optional.ofNullable(context) - .map(ValueSemanticsProvider.Context::getInteractionContext) + .map(ValueSemanticsProvider.Context::interactionContext) .map(InteractionContext::getLocale) .orElseGet(UserLocale::getDefault); } diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java index ae50225f1df..7d53f0a2054 100644 --- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java @@ -59,13 +59,14 @@ public interface ValueSemanticsProvider<T> { class Context { private final @Nullable Identifier featureIdentifier; private final @Nullable InteractionContext interactionContext; + + // -- DEPRECATIONS /** * @deprecated use {@link #featureIdentifier()} instead */ @Deprecated(forRemoval = true) // replaced by a record in future versions public final @Nullable Identifier getFeatureIdentifier() { return featureIdentifier; } - /** * @deprecated use {@link #interactionContext()} instead */ diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java index e02a9a6449a..eb7a7a76075 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/BigDecimalValueSemantics.java @@ -163,7 +163,7 @@ protected void configureDecimalFormat( return; } - val feature = specificationLoader.loadFeature(context.getFeatureIdentifier()) + val feature = specificationLoader.loadFeature(context.featureIdentifier()) .orElse(null); if(feature==null) { return; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocaleValueSemantics.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocaleValueSemantics.java index bdd33fbd8f5..985c0516aa9 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocaleValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/LocaleValueSemantics.java @@ -82,7 +82,7 @@ public String htmlPresentation(final ValueSemanticsProvider.Context context, fin } private String localeToString(final ValueSemanticsProvider.Context context, final Locale value) { - val userLanguageLocale = context.getInteractionContext().getLocale().getLanguageLocale(); + val userLanguageLocale = context.interactionContext().getLocale().getLanguageLocale(); val language = value.getDisplayLanguage(userLanguageLocale); if(_Strings.isEmpty(language)) { diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java index 4faf16281d6..80a24b4bc3a 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java @@ -314,15 +314,15 @@ protected Function<T, String> getRenderingFormatter( private Temporal translateToUserLocalTimeZone(final ValueSemanticsProvider.Context context, final Temporal t) { if(t instanceof ZonedDateTime) { return _Temporals.translateToTimeZone((ZonedDateTime) t, - context.getInteractionContext().getTimeZone()); + context.interactionContext().getTimeZone()); } if(t instanceof OffsetDateTime) { return _Temporals.translateToTimeZone((OffsetDateTime) t, - context.getInteractionContext().getTimeZone()); + context.interactionContext().getTimeZone()); } if(t instanceof OffsetTime) { return _Temporals.translateToTimeOffset((OffsetTime) t, - context.getInteractionContext().getTimeZoneOffsetNow()); + context.interactionContext().getTimeZoneOffsetNow()); } return t; // otherwise acts as identity operator } @@ -389,7 +389,7 @@ static DateAndTimeFormatStyle forContext( .map(MetaModelContext::getSpecificationLoader) .flatMap(specLoader->specLoader.loadFeature( Optional.ofNullable(context) - .map(ValueSemanticsProvider.Context::getFeatureIdentifier) + .map(ValueSemanticsProvider.Context::featureIdentifier) .orElse(null))); // DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofLocalizedPattern(mmc.getConfiguration().getValueTypes().getTemporal().getDisplay().getDatePattern()); diff --git a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java index 4adde410592..991cc150523 100644 --- a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java +++ b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java @@ -160,7 +160,7 @@ public String htmlPresentation(final Context context, final CalendarEvent value) "calendar-name", v.getCalendarName(), "timestamp", zonedDateTimeValueSemantics .htmlPresentation(context, - v.asDateTime(context.getInteractionContext().getTimeZone())), + v.asDateTime(context.interactionContext().getTimeZone())), "notes", _Strings.nullToEmpty(v.getNotes())); } @@ -172,7 +172,7 @@ public String htmlPresentation(final Context context, final CalendarEvent value) "calendar-name", _Strings.htmlEscape(v.getCalendarName()), "timestamp", zonedDateTimeValueSemantics .htmlPresentation(context, - v.asDateTime(context.getInteractionContext().getTimeZone())), + v.asDateTime(context.interactionContext().getTimeZone())), "notes", _Strings.htmlEscape(_Strings.nullToEmpty(v.getNotes()))); } diff --git a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ActionInteractionProbeImpl.java b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ActionInteractionProbeImpl.java index 10c87ea7efd..da7c96cc2d5 100644 --- a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ActionInteractionProbeImpl.java +++ b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ActionInteractionProbeImpl.java @@ -66,7 +66,7 @@ public void testCommandWithNonEmptyArg( val parameterRecordedDto = actionDto.getParameters().getParameter().get(0); assertNotNull(parameterRecordedDto); - final Identifier paramId = context.getFeatureIdentifier(); + final Identifier paramId = context.featureIdentifier(); val parameterRecorded = valueMarshaller.recoverParameterFrom(paramId, parameterRecordedDto); assertNotNull(parameterRecorded); @@ -98,7 +98,7 @@ public void testCommandWithEmptyArg( val parameterRecordedDto = actionDto.getParameters().getParameter().get(0); assertNotNull(parameterRecordedDto); - final Identifier paramId = context.getFeatureIdentifier(); + final Identifier paramId = context.featureIdentifier(); val parameterRecorded = valueMarshaller.recoverParameterFrom(paramId, parameterRecordedDto); assertNotNull(parameterRecorded); diff --git a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java index d935bc86966..d62b60dfe13 100644 --- a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java +++ b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java @@ -181,7 +181,7 @@ public void propertyInteraction( assertTrue(semanticsIfAny.isPresent(), ()-> "value semantics must be available for " - + context.getFeatureIdentifier()); + + context.featureIdentifier()); probe.testComposer(context, semanticsIfAny.get());
