Merge pull request #12 from oracle/release_051817

Releasing version 1.2.8 of the Java SDK for Oracle Bare Metal Cloud Services.

Author: mricken

CHANGELOG.md

@@ -13,6 +13,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 - N/A
 
+## 1.2.8 - 2017-05-18
+### Added
+- Extended support for FastConnect
+- Support for Private VCN
+- Support for IAD Region (us-ashburn-1)
+
 ## 1.2.7 - 2017-04-27
 ### Changed
 - A new value called UnknownEnumValue has been added to all enums that are used in responses returned from services. If a service returns a value that cannot be recognized by the version of the SDK, then the enum will be set to this value. Previously this would throw an exception.

bmc-audit/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.bmc.sdk</groupId>
     <artifactId>oracle-bmc-java-sdk</artifactId>
-    <version>1.2.7</version>
+    <version>1.2.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>com.oracle.bmc.sdk</groupId>
       <artifactId>oracle-bmc-java-sdk-common</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8</version>
     </dependency>
   </dependencies>
 

bmc-bom/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.oracle.bmc.sdk</groupId>
     <artifactId>oracle-bmc-java-sdk</artifactId>
-    <version>1.2.7</version>
+    <version>1.2.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>com.oracle.bmc.sdk</groupId>
         <artifactId>oracle-bmc-java-sdk-common</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8</version>
         <optional>false</optional>
       </dependency>
 
@@ -33,31 +33,31 @@
       <dependency>
         <groupId>com.oracle.bmc.sdk</groupId>
         <artifactId>oracle-bmc-java-sdk-audit</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.bmc.sdk</groupId>
         <artifactId>oracle-bmc-java-sdk-core</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.bmc.sdk</groupId>
         <artifactId>oracle-bmc-java-sdk-identity</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.bmc.sdk</groupId>
         <artifactId>oracle-bmc-java-sdk-loadbalancer</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8</version>
         <optional>false</optional>
       </dependency>
       <dependency>
         <groupId>com.oracle.bmc.sdk</groupId>
         <artifactId>oracle-bmc-java-sdk-objectstorage</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8</version>
         <optional>false</optional>
       </dependency>
     </dependencies>

bmc-common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.bmc.sdk</groupId>
     <artifactId>oracle-bmc-java-sdk</artifactId>
-    <version>1.2.7</version>
+    <version>1.2.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

bmc-common/src/main/java/com/oracle/bmc/ConfigFileReader.java

@@ -11,9 +11,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import lombok.AccessLevel;
@@ -90,7 +93,7 @@ public static ConfigFile parse(String configurationFilePath, @Nullable String pr
     }
 
     /**
-     * Create a new instance using an input stream.
+     * Create a new instance using an UTF-8 input stream.
      *
      * @param configurationStream
      *            The path to the config file.
@@ -103,9 +106,29 @@ public static ConfigFile parse(String configurationFilePath, @Nullable String pr
      */
     public static ConfigFile parse(InputStream configurationStream, @Nullable String profile)
             throws IOException {
+        return parse(configurationStream, profile, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Create a new instance using an input stream.
+     *
+     * @param configurationStream
+     *            The path to the config file.
+     * @param profile
+     *            The profile name to load, or null if you want to load the
+     *            "DEFAULT" profile.
+     * @param charset
+     *            The charset used when parsing the input stream
+     * @return A new ConfigFile instance.
+     * @throws IOException
+     *             if the file could not be read.
+     */
+    public static ConfigFile parse(
+            InputStream configurationStream, @Nullable String profile, @Nonnull Charset charset)
+            throws IOException {
         final ConfigAccumulator accumulator = new ConfigAccumulator();
         try (final BufferedReader reader =
-                new BufferedReader(new InputStreamReader(configurationStream))) {
+                new BufferedReader(new InputStreamReader(configurationStream, charset))) {
             String line = null;
             while ((line = reader.readLine()) != null) {
                 accumulator.accept(line);

bmc-common/src/main/java/com/oracle/bmc/Region.java

@@ -22,7 +22,8 @@
 @Slf4j
 @RequiredArgsConstructor
 public enum Region {
-    US_PHOENIX_1("us-phoenix-1");
+    US_PHOENIX_1("us-phoenix-1"),
+    US_ASHBURN_1("us-ashburn-1");
 
     private static final Map<String, Map<Region, String>> SERVICE_TO_REGION_ENDPOINTS =
             new HashMap<>();

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

@@ -33,8 +33,8 @@ public void filter(@NonNull ClientRequestContext clientRequestContext) throws IO
                         clientRequestContext.getStringHeaders(),
                         clientRequestContext.getEntity());
 
-        for (String key : authHeaders.keySet()) {
-            clientRequestContext.getHeaders().putSingle(key, authHeaders.get(key));
+        for (Map.Entry<String, String> e : authHeaders.entrySet()) {
+            clientRequestContext.getHeaders().putSingle(e.getKey(), e.getValue());
         }
     }
 }

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

@@ -380,7 +380,7 @@ private List<String> getRequiredSigningHeaders(final String httpMethod) {
     private static byte[] getJsonBody(Object body) throws JsonProcessingException {
         // empty body is OK
         if (body == null) {
-            return "".getBytes();
+            return "".getBytes(StandardCharsets.UTF_8);
         }
         // use the same object mapper as the rest client to ensure the configurations match
         // what is sent
@@ -401,7 +401,7 @@ private static String base64Encode(byte[] bytes) {
         // encodeBase64String changed from chunked in v1.4 to not chunked in
         // v1.5 so we cannot rely on which version is going to be used by clients,
         // be explicit that this is not-chunked
-        return new String(Base64.encodeBase64(bytes, false));
+        return new String(Base64.encodeBase64(bytes, false), StandardCharsets.UTF_8);
     }
 
     private static SimpleDateFormat createFormatter() {

bmc-core/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.oracle.bmc.sdk</groupId>
     <artifactId>oracle-bmc-java-sdk</artifactId>
-    <version>1.2.7</version>
+    <version>1.2.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>com.oracle.bmc.sdk</groupId>
       <artifactId>oracle-bmc-java-sdk-common</artifactId>
-      <version>1.2.7</version>
+      <version>1.2.8</version>
     </dependency>
   </dependencies>
 

bmc-core/src/main/java/com/oracle/bmc/core/Compute.java

@@ -231,8 +231,9 @@ GetWindowsInstanceInitialCredentialsResponse getWindowsInstanceInitialCredential
      * on that resource type, or by viewing the resource in the Console.
      * <p>
      * When you launch an instance, it is automatically attached to a Virtual
-     * Network Interface Card (VNIC) and given both a public and private IP address.
-     * To get both addresses, use the {@link #listVnicAttachments(ListVnicAttachmentsRequest) listVnicAttachments}
+     * Network Interface Card (VNIC). The VNIC has a private IP address from
+     * the subnet's CIDR, and optionally a public IP address.
+     * To get the addresses, use the {@link #listVnicAttachments(ListVnicAttachmentsRequest) listVnicAttachments}
      * operation to get the VNIC ID for the instance, and then call
      * {@link #getVnic(GetVnicRequest) getVnic} with the VNIC ID.
      *