[wicket] 01/02: WICKET-6678 Instant : Unsupported field: YearOfEra when cookieUtils.cookieToDebugString() is called

[mg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 20c5e057ac9326b20ad5fdaddc46c72e5c3d9141
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Tue Jun 25 23:50:53 2019 +0300

    WICKET-6678 Instant : Unsupported field: YearOfEra when cookieUtils.cookieToDebugString() is called
    
    Rename constants to follow Java naming conventions.
    Delete a constant introduced in Wicket 9.0.0-M2 that is used only in a debug log in CookieUtils. There is no need of this special date format for a log message.
---
 .../src/main/java/org/apache/wicket/util/time/Instants.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/Instants.java b/wicket-util/src/main/java/org/apache/wicket/util/time/Instants.java
index 4dbb2ff..e130138 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/time/Instants.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/time/Instants.java
@@ -17,23 +17,18 @@
 package org.apache.wicket.util.time;
 
 import java.time.Instant;
-import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
 /**
- * 
  * Utility class for {@link Instant}
- *
  */
 public class Instants
 {
 
-	public static final DateTimeFormatter RFC7231DateFormatter = DateTimeFormatter
-		.ofPattern("EEE, dd MMM yyyy HH:mm:ss O", Locale.ENGLISH).withZone(ZoneId.of("UTC"));
-
-	public static final DateTimeFormatter localDateFormatter = DateTimeFormatter
-		.ofPattern("yyyy.MM.dd", Locale.ENGLISH);
+	public static final DateTimeFormatter RFC_7231_DATE_FORMATTER = DateTimeFormatter
+		.ofPattern("EEE, dd MMM yyyy HH:mm:ss O", Locale.ENGLISH).withZone(ZoneOffset.UTC);
 
 	/**
 	 * Formats a given {@link Instant} as required by RFC7231 for dates.
@@ -43,6 +38,6 @@ public class Instants
 	 */
 	public static String toRFC7231Format(final Instant instant)
 	{
-		return RFC7231DateFormatter.format(instant);
+		return RFC_7231_DATE_FORMATTER.format(instant);
 	}
 }