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 11:30:14 UTC

[isis] 02/02: ISIS-2223: Rename this method; there is a "private" method in the parent class with the same name.

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 a6405a115e79c50fc63d120fd3c64e0004233277
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 19 12:29:17 2020 +0100

    ISIS-2223: Rename this method; there is a "private" method in the parent
    class with the same name.
    
    also make encoding truly thread-safe
---
 .../JodaDateTimeValueSemanticsProvider.java        | 25 +++++-----------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
index 24bc9d5..bd106f5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
@@ -140,16 +140,6 @@ public class JodaDateTimeValueSemanticsProvider extends ValueSemanticsProviderAb
         attributeMap.put("configuredFormat", configuredFormat);
     }
 
-
-
-
-
-
-    // no default
-    private static final DateTime DEFAULT_VALUE = null;
-
-
-
     @Override
     protected DateTime add(final DateTime original, final int years, final int months, final int days, final int hours, final int minutes) {
         if(hours != 0 || minutes != 0) {
@@ -177,29 +167,24 @@ public class JodaDateTimeValueSemanticsProvider extends ValueSemanticsProviderAb
     // EncoderDecoder
     // //////////////////////////////////////////////////////////////////
 
-    private final DateTimeFormatter encodingFormatter = ISODateTimeFormat.basicDateTime();
+    private final static DateTimeFormatter encodingFormatter() {
+        return ISODateTimeFormat.basicDateTime();
+    }
 
     @Override
     protected String doEncode(final Object object) {
         final DateTime date = (DateTime) object;
-        return encode(date);
-    }
-
-    private synchronized String encode(final DateTime date) {
-        return encodingFormatter.print(date);
+        return encodingFormatter().print(date);
     }
 
     @Override
     protected DateTime doRestore(final String data) {
         try {
-            return parse(data);
+            return encodingFormatter().parseDateTime(data);
         } catch (final IllegalArgumentException e) {
             throw new EncodingException(e);
         }
     }
 
-    private synchronized DateTime parse(final String data) {
-        return encodingFormatter.parseDateTime(data);
-    }
 
 }