Releasing version 1.5.9

Releasing version 1.5.9

Author: dshelbyo

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
+## 1.5.9 - 2019-06-11
+### Added
+- Support for specifying custom boot volume sizes on instance configurations in the Compute Autoscaling service
+- Support for 'Autonomous Transaction Processing - Dedicated' features, as well as maintenance run and backup operations on autonomous databases, autonomous container databases, and autonomous Exadata infrastructure in the Database service
+- Support for retries in the Java SDK. An example of how to do this is available [here](https://github.com/oracle/oci-java-sdk/blob/master/bmc-examples/src/main/java/RetryExample.java)
+
+### Fixed
+- Non-buffered responses are now closed to fix connection leaks
+
 ## 1.5.8 - 2019-06-04
 ### Added
 - Support for autoscaling autonomous databases and autonomous data warehouses in the Database service

bmc-addons/bmc-apache-connector-provider/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk-addons</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.5.8</version>
+      <version>1.5.9</version>
     </dependency>
   </dependencies>
 </project>

bmc-addons/bmc-apache-connector-provider/src/main/java/com/oracle/bmc/http/ApacheConnectionPoolingClientConfigDecorator.java

@@ -24,13 +24,25 @@
 @Slf4j
 public class ApacheConnectionPoolingClientConfigDecorator implements ClientConfigDecorator {
     private final ApacheConnectionPoolConfig config;
+    private PoolingHttpClientConnectionManager poolConnectionManager;
 
     /** Creates a new {@code ApacheConnectionPoolingClientConfigDecorator} object. */
     public ApacheConnectionPoolingClientConfigDecorator(
             @NonNull final ApacheConnectionPoolConfig config) {
         this.config = config;
     }
 
+    /**
+     * Gets the underlying {@code PoolingHttpClientConnectionManager} for the
+     * {@code ApacheConnectionPoolingClientConfigDecorator}.  If the client has yet to be initialized and configured,
+     * then the {@code PoolingHttpClientConnectionManager} can be {@code null}.
+     *
+     * @return the configured PoolingHttpClientConnectionManager
+     */
+    public PoolingHttpClientConnectionManager getPoolingHttpClientConnectionManager() {
+        return poolConnectionManager;
+    }
+
     @Override
     public void customizeClientConfig(ClientConfig clientConfig) {
         Validate.notNull(clientConfig, "ClientConfig must not be null");
@@ -47,13 +59,13 @@ public void customizeClientConfig(ClientConfig clientConfig) {
         LOG.info("ApacheConnectionPoolConfig: {}", config);
 
         final Pair<Integer, TimeUnit> ttl = config.getTtl();
-        final PoolingHttpClientConnectionManager connectionManager =
+        poolConnectionManager =
                 (ttl != null)
                         ? new PoolingHttpClientConnectionManager(ttl.getLeft(), ttl.getRight())
                         : new PoolingHttpClientConnectionManager();
-        connectionManager.setMaxTotal(config.getTotalOpenConnections());
-        connectionManager.setDefaultMaxPerRoute(config.getDefaultMaxConnectionsPerRoute());
+        poolConnectionManager.setMaxTotal(config.getTotalOpenConnections());
+        poolConnectionManager.setDefaultMaxPerRoute(config.getDefaultMaxConnectionsPerRoute());
 
-        clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connectionManager);
+        clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, poolConnectionManager);
     }
 }

bmc-addons/bmc-resteasy-client-configurator/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk-addons</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -14,31 +14,29 @@
   <description>This project adds support for the RestEasyClientConfigurator for the Java SDK</description>
   <url>https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm</url>
 
+  <properties>
+    <resteasy.version>3.6.3.Final</resteasy.version>
+  </properties>
+
 
   <dependencies>
     <!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-client -->
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-client</artifactId>
-      <version>3.1.2.Final</version>
+      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
-      <version>3.1.2.Final</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>jaxrs-api</artifactId>
-      <version>3.0.12.Final</version>
+      <version>${resteasy.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.5.8</version>
+      <version>1.5.9</version>
     </dependency>
   </dependencies>
 </project>

bmc-addons/pom.xml

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

bmc-announcementsservice/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>oci-java-sdk-announcementsservice</artifactId>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.5.8</version>
+      <version>1.5.9</version>
     </dependency>
   </dependencies>
 </project>

bmc-announcementsservice/src/main/java/com/oracle/bmc/announcementsservice/AnnouncementClient.java

@@ -28,6 +28,8 @@ public class AnnouncementClient implements Announcement {
     private final com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider
             authenticationDetailsProvider;
 
+    private final com.oracle.bmc.retrier.RetryConfiguration retryConfiguration;
+
     /**
      * Creates a new service instance using the given authentication provider.
      * @param authenticationDetailsProvider The authentication details provider, required.
@@ -194,7 +196,15 @@ public AnnouncementClient(
                                 .createRequestSigner(SERVICE, authenticationDetailsProvider));
             }
         }
-        this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration);
+
+        final com.oracle.bmc.ClientConfiguration clientConfigurationToUse =
+                (configuration != null)
+                        ? configuration
+                        : com.oracle.bmc.ClientConfiguration.builder().build();
+        this.retryConfiguration = clientConfigurationToUse.getRetryConfiguration();
+        this.client =
+                restClientFactory.create(
+                        defaultRequestSigner, requestSigners, clientConfigurationToUse);
 
         if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) {
             com.oracle.bmc.auth.RegionProvider provider =
@@ -294,117 +304,120 @@ public void close() {
     @Override
     public GetAnnouncementResponse getAnnouncement(GetAnnouncementRequest request) {
         LOG.trace("Called getAnnouncement");
-        request = GetAnnouncementConverter.interceptRequest(request);
+        final GetAnnouncementRequest interceptedRequest =
+                GetAnnouncementConverter.interceptRequest(request);
         com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
-                GetAnnouncementConverter.fromRequest(client, request);
+                GetAnnouncementConverter.fromRequest(client, interceptedRequest);
         com.google.common.base.Function<javax.ws.rs.core.Response, GetAnnouncementResponse>
                 transformer = GetAnnouncementConverter.fromResponse();
 
-        int attempts = 0;
-        while (true) {
-            try {
-                javax.ws.rs.core.Response response = client.get(ib, request);
-                return transformer.apply(response);
-            } catch (com.oracle.bmc.model.BmcException e) {
-                if (++attempts < MAX_IMMEDIATE_RETRIES_IF_USING_INSTANCE_PRINCIPALS
-                        && canRetryRequestIfRefreshableAuthTokenUsed(e)) {
-                    continue;
-                } else {
-                    throw e;
-                }
-            }
-        }
+        final com.oracle.bmc.retrier.BmcGenericRetrier retrier =
+                com.oracle.bmc.retrier.Retriers.createPreferredRetrier(
+                        interceptedRequest.getRetryConfiguration(), retryConfiguration);
+        return retrier.execute(
+                interceptedRequest,
+                retryRequest -> {
+                    final com.oracle.bmc.retrier.TokenRefreshRetrier tokenRefreshRetrier =
+                            new com.oracle.bmc.retrier.TokenRefreshRetrier(
+                                    authenticationDetailsProvider);
+                    return tokenRefreshRetrier.execute(
+                            retryRequest,
+                            retriedRequest -> {
+                                javax.ws.rs.core.Response response = client.get(ib, retriedRequest);
+                                return transformer.apply(response);
+                            });
+                });
     }
 
     @Override
     public GetAnnouncementUserStatusResponse getAnnouncementUserStatus(
             GetAnnouncementUserStatusRequest request) {
         LOG.trace("Called getAnnouncementUserStatus");
-        request = GetAnnouncementUserStatusConverter.interceptRequest(request);
+        final GetAnnouncementUserStatusRequest interceptedRequest =
+                GetAnnouncementUserStatusConverter.interceptRequest(request);
         com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
-                GetAnnouncementUserStatusConverter.fromRequest(client, request);
+                GetAnnouncementUserStatusConverter.fromRequest(client, interceptedRequest);
         com.google.common.base.Function<
                         javax.ws.rs.core.Response, GetAnnouncementUserStatusResponse>
                 transformer = GetAnnouncementUserStatusConverter.fromResponse();
 
-        int attempts = 0;
-        while (true) {
-            try {
-                javax.ws.rs.core.Response response = client.get(ib, request);
-                return transformer.apply(response);
-            } catch (com.oracle.bmc.model.BmcException e) {
-                if (++attempts < MAX_IMMEDIATE_RETRIES_IF_USING_INSTANCE_PRINCIPALS
-                        && canRetryRequestIfRefreshableAuthTokenUsed(e)) {
-                    continue;
-                } else {
-                    throw e;
-                }
-            }
-        }
+        final com.oracle.bmc.retrier.BmcGenericRetrier retrier =
+                com.oracle.bmc.retrier.Retriers.createPreferredRetrier(
+                        interceptedRequest.getRetryConfiguration(), retryConfiguration);
+        return retrier.execute(
+                interceptedRequest,
+                retryRequest -> {
+                    final com.oracle.bmc.retrier.TokenRefreshRetrier tokenRefreshRetrier =
+                            new com.oracle.bmc.retrier.TokenRefreshRetrier(
+                                    authenticationDetailsProvider);
+                    return tokenRefreshRetrier.execute(
+                            retryRequest,
+                            retriedRequest -> {
+                                javax.ws.rs.core.Response response = client.get(ib, retriedRequest);
+                                return transformer.apply(response);
+                            });
+                });
     }
 
     @Override
     public ListAnnouncementsResponse listAnnouncements(ListAnnouncementsRequest request) {
         LOG.trace("Called listAnnouncements");
-        request = ListAnnouncementsConverter.interceptRequest(request);
+        final ListAnnouncementsRequest interceptedRequest =
+                ListAnnouncementsConverter.interceptRequest(request);
         com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
-                ListAnnouncementsConverter.fromRequest(client, request);
+                ListAnnouncementsConverter.fromRequest(client, interceptedRequest);
         com.google.common.base.Function<javax.ws.rs.core.Response, ListAnnouncementsResponse>
                 transformer = ListAnnouncementsConverter.fromResponse();
 
-        int attempts = 0;
-        while (true) {
-            try {
-                javax.ws.rs.core.Response response = client.get(ib, request);
-                return transformer.apply(response);
-            } catch (com.oracle.bmc.model.BmcException e) {
-                if (++attempts < MAX_IMMEDIATE_RETRIES_IF_USING_INSTANCE_PRINCIPALS
-                        && canRetryRequestIfRefreshableAuthTokenUsed(e)) {
-                    continue;
-                } else {
-                    throw e;
-                }
-            }
-        }
+        final com.oracle.bmc.retrier.BmcGenericRetrier retrier =
+                com.oracle.bmc.retrier.Retriers.createPreferredRetrier(
+                        interceptedRequest.getRetryConfiguration(), retryConfiguration);
+        return retrier.execute(
+                interceptedRequest,
+                retryRequest -> {
+                    final com.oracle.bmc.retrier.TokenRefreshRetrier tokenRefreshRetrier =
+                            new com.oracle.bmc.retrier.TokenRefreshRetrier(
+                                    authenticationDetailsProvider);
+                    return tokenRefreshRetrier.execute(
+                            retryRequest,
+                            retriedRequest -> {
+                                javax.ws.rs.core.Response response = client.get(ib, retriedRequest);
+                                return transformer.apply(response);
+                            });
+                });
     }
 
     @Override
     public UpdateAnnouncementUserStatusResponse updateAnnouncementUserStatus(
             UpdateAnnouncementUserStatusRequest request) {
         LOG.trace("Called updateAnnouncementUserStatus");
-        request = UpdateAnnouncementUserStatusConverter.interceptRequest(request);
+        final UpdateAnnouncementUserStatusRequest interceptedRequest =
+                UpdateAnnouncementUserStatusConverter.interceptRequest(request);
         com.oracle.bmc.http.internal.WrappedInvocationBuilder ib =
-                UpdateAnnouncementUserStatusConverter.fromRequest(client, request);
+                UpdateAnnouncementUserStatusConverter.fromRequest(client, interceptedRequest);
         com.google.common.base.Function<
                         javax.ws.rs.core.Response, UpdateAnnouncementUserStatusResponse>
                 transformer = UpdateAnnouncementUserStatusConverter.fromResponse();
 
-        int attempts = 0;
-        while (true) {
-            try {
-                javax.ws.rs.core.Response response =
-                        client.put(ib, request.getStatusDetails(), request);
-                return transformer.apply(response);
-            } catch (com.oracle.bmc.model.BmcException e) {
-                if (++attempts < MAX_IMMEDIATE_RETRIES_IF_USING_INSTANCE_PRINCIPALS
-                        && canRetryRequestIfRefreshableAuthTokenUsed(e)) {
-                    continue;
-                } else {
-                    throw e;
-                }
-            }
-        }
-    }
-
-    private boolean canRetryRequestIfRefreshableAuthTokenUsed(com.oracle.bmc.model.BmcException e) {
-        if (e.getStatusCode() == 401
-                && this.authenticationDetailsProvider
-                        instanceof com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) {
-            ((com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider)
-                            this.authenticationDetailsProvider)
-                    .refresh();
-            return true;
-        }
-        return false;
+        final com.oracle.bmc.retrier.BmcGenericRetrier retrier =
+                com.oracle.bmc.retrier.Retriers.createPreferredRetrier(
+                        interceptedRequest.getRetryConfiguration(), retryConfiguration);
+        return retrier.execute(
+                interceptedRequest,
+                retryRequest -> {
+                    final com.oracle.bmc.retrier.TokenRefreshRetrier tokenRefreshRetrier =
+                            new com.oracle.bmc.retrier.TokenRefreshRetrier(
+                                    authenticationDetailsProvider);
+                    return tokenRefreshRetrier.execute(
+                            retryRequest,
+                            retriedRequest -> {
+                                javax.ws.rs.core.Response response =
+                                        client.put(
+                                                ib,
+                                                retriedRequest.getStatusDetails(),
+                                                retriedRequest);
+                                return transformer.apply(response);
+                            });
+                });
     }
 }

bmc-announcementsservice/src/main/java/com/oracle/bmc/announcementsservice/internal/http/GetAnnouncementConverter.java

@@ -3,6 +3,7 @@
  */
 package com.oracle.bmc.announcementsservice.internal.http;
 
+import com.oracle.bmc.http.internal.ResponseHelper;
 import com.oracle.bmc.announcementsservice.model.*;
 import com.oracle.bmc.announcementsservice.requests.*;
 import com.oracle.bmc.announcementsservice.responses.*;
@@ -87,6 +88,7 @@ public GetAnnouncementResponse apply(
 
                                 GetAnnouncementResponse responseWrapper = builder.build();
 
+                                ResponseHelper.closeResponseSilentlyIfNotBuffered(rawResponse);
                                 return responseWrapper;
                             }
                         };