oracle · juanalblue · Apr 19, 2018 · Apr 19, 2018
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 - N/A
 
+## 1.2.35 - 2018-04-19
+
+### Fixed
+- Upgraded Jackson to version 2.9.5 to address vulnerability [issue#55](https://github.com/oracle/oci-java-sdk/issues/55)
+- PutObjectRequest does not callback invocationCallback object [issue#58](https://github.com/oracle/oci-java-sdk/issues/58)
+
+### Added
+- Support for tagging DbSystem and Database resources in the Database Service
+- Support for filtering by `dbSystemId` in `listDbVersions` operation in Database Service
+
 ## 1.2.34 - 2018-04-05
 
 ### Fixed

diff --git a/bmc-audit/pom.xml b/bmc-audit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.2.34</version>
+    <version>1.2.35</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.34</version>
+      <version>1.2.35</version>
     </dependency>
   </dependencies>
 

diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java
@@ -70,18 +70,18 @@ public AuditAsyncClient(
      * @param authenticationDetailsProvider The authentication details provider, required.
      * @param configuration The client configuration, optional.
      * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
-     * @param requestSignerFactory The request signer factory used to create the request signer for this service.
+     * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
      */
     public AuditAsyncClient(
             com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
             com.oracle.bmc.ClientConfiguration configuration,
             com.oracle.bmc.http.ClientConfigurator clientConfigurator,
-            com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) {
+            com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) {
         this(
                 authenticationDetailsProvider,
                 configuration,
                 clientConfigurator,
-                requestSignerFactory,
+                defaultRequestSignerFactory,
                 new java.util.ArrayList<com.oracle.bmc.http.ClientConfigurator>());
     }
 
@@ -93,20 +93,20 @@ public AuditAsyncClient(
      * @param authenticationDetailsProvider The authentication details provider, required.
      * @param configuration The client configuration, optional.
      * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
-     * @param requestSignerFactory The request signer factory used to create the request signer for this service.
+     * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
      * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
      */
     public AuditAsyncClient(
             com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
             com.oracle.bmc.ClientConfiguration configuration,
             com.oracle.bmc.http.ClientConfigurator clientConfigurator,
-            com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
+            com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
             java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators) {
         this(
                 authenticationDetailsProvider,
                 configuration,
                 clientConfigurator,
-                requestSignerFactory,
+                defaultRequestSignerFactory,
                 additionalClientConfigurators,
                 null);
     }
@@ -119,15 +119,50 @@ public AuditAsyncClient(
      * @param authenticationDetailsProvider The authentication details provider, required.
      * @param configuration The client configuration, optional.
      * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
-     * @param requestSignerFactory The request signer factory used to create the request signer for this service.
+     * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
      * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
      * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
      */
     public AuditAsyncClient(
             com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
             com.oracle.bmc.ClientConfiguration configuration,
             com.oracle.bmc.http.ClientConfigurator clientConfigurator,
-            com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
+            com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
+            java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
+            String endpoint) {
+        this(
+                authenticationDetailsProvider,
+                configuration,
+                clientConfigurator,
+                defaultRequestSignerFactory,
+                com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory
+                        .createDefaultRequestSignerFactories(),
+                additionalClientConfigurators,
+                endpoint);
+    }
+
+    /**
+     * Creates a new service instance using the given authentication provider and client configuration.  Additionally,
+     * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization.
+     * <p>
+     * This is an advanced constructor for clients that want to take control over how requests are signed.
+     * @param authenticationDetailsProvider The authentication details provider, required.
+     * @param configuration The client configuration, optional.
+     * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
+     * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
+     * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer
+     * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
+     * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
+     */
+    public AuditAsyncClient(
+            com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
+            com.oracle.bmc.ClientConfiguration configuration,
+            com.oracle.bmc.http.ClientConfigurator clientConfigurator,
+            com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
+            java.util.Map<
+                            com.oracle.bmc.http.signing.SigningStrategy,
+                            com.oracle.bmc.http.signing.RequestSignerFactory>
+                    signingStrategyRequestSignerFactories,
             java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
             String endpoint) {
         this.authenticationDetailsProvider = authenticationDetailsProvider;
@@ -136,10 +171,22 @@ public AuditAsyncClient(
                         .clientConfigurator(clientConfigurator)
                         .additionalClientConfigurators(additionalClientConfigurators)
                         .build();
-        com.oracle.bmc.http.signing.RequestSigner requestSigner =
-                requestSignerFactory.createRequestSigner(
+        com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner =
+                defaultRequestSignerFactory.createRequestSigner(
                         SERVICE, this.authenticationDetailsProvider);
-        this.client = restClientFactory.create(requestSigner, configuration);
+        java.util.Map<
+                        com.oracle.bmc.http.signing.SigningStrategy,
+                        com.oracle.bmc.http.signing.RequestSigner>
+                requestSigners = new java.util.HashMap<>();
+        for (com.oracle.bmc.http.signing.SigningStrategy s :
+                com.oracle.bmc.http.signing.SigningStrategy.values()) {
+            requestSigners.put(
+                    s,
+                    signingStrategyRequestSignerFactories
+                            .get(s)
+                            .createRequestSigner(SERVICE, authenticationDetailsProvider));
+        }
+        this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration);
 
         if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) {
             com.oracle.bmc.auth.RegionProvider provider =

diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java
@@ -74,18 +74,18 @@ public AuditClient(
      * @param authenticationDetailsProvider The authentication details provider, required.
      * @param configuration The client configuration, optional.
      * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
-     * @param requestSignerFactory The request signer factory used to create the request signer for this service.
+     * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
      */
     public AuditClient(
             com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
             com.oracle.bmc.ClientConfiguration configuration,
             com.oracle.bmc.http.ClientConfigurator clientConfigurator,
-            com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) {
+            com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) {
         this(
                 authenticationDetailsProvider,
                 configuration,
                 clientConfigurator,
-                requestSignerFactory,
+                defaultRequestSignerFactory,
                 new java.util.ArrayList<com.oracle.bmc.http.ClientConfigurator>());
     }
 
@@ -97,20 +97,20 @@ public AuditClient(
      * @param authenticationDetailsProvider The authentication details provider, required.
      * @param configuration The client configuration, optional.
      * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
-     * @param requestSignerFactory The request signer factory used to create the request signer for this service.
+     * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
      * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
      */
     public AuditClient(
             com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
             com.oracle.bmc.ClientConfiguration configuration,
             com.oracle.bmc.http.ClientConfigurator clientConfigurator,
-            com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
+            com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
             java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators) {
         this(
                 authenticationDetailsProvider,
                 configuration,
                 clientConfigurator,
-                requestSignerFactory,
+                defaultRequestSignerFactory,
                 additionalClientConfigurators,
                 null);
     }
@@ -123,15 +123,50 @@ public AuditClient(
      * @param authenticationDetailsProvider The authentication details provider, required.
      * @param configuration The client configuration, optional.
      * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
-     * @param requestSignerFactory The request signer factory used to create the request signer for this service.
+     * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
      * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
      * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
      */
     public AuditClient(
             com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
             com.oracle.bmc.ClientConfiguration configuration,
             com.oracle.bmc.http.ClientConfigurator clientConfigurator,
-            com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory,
+            com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
+            java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
+            String endpoint) {
+        this(
+                authenticationDetailsProvider,
+                configuration,
+                clientConfigurator,
+                defaultRequestSignerFactory,
+                com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory
+                        .createDefaultRequestSignerFactories(),
+                additionalClientConfigurators,
+                endpoint);
+    }
+
+    /**
+     * Creates a new service instance using the given authentication provider and client configuration.  Additionally,
+     * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization.
+     * <p>
+     * This is an advanced constructor for clients that want to take control over how requests are signed.
+     * @param authenticationDetailsProvider The authentication details provider, required.
+     * @param configuration The client configuration, optional.
+     * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional.
+     * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service.
+     * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer
+     * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator.
+     * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider})
+     */
+    public AuditClient(
+            com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider,
+            com.oracle.bmc.ClientConfiguration configuration,
+            com.oracle.bmc.http.ClientConfigurator clientConfigurator,
+            com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory,
+            java.util.Map<
+                            com.oracle.bmc.http.signing.SigningStrategy,
+                            com.oracle.bmc.http.signing.RequestSignerFactory>
+                    signingStrategyRequestSignerFactories,
             java.util.List<com.oracle.bmc.http.ClientConfigurator> additionalClientConfigurators,
             String endpoint) {
         this.authenticationDetailsProvider = authenticationDetailsProvider;
@@ -140,10 +175,22 @@ public AuditClient(
                         .clientConfigurator(clientConfigurator)
                         .additionalClientConfigurators(additionalClientConfigurators)
                         .build();
-        com.oracle.bmc.http.signing.RequestSigner requestSigner =
-                requestSignerFactory.createRequestSigner(
+        com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner =
+                defaultRequestSignerFactory.createRequestSigner(
                         SERVICE, this.authenticationDetailsProvider);
-        this.client = restClientFactory.create(requestSigner, configuration);
+        java.util.Map<
+                        com.oracle.bmc.http.signing.SigningStrategy,
+                        com.oracle.bmc.http.signing.RequestSigner>
+                requestSigners = new java.util.HashMap<>();
+        for (com.oracle.bmc.http.signing.SigningStrategy s :
+                com.oracle.bmc.http.signing.SigningStrategy.values()) {
+            requestSigners.put(
+                    s,
+                    signingStrategyRequestSignerFactories
+                            .get(s)
+                            .createRequestSigner(SERVICE, authenticationDetailsProvider));
+        }
+        this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration);
 
         this.paginators = new AuditPaginators(this);
 
@@ -201,6 +248,7 @@ public AuditClient build(
                     configuration,
                     clientConfigurator,
                     requestSignerFactory,
+                    signingStrategyRequestSignerFactories,
                     additionalClientConfigurators,
                     endpoint);
         }

diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/GetConfigurationRequest.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/GetConfigurationRequest.java
@@ -37,6 +37,7 @@ public Builder invocationCallback(
          */
         public Builder copy(GetConfigurationRequest o) {
             compartmentId(o.getCompartmentId());
+            invocationCallback(o.getInvocationCallback());
             return this;
         }
 

diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java
@@ -69,6 +69,7 @@ public Builder copy(ListEventsRequest o) {
             endTime(o.getEndTime());
             page(o.getPage());
             opcRequestId(o.getOpcRequestId());
+            invocationCallback(o.getInvocationCallback());
             return this;
         }
 

diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/UpdateConfigurationRequest.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/UpdateConfigurationRequest.java
@@ -43,6 +43,7 @@ public Builder invocationCallback(
         public Builder copy(UpdateConfigurationRequest o) {
             compartmentId(o.getCompartmentId());
             updateConfigurationDetails(o.getUpdateConfigurationDetails());
+            invocationCallback(o.getInvocationCallback());
             return this;
         }