Merge pull request #75 from oracle/release_2018-08-23

Releasing version 1.2.45

Author: sumitkdey

CHANGELOG.md

@@ -13,6 +13,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 - N/A
 
+## 1.2.45 - 2018-08-23
+### Added
+- Support for fault domains in the Identity service
+- Support for Autonomous Data Warehouse and Autonomous Transaction Processing in the Database service
+- Support for resizing an offline volume in the Block Storage service
+
 ## 1.2.44 - 2018-08-09
 ### Added
 - Support for fault domains in the Compute service

bmc-addons/bmc-apache-connector-provider/README.md

@@ -6,10 +6,10 @@ The oci-java-sdk-addons-apache is an optional add-on to the OCI Java SDK.  It le
 
 The add-on provides two features:
 
-* **Connection pooling**. A detailed explantation can be found [here](https://hc.apache.org/httpcomponents-client-ga/tutorial/html/connmgmt.html)
+* **Connection pooling**. A detailed explanation can be found [here](https://hc.apache.org/httpcomponents-client-ga/tutorial/html/connmgmt.html)
 * **HTTP(S) proxy support**.
 
-Note: The `ApacheConnectorProvider` buffers requests into memory and can impact memory utilization of your application.  This increased use of memory is especially relavent when using`ObjectStorageClient` to upload large objects to the Object Storage service.
+Note: The `ApacheConnectorProvider` buffers requests into memory and can impact memory utilization of your application.  This increased use of memory is especially relevant when using`ObjectStorageClient` to upload large objects to the Object Storage service.
 
 ## Installation
 1. The OCI Java SDK must be installed and configured before installing the add-on.  See [the documentation](https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm) for details.

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.2.44</version>
+    <version>1.2.45</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.2.44</version>
+      <version>1.2.45</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.2.44</version>
+    <version>1.2.45</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

bmc-audit/pom.xml

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

bmc-bom/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.2.44</version>
+    <version>1.2.45</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>oci-java-sdk-bom</artifactId>
@@ -19,82 +19,82 @@
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-common</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <!-- Service modules, alpha sorted -->
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-audit</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-containerengine</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-core</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-database</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-dns</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-email</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-filestorage</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-identity</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-loadbalancer</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-objectstorage</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
         <optional>false</optional>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-resourcesearch</artifactId>
         <optional>false</optional>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <optional>false</optional>
         <artifactId>oci-java-sdk-addons-apache</artifactId>
-        <version>1.2.44</version>
+        <version>1.2.45</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

bmc-common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.2.44</version>
+    <version>1.2.45</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -15,10 +15,7 @@
   <url>https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm</url>
 
   <properties>
-    <!-- To allow for encrypted PEM (PBKDF-OpenSSL), we need to use a version before 1.53. >= 1.53 introduced 
-      a breaking change. http://bouncy-castle.1462172.n4.nabble.com/Issues-when-migrating-to-1-53-td4657955.html 
-      https://github.com/box/box-java-sdk/issues/168 Has not been fixed as of 1.55. -->
-    <bouncycastle.version>1.52</bouncycastle.version>
+    <bouncycastle.version>1.60</bouncycastle.version>
   </properties>
 
   <build>

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

@@ -12,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
 import javax.ws.rs.ProcessingException;
@@ -151,7 +152,9 @@ private Object attemptToSerialize(@Nullable Object body) {
         try {
             return (body instanceof String || body instanceof InputStream)
                     ? body
-                    : RestClientFactory.getObjectMapper().writeValueAsString(body);
+                    : (body != null)
+                            ? RestClientFactory.getObjectMapper().writeValueAsString(body)
+                            : StringUtils.EMPTY;
         } catch (JsonProcessingException e) {
             throw new IllegalArgumentException("Unable to process JSON body", e);
         }

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

@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.http.signing.internal;
+
+import com.google.common.base.Throwables;
+import lombok.extern.slf4j.Slf4j;
+
+import java.security.Provider;
+import java.security.Security;
+
+@Slf4j
+class BouncyCastleHelper {
+    private final boolean isProviderInstalled;
+    private final Provider bouncyCastleProvider;
+
+    private BouncyCastleHelper() {
+        isProviderInstalled =
+                Security.getProvider("BC") != null || Security.getProvider("BCFIPS") != null;
+        try {
+            bouncyCastleProvider = (Provider) getBouncyCastleProviderClass().newInstance();
+        } catch (InstantiationException | IllegalAccessException ex) {
+            LOG.error("Failed to instantiate provider", ex);
+            throw Throwables.propagate(ex);
+        }
+    }
+
+    private static class Holder {
+        private static final BouncyCastleHelper INSTANCE = new BouncyCastleHelper();
+    }
+
+    static BouncyCastleHelper getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    boolean isProviderInstalled() {
+        return isProviderInstalled;
+    }
+
+    Provider getBouncyCastleProvider() {
+        return bouncyCastleProvider;
+    }
+
+    private static Class getBouncyCastleProviderClass() {
+        LOG.debug("Trying to get BouncyCastleProvider");
+        try {
+            return Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
+        } catch (ClassNotFoundException e) {
+            LOG.info("Did not find BouncyCastleProvider");
+        }
+
+        LOG.debug("Trying to get BouncyCastleFipsProvider");
+        try {
+            return Class.forName("org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider");
+        } catch (ClassNotFoundException e) {
+            LOG.info("Did not find BouncyCastleFipsProvider");
+        }
+
+        throw new IllegalStateException("No matching BouncyCastle provider found.");
+    }
+}

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

@@ -6,6 +6,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.security.Provider;
+import java.security.Security;
 import java.security.interfaces.RSAPrivateKey;
 
 import javax.annotation.Nonnull;
@@ -72,8 +74,22 @@ public PEMFileRSAPrivateKeySupplier(
                     Preconditions.checkNotNull(
                             passphraseCharacters, "The provided private key requires a passphrase");
 
+                    JcePEMDecryptorProviderBuilder decryptorProviderBuilder =
+                            new JcePEMDecryptorProviderBuilder();
+
+                    // If either of BouncyCastle or BouncyCastleFIPS provider is installed, then irrespective of the
+                    // version of the library used, decryption of passphrase protected PEM files are supported. Else,
+                    // for versions of BouncyCastle > 1.52 (or BC-FIPS), need to add the provider to be able to read
+                    // passphrase protected PEM files. Adding the provider to the PEMDecryptorProvider instead of
+                    // modifying the application's security environment (by calling Security.addProvider) to maintain
+                    // backward compatibility. Details at https://github.com/bcgit/bc-java/issues/156
+                    if (!BouncyCastleHelper.getInstance().isProviderInstalled()) {
+                        decryptorProviderBuilder.setProvider(
+                                BouncyCastleHelper.getInstance().getBouncyCastleProvider());
+                    }
+
                     PEMDecryptorProvider decProv =
-                            new JcePEMDecryptorProviderBuilder().build(passphraseCharacters);
+                            decryptorProviderBuilder.build(passphraseCharacters);
                     try {
                         keyInfo =
                                 ((PEMEncryptedKeyPair) object)