Merge pull request #88 from oracle/release_2018-11-15

Releasing version 1.3.1
oracle · Nov 15, 2018 · b8173d0 · b8173d0
2 parents 21b957b + 75670f7
commit b8173d0
Show file tree

Hide file tree

Showing 62 changed files with 1,069 additions and 166 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 - N/A
 
+## 1.3.1 - 2018-11-15
+### Added
+- Support for VCN transit routing in the Networking service
+
+### Changed
+- Bouncy Castle jar is no longer bundled within the shaded distribution `oci-java-sdk-shaded-full` and now must be included in the CLASSPATH.
+
 ## 1.3.0 - 2018-11-01
 ### Added
 - Support for modifying the route table, DHCP options, and security lists associated with a subnet in the Networking service.

diff --git a/bmc-addons/bmc-apache-connector-provider/pom.xml b/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.3.0</version>
+    <version>1.3.1</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.3.0</version>
+      <version>1.3.1</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/bmc-addons/pom.xml b/bmc-addons/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

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.3.0</version>
+    <version>1.3.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>com.oracle.oci.sdk</groupId>
       <artifactId>oci-java-sdk-common</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1</version>
     </dependency>
   </dependencies>
 

diff --git a/bmc-bom/pom.xml b/bmc-bom/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>oci-java-sdk-bom</artifactId>
@@ -19,86 +19,86 @@
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-common</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <!-- Service modules, alpha sorted -->
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-audit</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-containerengine</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-core</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-database</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-dns</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-email</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-filestorage</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-identity</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-loadbalancer</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-objectstorage</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-resourcesearch</artifactId>
         <optional>false</optional>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <optional>false</optional>
         <artifactId>oci-java-sdk-addons-apache</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
       </dependency>
       <dependency>
         <groupId>com.oracle.oci.sdk</groupId>
         <artifactId>oci-java-sdk-keymanagement</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <optional>false</optional>
       </dependency>
     </dependencies>

diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.oci.sdk</groupId>
     <artifactId>oci-java-sdk</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/bmc-common/src/main/java/com/oracle/bmc/Services.java b/bmc-common/src/main/java/com/oracle/bmc/Services.java
@@ -38,6 +38,16 @@ public static Service create(final String serviceName, final String serviceEndpo
                 .build();
     }
 
+    /**
+     * Get Service instance based on service name.
+     *
+     * @param serviceName service name should be UPPER CASE.
+     * @return service instance
+     */
+    public static Service getServiceByName(final String serviceName) {
+        return SERVICE_CACHE.get(serviceName);
+    }
+
     @Builder(builderClassName = "ServiceBuilder", builderMethodName = "serviceBuilder")
     private static synchronized Service create(
             final String serviceName,

diff --git a/...on/src/main/java/com/oracle/bmc/auth/AbstractRequestingAuthenticationDetailsProvider.java b/...on/src/main/java/com/oracle/bmc/auth/AbstractRequestingAuthenticationDetailsProvider.java
@@ -15,7 +15,6 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
-import java.util.Arrays;
 import java.util.Set;
 
 /**
@@ -125,15 +124,22 @@ protected static class CachingSessionKeySupplier implements SessionKeySupplier {
 
         protected CachingSessionKeySupplier(final SessionKeySupplier delegate) {
             this.delegate = delegate;
-            this.setPrivateKeyBytes(delegate.getPrivateKey());
+            this.setPrivateKeyBytes((RSAPrivateKey) delegate.getKeyPair().getPrivate());
         }
 
         @Override
+        public KeyPair getKeyPair() {
+            return delegate.getKeyPair();
+        }
+
+        @Override
+        @Deprecated
         public synchronized RSAPublicKey getPublicKey() {
             return delegate.getPublicKey();
         }
 
         @Override
+        @Deprecated
         public synchronized RSAPrivateKey getPrivateKey() {
             return delegate.getPrivateKey();
         }
@@ -145,7 +151,7 @@ public synchronized void refreshKeys() {
 
         // private keys can be refreshed asynchronously, always update first
         protected synchronized byte[] getPrivateKeyBytes() {
-            setPrivateKeyBytes(this.getPrivateKey());
+            setPrivateKeyBytes((RSAPrivateKey) this.getKeyPair().getPrivate());
             return this.privateKeyBytes;
         }
 
@@ -181,20 +187,29 @@ protected SessionKeySupplierImpl() {
             this.keyPair = GENERATOR.generateKeyPair();
         }
 
+        @Override
+        public KeyPair getKeyPair() {
+            return keyPair;
+        }
+
         /**
          * Gets the public key
          * @return the public key, not null
+         * @deprecated use getKeyPair() instead
          */
         @Override
+        @Deprecated
         public RSAPublicKey getPublicKey() {
             return (RSAPublicKey) keyPair.getPublic();
         }
 
         /**
          * Gets the private key
          * @return the private key, not null
+         * @deprecated use getKeyPair() instead
          */
         @Override
+        @Deprecated
         public RSAPrivateKey getPrivateKey() {
             return (RSAPrivateKey) keyPair.getPrivate();
         }

diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/SessionKeySupplier.java b/bmc-common/src/main/java/com/oracle/bmc/auth/SessionKeySupplier.java
@@ -3,6 +3,7 @@
  */
 package com.oracle.bmc.auth;
 
+import java.security.KeyPair;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
@@ -14,16 +15,26 @@
  */
 public interface SessionKeySupplier {
 
+    /**
+     * Returns the current RSA key pair.
+     * @return The RSA key pair.
+     */
+    KeyPair getKeyPair();
+
     /**
      * Gets the public key
      * @return the public key, not null
+     * @deprecated use getKeyPair instead
      */
+    @Deprecated
     RSAPublicKey getPublicKey();
 
     /**
      * Gets the private key
      * @return the private key, not null
+     * @deprecated use getKeyPair instead
      */
+    @Deprecated
     RSAPrivateKey getPrivateKey();
 
     /**

diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java
@@ -4,7 +4,6 @@
 package com.oracle.bmc.auth;
 
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 
 import com.google.common.base.Supplier;
 import com.oracle.bmc.Region;

diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/URLBasedX509CertificateSupplier.java b/bmc-common/src/main/java/com/oracle/bmc/auth/URLBasedX509CertificateSupplier.java
@@ -7,7 +7,8 @@
 import com.oracle.bmc.util.StreamUtils;
 
 import javax.security.auth.Refreshable;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;

diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/internal/AuthUtils.java b/bmc-common/src/main/java/com/oracle/bmc/auth/internal/AuthUtils.java
@@ -7,7 +7,6 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.math.BigInteger;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.MessageDigest;

diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/internal/RestClientUtils.java b/bmc-common/src/main/java/com/oracle/bmc/auth/internal/RestClientUtils.java
@@ -11,13 +11,15 @@
 import com.oracle.bmc.http.internal.RestClientFactory;
 import com.oracle.bmc.http.internal.RestClientFactoryBuilder;
 import com.oracle.bmc.http.signing.RequestSigner;
+import com.oracle.bmc.http.signing.SigningStrategy;
 import com.oracle.bmc.http.signing.internal.Constants;
 import com.oracle.bmc.http.signing.internal.KeySupplier;
 import com.oracle.bmc.http.signing.internal.RequestSignerImpl;
 
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -119,7 +121,9 @@ private static RestClient createRestClient(
 
         RestClientFactory restClientFactory =
                 RestClientFactoryBuilder.builder().clientConfigurator(clientConfigurator).build();
-        RestClient restClient = restClientFactory.create(requestSigner);
+        RestClient restClient =
+                restClientFactory.create(
+                        requestSigner, Collections.<SigningStrategy, RequestSigner>emptyMap());
         restClient.setEndpoint(endpoint);
         return restClient;
     }

diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/internal/SecurityTokenAdapter.java b/bmc-common/src/main/java/com/oracle/bmc/auth/internal/SecurityTokenAdapter.java
@@ -72,7 +72,9 @@ boolean isValid() {
                         Optional<RSAPublicKey> jwkRsa = AuthUtils.toPublicKeyFromJson(jwk);
                         if (jwkRsa.isPresent()
                                 && isEqualPublicKey(
-                                        jwkRsa.get(), sessionKeySupplier.getPublicKey())) {
+                                        jwkRsa.get(),
+                                        (RSAPublicKey)
+                                                sessionKeySupplier.getKeyPair().getPublic())) {
 
                             LOG.debug(
                                     "Security token is still valid. Public key matches with the JWK.");