From 5c1cabf8355199f03924bbabf34f98b315a01f51 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 12 Dec 2011 11:09:39 +0100
Subject: [PATCH] Improve DateUtils by using generics in ThreadLocal + rename
 some unit tests of DateUtilsTest

---
 .../main/java/org/sonar/api/utils/DateUtils.java  | 15 +++++++++------
 .../java/org/sonar/api/utils/DateUtilsTest.java   |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
index 12cdfa47eb6..836169d5880 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/DateUtils.java
@@ -21,13 +21,16 @@ package org.sonar.api.utils;
 
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
-import java.text.*;
+import java.text.DateFormat;
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
  * Parses and formats <a href="http://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a> dates.
  * This class is thread-safe.
- * 
+ *
  * @since 2.7
  */
 public final class DateUtils {
@@ -82,11 +85,11 @@ public final class DateUtils {
       this.format = format;
     }
 
-    private final transient ThreadLocal cache = new ThreadLocal() {
-      public Object get() {
-        Reference softRef = (Reference) super.get();
+    private final transient ThreadLocal<Reference<DateFormat>> cache = new ThreadLocal<Reference<DateFormat>>() {
+      public Reference<DateFormat> get() {
+        Reference<DateFormat> softRef = super.get();
         if (softRef == null || softRef.get() == null) {
-          softRef = new SoftReference(new SimpleDateFormat(format));
+          softRef = new SoftReference<DateFormat>(new SimpleDateFormat(format));
           super.set(softRef);
         }
         return softRef;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
index 2a42e9d1047..c855a2608ac 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
@@ -45,7 +45,7 @@ public class DateUtilsTest {
   }
 
   @Test(expected = SonarException.class)
-  public void shouldNotParseDate2() {
+  public void shouldNotParseDateIfAdditionnalCharacters() {
     DateUtils.parseDate("1986-12-04foo");
   }
 
@@ -61,7 +61,7 @@ public class DateUtilsTest {
   }
 
   @Test(expected = SonarException.class)
-  public void shouldNotParseDateTime2() {
+  public void shouldNotParseIfAdditionnalCharacters() {
     DateUtils.parseDateTime("1986-12-04T01:02:03+0300foo");
   }
 
-- 
2.39.5