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 2020/01/19 18:20:44 UTC

[isis] 01/02: ISIS-2223: remove ThreadLocal FORMATS from ValueSemanticsProviderAbstractTemporal

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

commit d0d9d6454819f4e24e8eb86a9e31e3b57a0cffb8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 19 19:16:38 2020 +0100

    ISIS-2223: remove ThreadLocal FORMATS from
    ValueSemanticsProviderAbstractTemporal
---
 .../ValueSemanticsProviderAbstractTemporal.java    | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 0c96ee8..01db2d2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -32,7 +32,6 @@ import java.util.TimeZone;
 
 import org.apache.isis.applib.adapters.EncodingException;
 import org.apache.isis.core.commons.internal.base._Casts;
-import org.apache.isis.core.commons.internal.collections._Maps;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -44,26 +43,9 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T>
 extends ValueSemanticsProviderAndFacetAbstract<T> 
 implements DateValueFacet {
 
-    /**
-     * Introduced to allow BDD tests to provide a different format string
-     * "mid-flight".
-     */
-    public static void setFormat(final String propertyType, final String formatStr) {
-        FORMATS.get().put(propertyType, formatStr);
-    }
-
-    private final static ThreadLocal<Map<String, String>> FORMATS = new ThreadLocal<Map<String, String>>() {
-        @Override
-        protected java.util.Map<String, String> initialValue() {
-            return _Maps.newHashMap();
-        }
-    };
-
     protected static final String ISO_ENCODING_FORMAT = "iso_encoding";
     protected static final TimeZone UTC_TIME_ZONE;
 
-    //public final static String FORMAT_KEY_PREFIX = ConfigurationConstants.ROOT + "value.format.";
-
     static {
         TimeZone timeZone = TimeZone.getTimeZone("Etc/UTC");
         if (timeZone == null) {
@@ -121,14 +103,7 @@ implements DateValueFacet {
     }
 
     protected void buildDefaultFormatIfRequired() {
-        final Map<String, String> map = FORMATS.get();
-        final String currentlyConfiguredFormat = map.get(propertyType);
-        if (currentlyConfiguredFormat == null || getConfiguredFormat().equals(currentlyConfiguredFormat)) {
-            return;
-        }
-
         // (re)create format
-        setConfiguredFormat(currentlyConfiguredFormat);
         buildFormat(getConfiguredFormat());
     }