Merge pull request #41 from oracle/release_2018-02-09

Releasing version 1.2.27

Author: benthamc

CHANGELOG.md

@@ -13,10 +13,22 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 - N/A
 
+## 1.2.27 - 2018-02-08
+
+### Fixed
+- Bug fix for not serializing dates in request bodies correctly to RFC-3339
+
+### Added
+- Support for DNS Service. An example of calling this service is available [here](https://github.com/oracle/oci-java-sdk/blob/master/bmc-examples/src/main/java/DnsExample.java)
+- Support for Reserved Public IPs in Virtual Networking Service
+- Support for path route sets in Load Balancing Service
+- Support for automated and policy-based backups, read-only volume attachments, and incremental backups in Block Storage Service
+- Support for filtering by backupId in ListDbSystems operation in Database Service
+
 ## 1.2.23 - 2018-01-29
 
 ### Fixed
-* Javadoc for the Object Storage Service is being generated again
+- Javadoc for the Object Storage Service is being generated again
 
 ## 1.2.22 - 2018-01-25
 

bmc-audit/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.2.23</version>
+    <version>1.2.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.2.23</version>
+      <version>1.2.27</version>
     </dependency>
   </dependencies>
 

bmc-bom/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.2.23</version>
+    <version>1.2.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-common</artifactId>
-        <version>1.2.23</version>
+        <version>1.2.27</version>
         <optional>false</optional>
       </dependency>
 
@@ -33,37 +33,43 @@
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-audit</artifactId>
-        <version>1.2.23</version>
+        <version>1.2.27</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-core</artifactId>
-        <version>1.2.23</version>
+        <version>1.2.27</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-database</artifactId>
-        <version>1.2.23</version>
+        <version>1.2.27</version>
+        <optional>false</optional>
+      </dependency>
+      <dependency>
+        <groupId>com.oracle.oci.sdk</groupId>
+        <artifactId>oci-java-sdk-dns</artifactId>
+        <version>1.2.27</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-identity</artifactId>
-        <version>1.2.23</version>
+        <version>1.2.27</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-loadbalancer</artifactId>
-        <version>1.2.23</version>
+        <version>1.2.27</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-objectstorage</artifactId>
-        <version>1.2.23</version>
+        <version>1.2.27</version>
         <optional>false</optional>
       </dependency>
     </dependencies>

bmc-common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.2.23</version>
+    <version>1.2.27</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java

@@ -3,10 +3,12 @@
  */
 package com.oracle.bmc.http.internal;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -25,19 +27,20 @@ public class HttpDateUtils {
     private static final TimeZone TIMEZONE_GMT = TimeZone.getTimeZone("GMT");
     private static final Date AMBIGUOUS_YEAR_TWO_DIGIT_YEAR_START;
 
-    private static final ThreadLocal<List<SimpleDateFormat>> RFC2616_DATE_FORMATS =
-            new ThreadLocal<List<SimpleDateFormat>>() {
+    private static final ThreadLocal<List<DateFormat>> RFC2616_DATE_FORMATS =
+            new ThreadLocal<List<DateFormat>>() {
                 @Override
-                protected synchronized List<SimpleDateFormat> initialValue() {
+                protected synchronized List<DateFormat> initialValue() {
                     return createRfc2616DateFormats();
                 }
             };
 
-    private static final ThreadLocal<List<SimpleDateFormat>> RFC3339_DATE_FORMATS =
-            new ThreadLocal<List<SimpleDateFormat>>() {
+    private static final ThreadLocal<List<DateFormat>> RFC3339_DATE_FORMATS =
+            new ThreadLocal<List<DateFormat>>() {
                 @Override
-                protected synchronized List<SimpleDateFormat> initialValue() {
-                    return createRfc3339DateFormats();
+                protected List<DateFormat> initialValue() {
+                    DateFormat format = new RFC3339DateFormat();
+                    return Collections.singletonList(format);
                 }
             };
 
@@ -49,8 +52,8 @@ protected synchronized List<SimpleDateFormat> initialValue() {
         AMBIGUOUS_YEAR_TWO_DIGIT_YEAR_START = calendar.getTime();
     }
 
-    private static List<SimpleDateFormat> createRfc2616DateFormats() {
-        List<SimpleDateFormat> dateFormats = new ArrayList<>();
+    private static List<DateFormat> createRfc2616DateFormats() {
+        List<DateFormat> dateFormats = new ArrayList<>();
 
         // rfc 1123
         dateFormats.add(new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US));
@@ -67,22 +70,8 @@ private static List<SimpleDateFormat> createRfc2616DateFormats() {
         return dateFormats;
     }
 
-    private static List<SimpleDateFormat> createRfc3339DateFormats() {
-        List<SimpleDateFormat> dateFormats = new ArrayList<>();
-
-        // 'date-time' format
-        dateFormats.add(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"));
-        // 'date-time' with millis format
-        dateFormats.add(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"));
-        // 'full-date' format
-        dateFormats.add(new SimpleDateFormat("yyyy-MM-dd"));
-
-        init(dateFormats);
-        return dateFormats;
-    }
-
-    private static void init(List<SimpleDateFormat> formats) {
-        for (SimpleDateFormat format : formats) {
+    private static void init(List<DateFormat> formats) {
+        for (DateFormat format : formats) {
             format.setTimeZone(TIMEZONE_GMT);
         }
     }
@@ -119,23 +108,21 @@ static Date parse(String headerName, String value) {
     }
 
     /**
-     * Format the given date into Swagger date-time format.
+     * Format the given date into Swagger RFC3339 date-time format.
      *
      * @param date
      *            The date to format.
      * @return The formatted date.
      */
     public static String format(Date date) {
-        final SimpleDateFormat format =
-                (date.getTime() % 1000 == 0)
-                        ? new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
-                        : new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'");
-        format.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return format.format(date);
+        // for backwards compatibility, if there are no millis, do not
+        // include them in the string.
+        boolean includeMillis = date.getTime() % 1000 != 0;
+        return RFC3339DateFormat.formatRfc3339(date, includeMillis);
     }
 
-    private static Date tryParse(String date, List<SimpleDateFormat> formats) {
-        for (final SimpleDateFormat format : formats) {
+    private static Date tryParse(String date, List<DateFormat> formats) {
+        for (final DateFormat format : formats) {
             try {
                 Date result = format.parse(date);
                 // parse can modify TZ, reset it

bmc-common/src/main/java/com/oracle/bmc/http/internal/RFC3339DateFormat.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.http.internal;
+
+import java.text.FieldPosition;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.util.ISO8601Utils;
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+/**
+ * Swagger uses RFC3339 formats for date.  By default, Jackson's StdDateFormatter
+ * will use a format that is not exactly compatible (ex, uses hour offsets instead of 'Z').
+ * <p>
+ * Leave deserialization alone, only take over serialization.
+ */
+@NoArgsConstructor(access = AccessLevel.PACKAGE)
+@SuppressWarnings({"deprecation", "serial"})
+public class RFC3339DateFormat extends StdDateFormat {
+    @Override
+    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+        // Same as ISO8601DateFormat but we always serialize millis
+        toAppendTo.append(formatRfc3339(date, true));
+        return toAppendTo;
+    }
+
+    public static String formatRfc3339(Date date, boolean includeMillis) {
+        return ISO8601Utils.format(date, includeMillis);
+    }
+
+    @Override
+    public RFC3339DateFormat clone() {
+        return new RFC3339DateFormat();
+    }
+}

bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java

@@ -38,9 +38,11 @@ public class RestClientFactory {
         // Our default object mapper will ignore unknown properties when
         // deserializing results
         DEFAULT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        // Serialize Date instances using com.fasterxml.jackson.databind.util.StdDateFormat,
-        // which corresponds to format string of "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+        // Serialize Date instances using the DateFormat we specify, do not serialize into
+        // timestamps.
         DEFAULT_MAPPER.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        // set explicit formatter that will serialize correctly
+        DEFAULT_MAPPER.setDateFormat(new RFC3339DateFormat());
 
         FilterProvider filters =
                 new SimpleFilterProvider()

bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java

@@ -40,9 +40,9 @@ public static RestClientFactoryBuilder builder() {
      */
     public RestClientFactoryBuilder defaultConfigurator(ClientConfigurator defaultConfigurator) {
         if (defaultConfigurator != null) {
-            defaultConfigurator = defaultConfigurator;
+            this.defaultConfigurator = defaultConfigurator;
         } else {
-            defaultConfigurator = DEFAULT_CONFIGURATOR;
+            this.defaultConfigurator = DEFAULT_CONFIGURATOR;
         }
         return this;
     }

bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java

@@ -246,8 +246,9 @@ private Map<String, String> calculateMissingHeaders(
 
         boolean isPost = httpMethod.equals("post");
         boolean isPut = httpMethod.equals("put");
+        boolean isPatch = httpMethod.equals("patch");
         // for post and put, also verify the presence of content headers
-        if (!(isPut || isPost)) {
+        if (!(isPut || isPost || isPatch)) {
             // Asking to sign a body on GET/DELETE/HEAD is not allowed
             if (body != null) {
                 throw new RuntimeException("MUST NOT send body on non-POST/PUT request");
@@ -259,7 +260,7 @@ private Map<String, String> calculateMissingHeaders(
 
         // the one exception for the below is when doing a PUT if the body is an InputStream
         // and the configuration allows it to be skipped
-        if (isPut) {
+        if (isPut || isPatch) {
             if (body instanceof InputStream) {
                 if (signingConfiguration.skipContentHeadersForStreamingPutRequests) {
                     return missingHeaders;

bmc-common/src/test/java/com/oracle/bmc/http/internal/HttpDateUtilsTest.java

@@ -36,7 +36,7 @@ public void lastModifiedHeader_ansiC() {
 
     @Test
     public void otherDateHeader_rfc3339_dateTime_withMillis_utc() {
-        Date date = HttpDateUtils.parse("other-date", "1985-04-12T23:20:50.52Z");
+        Date date = HttpDateUtils.parse("other-date", "1985-04-12T23:20:50.052Z");
         assertEquals(482196050052L, date.getTime());
     }
 
@@ -74,6 +74,6 @@ public void format_rfc3339_nonZeroMillis() {
         cal.set(1985, 3, 12, 23, 20, 50);
         cal.set(Calendar.MILLISECOND, 52);
         Date date = cal.getTime();
-        assertEquals("1985-04-12T23:20:50.52Z", HttpDateUtils.format(date));
+        assertEquals("1985-04-12T23:20:50.052Z", HttpDateUtils.format(date));
     }
 }