Merge pull request #27 from oracle/release_20171012

Releasing version 1.2.16

Author: mricken

CHANGELOG.md

@@ -13,6 +13,23 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 - N/A
 
+## 1.2.16 - 2017-10-12
+
+### Changed
+- Removed javax.validation.constraints annotations from model classes. The annotations were not used, and may not necessarily be the same as the constraints enforced by the services.
+- The clients only serialize and transmit fields that were explicitly set. If you want to transmit a field that is `null`, please set it to `null` explicitly.
+
+### Added
+- Support for database as a service (DBaaS)
+- Support for VNIC routes and source/destination check
+- Support for specifying block volume size in GB
+- Support for updating console history metadata and specifying a display name when capturing console history
+- Support for FRA Region (eu-frankfurt-1)
+- Exceptions expose client-side request id in cases of timeout or client-side failure
+
+### Deprecated
+- Passing the block volume size in MB is deprecated
+
 ## 1.2.15 - 2017-09-11
 
 ### Changed

bmc-audit/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.2.15</version>
+    <version>1.2.16</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.15</version>
+      <version>1.2.16</version>
     </dependency>
   </dependencies>
 

bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java

@@ -123,7 +123,8 @@ public java.util.concurrent.Future<ListEventsResponse> listEvents(
             com.oracle.bmc.responses.AsyncHandler<ListEventsRequest, ListEventsResponse> handler) {
         LOG.trace("Called async listEvents");
         request = ListEventsConverter.interceptRequest(request);
-        javax.ws.rs.client.Invocation.Builder ib = ListEventsConverter.fromRequest(client, request);
+        com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
+                ListEventsConverter.fromRequest(client, request);
         com.google.common.base.Function<javax.ws.rs.core.Response, ListEventsResponse> transformer =
                 ListEventsConverter.fromResponse();
 

bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java

@@ -121,7 +121,8 @@ public void close() {
     public ListEventsResponse listEvents(ListEventsRequest request) {
         LOG.trace("Called listEvents");
         request = ListEventsConverter.interceptRequest(request);
-        javax.ws.rs.client.Invocation.Builder ib = ListEventsConverter.fromRequest(client, request);
+        com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
+                ListEventsConverter.fromRequest(client, request);
         com.google.common.base.Function<javax.ws.rs.core.Response, ListEventsResponse> transformer =
                 ListEventsConverter.fromResponse();
 

bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java

@@ -19,7 +19,7 @@ public static ListEventsRequest interceptRequest(ListEventsRequest request) {
         return request;
     }
 
-    public static javax.ws.rs.client.Invocation.Builder fromRequest(
+    public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest(
             com.oracle.bmc.http.internal.RestClient client, ListEventsRequest request) {
         if (request == null) {
             throw new NullPointerException("request instance is required");
@@ -37,7 +37,7 @@ public static javax.ws.rs.client.Invocation.Builder fromRequest(
             throw new NullPointerException("endTime is required");
         }
 
-        javax.ws.rs.client.WebTarget target =
+        com.oracle.bmc.http.internal.WrappedWebTarget target =
                 client.getBaseTarget().path("/20160918").path("auditEvents");
 
         target =
@@ -66,7 +66,7 @@ public static javax.ws.rs.client.Invocation.Builder fromRequest(
                                     request.getPage()));
         }
 
-        javax.ws.rs.client.Invocation.Builder ib = target.request();
+        com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request();
 
         ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON);
 

bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java

@@ -6,85 +6,202 @@
 @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
 @lombok.Value
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = AuditEvent.Builder.class)
+@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME)
 public class AuditEvent {
     @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "")
     @lombok.experimental.Accessors(fluent = true)
-    @lombok.Setter
     public static class Builder {
         @com.fasterxml.jackson.annotation.JsonProperty("tenantId")
         private String tenantId;
 
+        public Builder tenantId(String tenantId) {
+            this.tenantId = tenantId;
+            this.__explicitlySet__.add("tenantId");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("compartmentId")
         private String compartmentId;
 
+        public Builder compartmentId(String compartmentId) {
+            this.compartmentId = compartmentId;
+            this.__explicitlySet__.add("compartmentId");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("eventId")
         private String eventId;
 
+        public Builder eventId(String eventId) {
+            this.eventId = eventId;
+            this.__explicitlySet__.add("eventId");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("eventSource")
         private String eventSource;
 
+        public Builder eventSource(String eventSource) {
+            this.eventSource = eventSource;
+            this.__explicitlySet__.add("eventSource");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("eventType")
         private String eventType;
 
+        public Builder eventType(String eventType) {
+            this.eventType = eventType;
+            this.__explicitlySet__.add("eventType");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("eventTime")
         private java.util.Date eventTime;
 
+        public Builder eventTime(java.util.Date eventTime) {
+            this.eventTime = eventTime;
+            this.__explicitlySet__.add("eventTime");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("principalId")
         private String principalId;
 
+        public Builder principalId(String principalId) {
+            this.principalId = principalId;
+            this.__explicitlySet__.add("principalId");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("credentialId")
         private String credentialId;
 
+        public Builder credentialId(String credentialId) {
+            this.credentialId = credentialId;
+            this.__explicitlySet__.add("credentialId");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("requestAction")
         private String requestAction;
 
+        public Builder requestAction(String requestAction) {
+            this.requestAction = requestAction;
+            this.__explicitlySet__.add("requestAction");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("requestId")
         private String requestId;
 
+        public Builder requestId(String requestId) {
+            this.requestId = requestId;
+            this.__explicitlySet__.add("requestId");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("requestAgent")
         private String requestAgent;
 
+        public Builder requestAgent(String requestAgent) {
+            this.requestAgent = requestAgent;
+            this.__explicitlySet__.add("requestAgent");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("requestHeaders")
         private java.util.Map<String, java.util.List<String>> requestHeaders;
 
+        public Builder requestHeaders(
+                java.util.Map<String, java.util.List<String>> requestHeaders) {
+            this.requestHeaders = requestHeaders;
+            this.__explicitlySet__.add("requestHeaders");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("requestOrigin")
         private String requestOrigin;
 
+        public Builder requestOrigin(String requestOrigin) {
+            this.requestOrigin = requestOrigin;
+            this.__explicitlySet__.add("requestOrigin");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("requestParameters")
         private java.util.Map<String, java.util.List<String>> requestParameters;
 
+        public Builder requestParameters(
+                java.util.Map<String, java.util.List<String>> requestParameters) {
+            this.requestParameters = requestParameters;
+            this.__explicitlySet__.add("requestParameters");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("requestResource")
         private String requestResource;
 
+        public Builder requestResource(String requestResource) {
+            this.requestResource = requestResource;
+            this.__explicitlySet__.add("requestResource");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("responseHeaders")
         private java.util.Map<String, java.util.List<String>> responseHeaders;
 
+        public Builder responseHeaders(
+                java.util.Map<String, java.util.List<String>> responseHeaders) {
+            this.responseHeaders = responseHeaders;
+            this.__explicitlySet__.add("responseHeaders");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("responseStatus")
         private String responseStatus;
 
+        public Builder responseStatus(String responseStatus) {
+            this.responseStatus = responseStatus;
+            this.__explicitlySet__.add("responseStatus");
+            return this;
+        }
+
         @com.fasterxml.jackson.annotation.JsonProperty("responseTime")
         private java.util.Date responseTime;
 
+        public Builder responseTime(java.util.Date responseTime) {
+            this.responseTime = responseTime;
+            this.__explicitlySet__.add("responseTime");
+            return this;
+        }
+
+        @com.fasterxml.jackson.annotation.JsonIgnore
+        private final java.util.Set<String> __explicitlySet__ = new java.util.HashSet<String>();
+
         public AuditEvent build() {
-            return new AuditEvent(
-                    tenantId,
-                    compartmentId,
-                    eventId,
-                    eventSource,
-                    eventType,
-                    eventTime,
-                    principalId,
-                    credentialId,
-                    requestAction,
-                    requestId,
-                    requestAgent,
-                    requestHeaders,
-                    requestOrigin,
-                    requestParameters,
-                    requestResource,
-                    responseHeaders,
-                    responseStatus,
-                    responseTime);
+            AuditEvent __instance__ =
+                    new AuditEvent(
+                            tenantId,
+                            compartmentId,
+                            eventId,
+                            eventSource,
+                            eventType,
+                            eventTime,
+                            principalId,
+                            credentialId,
+                            requestAction,
+                            requestId,
+                            requestAgent,
+                            requestHeaders,
+                            requestOrigin,
+                            requestParameters,
+                            requestResource,
+                            responseHeaders,
+                            responseStatus,
+                            responseTime);
+            __instance__.__explicitlySet__.addAll(__explicitlySet__);
+            return __instance__;
         }
 
         @com.fasterxml.jackson.annotation.JsonIgnore
@@ -121,35 +238,30 @@ public static Builder builder() {
      * The OCID of the tenant.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("tenantId")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String tenantId;
 
     /**
      * The OCID of the compartment.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("compartmentId")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String compartmentId;
 
     /**
      * The GUID of the event.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("eventId")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String eventId;
 
     /**
      * The source of the event.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("eventSource")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String eventSource;
 
     /**
      * The type of the event.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("eventType")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String eventType;
 
     /**
@@ -162,7 +274,6 @@ public static Builder builder() {
      * The OCID of the user whose action triggered the event.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("principalId")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String principalId;
 
     /**
@@ -175,7 +286,6 @@ public static Builder builder() {
      * The HTTP method of the request.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("requestAction")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String requestAction;
 
     /**
@@ -200,7 +310,6 @@ public static Builder builder() {
      * The IP address of the source of the request.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("requestOrigin")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String requestOrigin;
 
     /**
@@ -225,12 +334,14 @@ public static Builder builder() {
      * The status code of the response.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("responseStatus")
-    @javax.validation.constraints.Size(min = 1, max = 255)
     String responseStatus;
 
     /**
      * The time of the response to the audited request, expressed in [RFC 3339](https://tools.ietf.org/html/rfc3339) timestamp format.
      **/
     @com.fasterxml.jackson.annotation.JsonProperty("responseTime")
     java.util.Date responseTime;
+
+    @com.fasterxml.jackson.annotation.JsonIgnore
+    private final java.util.Set<String> __explicitlySet__ = new java.util.HashSet<String>();
 }