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/01/03 10:48:55 UTC

[isis] branch master updated: ISIS-2882: test fixes

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 8252d95  ISIS-2882: test fixes
8252d95 is described below

commit 8252d9534bfdf0cc96e8543e48da5075c01efa79
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 3 11:48:46 2022 +0100

    ISIS-2882: test fixes
---
 .../valuesemantics/temporal/TemporalValueSemanticsProvider.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
index b072327..9205ea2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/temporal/TemporalValueSemanticsProvider.java
@@ -24,6 +24,7 @@ import java.time.format.FormatStyle;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalQuery;
+import java.util.Optional;
 import java.util.function.BiFunction;
 
 import javax.inject.Inject;
@@ -185,7 +186,8 @@ implements TemporalValueSemantics<T> {
      */
     protected DateTimeFormatter getRenderingFormat(final ValueSemanticsProvider.Context context) {
 
-        val featureIfAny = specLoader.loadFeature(context.getFeatureIdentifier());
+        val featureIfAny = Optional.ofNullable(specLoader) //JUnit support
+                .flatMap(specLdr->specLdr.loadFeature(context.getFeatureIdentifier()));
 
         val dateFormatStyle = featureIfAny
                 .flatMap(feature->feature.lookupFacet(DateFormatStyleFacet.class))