Remove joda-time and use Java 8 time instead

.travis.yml

@@ -1,8 +1,6 @@
 dist: trusty
 language: java
 jdk:
-#  - openjdk7
-#  - oraclejdk7 disabling due to the container not being able to set JAVA_HOME correctly
   - oraclejdk8
   - openjdk8
   - oraclejdk11

pom.xml

@@ -23,7 +23,6 @@
         <spotbugs.plugin>4.0.0</spotbugs.plugin>
         <jacoco.version>0.8.5</jacoco.version>
         <javadoc.plugin>3.2.0</javadoc.plugin>
-        <joda.version>2.10.6</joda.version>
     </properties>
 
     <url>https://github.com/damnhandy/Handy-URI-Templates</url>
@@ -277,8 +276,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
 
@@ -328,11 +327,11 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>${javadoc.plugin}</version>
                 <configuration>
-                    <source>1.7</source>
+                    <source>1.8</source>
                     <encoding>UTF-8</encoding>
                     <maxmemory>1g</maxmemory>
                     <links>
-                        <link>http://docs.oracle.com/javase/7/docs/api/</link>
+                        <link>http://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
                 </configuration>
             </plugin>
@@ -522,11 +521,11 @@
                         <version>${javadoc.plugin}</version>
                         <configuration>
                             <additionalJOption>-Xdoclint:none</additionalJOption>
-                            <source>1.7</source>
+                            <source>1.8</source>
                             <encoding>UTF-8</encoding>
                             <maxmemory>1g</maxmemory>
                             <links>
-                                <link>http://docs.oracle.com/javase/7/docs/api/</link>
+                                <link>http://docs.oracle.com/javase/8/docs/api/</link>
                             </links>
                         </configuration>
                         <executions>
@@ -552,11 +551,11 @@
                         <version>${javadoc.plugin}</version>
                         <configuration>
                             <additionalJOption>-Xdoclint:none</additionalJOption>
-                            <source>1.7</source>
+                            <source>1.8</source>
                             <encoding>UTF-8</encoding>
                             <maxmemory>1g</maxmemory>
                             <links>
-                                <link>http://docs.oracle.com/javase/7/docs/api/</link>
+                                <link>http://docs.oracle.com/javase/8/docs/api/</link>
                             </links>
                         </configuration>
                     </plugin>
@@ -647,12 +646,5 @@
             <version>${http.client}</version>
             <scope>test</scope>
         </dependency>
-
-        <!-- Date/Time Utilities -->
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${joda.version}</version>
-        </dependency>
     </dependencies>
 </project>

src/main/java/com/damnhandy/uri/template/UriTemplate.java

@@ -16,15 +16,16 @@
 package com.damnhandy.uri.template;
 
 import com.damnhandy.uri.template.impl.*;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Array;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
@@ -84,7 +85,7 @@ public enum Encoding
     /**
      *
      */
-    transient DateTimeFormatter defaultDateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+    transient DateTimeFormatter defaultDateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
 
     /**
      * @deprecated Replaced by {@link #defaultDateTimeFormatter defaultDateTimeFormatter}
@@ -469,7 +470,7 @@ public Map<String, Object> getValues()
      */
     public UriTemplate withDefaultDateFormat(String dateFormatString)
     {
-        return this.withDefaultDateFormat(DateTimeFormat.forPattern(dateFormatString));
+        return this.withDefaultDateFormat(DateTimeFormatter.ofPattern(dateFormatString));
     }
 
     private UriTemplate withDefaultDateFormat(DateTimeFormatter dateTimeFormatter)
@@ -492,7 +493,7 @@ public UriTemplate withDefaultDateFormat(DateFormat dateFormat)
             throw new IllegalArgumentException(
             "The only supported subclass of java.text.DateFormat is java.text.SimpleDateFormat");
         }
-        defaultDateTimeFormatter = DateTimeFormat.forPattern(((SimpleDateFormat) dateFormat).toPattern());
+        defaultDateTimeFormatter = DateTimeFormatter.ofPattern(((SimpleDateFormat) dateFormat).toPattern());
         return this;
     }
 
@@ -678,7 +679,10 @@ else if (varSpec.getModifier() != Modifier.EXPLODE)
                  */
                 if (value instanceof Date)
                 {
-                    value = defaultDateTimeFormatter.print(new DateTime((Date) value));
+                    final Instant instant = ((Date) value).toInstant();
+                    // TODO should we rely on system default zone ID?
+                    final LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+                    value = defaultDateTimeFormatter.format(localDateTime);
                 }
                 /*
                  * The variable value contains a list of values

src/main/java/com/damnhandy/uri/template/UriTemplateBuilder.java

@@ -8,11 +8,10 @@
 import com.damnhandy.uri.template.impl.Operator;
 import com.damnhandy.uri.template.impl.UriTemplateParser;
 import com.damnhandy.uri.template.impl.VarSpec;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Map;
@@ -92,7 +91,7 @@ public final class UriTemplateBuilder
      */
     public UriTemplateBuilder withDefaultDateFormat(String dateFormatString)
     {
-        return this.withDefaultDateFormat(DateTimeFormat.forPattern(dateFormatString));
+        return this.withDefaultDateFormat(DateTimeFormatter.ofPattern(dateFormatString));
     }
 
     private UriTemplateBuilder withDefaultDateFormat(DateTimeFormatter dateTimeFormatter)
@@ -115,7 +114,7 @@ public UriTemplateBuilder withDefaultDateFormat(DateFormat dateFormat)
             throw new IllegalArgumentException(
             "The only supported subclass of java.text.DateFormat is java.text.SimpleDateFormat");
         }
-        defaultDateTimeFormatter = DateTimeFormat.forPattern(((SimpleDateFormat) dateFormat).toPattern());
+        defaultDateTimeFormatter = DateTimeFormatter.ofPattern(((SimpleDateFormat) dateFormat).toPattern());
         return this;
     }