Merge pull request #54 from oracle/release_2018-04-05

Releasing version 1.2.34

Author: juanalblue

CHANGELOG.md

@@ -13,6 +13,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ### Added
 - N/A
 
+## 1.2.34 - 2018-04-05
+
+### Fixed
+- Provide better exception message when the required path parameter is empty
+
+### Added
+- Added example [here](https://github.com/oracle/oci-java-sdk/blob/master/bmc-examples/src/main/java/LaunchDbSystemExample.java) for how to launch a DB system
+- Added example [here](https://github.com/oracle/oci-java-sdk/blob/master/bmc-examples/src/main/java/TaggingExample.java) for managing tags and tag namespaces, as well as how to apply freeform and defined tags to a resource
+
 ## 1.2.33 - 2018-03-27
 
 ### Added

bmc-audit/pom.xml

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

bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java

@@ -165,133 +165,24 @@ public AuditAsyncClient(
      * @return builder
      */
     public static Builder builder() {
-        return new Builder();
+        return new Builder(SERVICE);
     }
 
     /**
      * Builder class for this client. The "authenticationDetailsProvider" is required and must be passed to the
-     * {@link #build(AbstractAuthenticationDetailsProvider)} method.
+     * {@link #build(AbstractAuthenticationDetailsProvider)} or {@link #buildAsync(AbstractAuthenticationDetailsProvider)} method.
      */
-    public static class Builder {
-        protected com.oracle.bmc.ClientConfiguration configuration;
-        protected com.oracle.bmc.http.ClientConfigurator clientConfigurator;
-        protected java.util.List<com.oracle.bmc.http.ClientConfigurator>
-                additionalClientConfigurators = new java.util.ArrayList<>();
-        protected com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory =
-                new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory(
-                        com.oracle.bmc.http.signing.SigningStrategy.STANDARD);
-        protected String endpoint;
-
-        private Builder() {}
-
-        private Builder(
-                com.oracle.bmc.ClientConfiguration configuration,
-                com.oracle.bmc.http.ClientConfigurator clientConfigurator,
-                java.util.List<com.oracle.bmc.http.ClientConfigurator>
-                        additionalClientConfigurators,
-                com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) {
-            this.configuration = configuration;
-            this.clientConfigurator = clientConfigurator;
-            this.additionalClientConfigurators = additionalClientConfigurators;
-        }
-
-        /**
-         * Set the configuration. May be null.
-         * @param configuration configuration. May be null.
-         * @return this builder
-         */
-        public Builder configuration(com.oracle.bmc.ClientConfiguration configuration) {
-            this.configuration = configuration;
-            return this;
-        }
-
-        /**
-         * Set the client configurator. May be null.
-         * @param clientConfigurator client configurator. May be null.
-         * @return this builder
-         */
-        public Builder clientConfigurator(
-                com.oracle.bmc.http.ClientConfigurator clientConfigurator) {
-            this.clientConfigurator = clientConfigurator;
-            return this;
-        }
-
-        /**
-         * Add an additional client configurator to be run after the primary configurator.
-         * @param additionalClientConfigurator the additional client configurator
-         * @return this builder
-         */
-        public Builder additionalClientConfigurator(
-                @lombok.NonNull
-                com.oracle.bmc.http.ClientConfigurator additionalClientConfigurator) {
-            this.additionalClientConfigurators.add(additionalClientConfigurator);
-            return this;
-        }
-
-        /**
-         * Set the request signer factory. May be null.
-         * @param requestSignerFactory request signer factory. May be null.
-         * @return this builder
-         */
-        public Builder requestSignerFactory(
-                com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) {
-            if (requestSignerFactory == null) {
-                this.requestSignerFactory =
-                        new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory(
-                                com.oracle.bmc.http.signing.SigningStrategy.STANDARD);
-            } else {
-                this.requestSignerFactory = requestSignerFactory;
-            }
-            return this;
-        }
-
-        /**
-         * Set the endpoint for the client to be created.
-         * @param endpoint endpoint
-         * @return this builder
-         */
-        public Builder endpoint(String endpoint) {
-            this.endpoint = endpoint;
-            return this;
-        }
-
-        /**
-         * Set the region for the client to be created.
-         * @param region region
-         * @return this builder
-         */
-        public Builder region(com.oracle.bmc.Region region) {
-            com.google.common.base.Optional<String> endpoint = region.getEndpoint(SERVICE);
-            if (endpoint.isPresent()) {
-                endpoint(endpoint.get());
-            } else {
-                throw new IllegalArgumentException(
-                        "Endpoint for " + SERVICE + " is not known in region " + region);
-            }
-            return this;
-        }
-
-        /**
-         * Set the region for the client to be created.
-         * @param region region
-         * @return this builder
-         */
-        public Builder region(String regionId) {
-            regionId = regionId.toLowerCase(Locale.ENGLISH);
-            try {
-                com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId);
-                return region(region);
-            } catch (IllegalArgumentException e) {
-                LOG.info(
-                        "Unknown regionId '{}', falling back to default endpoint format", regionId);
-                String endpoint =
-                        com.oracle.bmc.Region.formatDefaultRegionEndpoint(SERVICE, regionId);
-                return endpoint(endpoint);
-            }
+    public static class Builder
+            extends com.oracle.bmc.common.RegionalClientBuilder<Builder, AuditAsyncClient> {
+        private Builder(com.oracle.bmc.Service service) {
+            super(service);
+            requestSignerFactory =
+                    new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory(
+                            com.oracle.bmc.http.signing.SigningStrategy.STANDARD);
         }
 
         /**
-         * Build the client, with the authentication details provider.
+         * Build the client.
          * @param authenticationDetailsProvider authentication details provider
          * @return the client
          */

bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java

@@ -171,135 +171,26 @@ public AuditClient(
      * @return builder
      */
     public static Builder builder() {
-        return new Builder();
+        return new Builder(SERVICE);
     }
 
     /**
      * Builder class for this client. The "authenticationDetailsProvider" is required and must be passed to the
-     * {@link #build(AbstractAuthenticationDetailsProvider)} method.
+     * {@link #build(AbstractAuthenticationDetailsProvider)} or {@link #buildAsync(AbstractAuthenticationDetailsProvider)} method.
      */
-    public static class Builder {
-        protected com.oracle.bmc.ClientConfiguration configuration;
-        protected com.oracle.bmc.http.ClientConfigurator clientConfigurator;
-        protected java.util.List<com.oracle.bmc.http.ClientConfigurator>
-                additionalClientConfigurators = new java.util.ArrayList<>();
-        protected com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory =
-                new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory(
-                        com.oracle.bmc.http.signing.SigningStrategy.STANDARD);
-        protected String endpoint;
-
-        private Builder() {}
-
-        private Builder(
-                com.oracle.bmc.ClientConfiguration configuration,
-                com.oracle.bmc.http.ClientConfigurator clientConfigurator,
-                java.util.List<com.oracle.bmc.http.ClientConfigurator>
-                        additionalClientConfigurators,
-                com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) {
-            this.configuration = configuration;
-            this.clientConfigurator = clientConfigurator;
-            this.additionalClientConfigurators = additionalClientConfigurators;
-        }
-
-        /**
-         * Set the configuration. May be null.
-         * @param configuration configuration. May be null.
-         * @return this builder
-         */
-        public Builder configuration(com.oracle.bmc.ClientConfiguration configuration) {
-            this.configuration = configuration;
-            return this;
-        }
-
-        /**
-         * Set the client configurator. May be null.
-         * @param clientConfigurator client configurator. May be null.
-         * @return this builder
-         */
-        public Builder clientConfigurator(
-                com.oracle.bmc.http.ClientConfigurator clientConfigurator) {
-            this.clientConfigurator = clientConfigurator;
-            return this;
-        }
-
-        /**
-         * Add an additional client configurator to be run after the primary configurator.
-         * @param additionalClientConfigurator the additional client configurator
-         * @return this builder
-         */
-        public Builder additionalClientConfigurator(
-                @lombok.NonNull
-                com.oracle.bmc.http.ClientConfigurator additionalClientConfigurator) {
-            this.additionalClientConfigurators.add(additionalClientConfigurator);
-            return this;
-        }
-
-        /**
-         * Set the request signer factory. May be null.
-         * @param requestSignerFactory request signer factory. May be null.
-         * @return this builder
-         */
-        public Builder requestSignerFactory(
-                com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) {
-            if (requestSignerFactory == null) {
-                this.requestSignerFactory =
-                        new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory(
-                                com.oracle.bmc.http.signing.SigningStrategy.STANDARD);
-            } else {
-                this.requestSignerFactory = requestSignerFactory;
-            }
-            return this;
-        }
-
-        /**
-         * Set the endpoint for the client to be created.
-         * @param endpoint endpoint
-         * @return this builder
-         */
-        public Builder endpoint(String endpoint) {
-            this.endpoint = endpoint;
-            return this;
-        }
-
-        /**
-         * Set the region for the client to be created.
-         * @param region region
-         * @return this builder
-         */
-        public Builder region(com.oracle.bmc.Region region) {
-            com.google.common.base.Optional<String> endpoint = region.getEndpoint(SERVICE);
-            if (endpoint.isPresent()) {
-                endpoint(endpoint.get());
-            } else {
-                throw new IllegalArgumentException(
-                        "Endpoint for " + SERVICE + " is not known in region " + region);
-            }
-            return this;
-        }
-
-        /**
-         * Set the region for the client to be created.
-         * @param region region
-         * @return this builder
-         */
-        public Builder region(String regionId) {
-            regionId = regionId.toLowerCase(Locale.ENGLISH);
-            try {
-                com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId);
-                return region(region);
-            } catch (IllegalArgumentException e) {
-                LOG.info(
-                        "Unknown regionId '{}', falling back to default endpoint format", regionId);
-                String endpoint =
-                        com.oracle.bmc.Region.formatDefaultRegionEndpoint(SERVICE, regionId);
-                return endpoint(endpoint);
-            }
+    public static class Builder
+            extends com.oracle.bmc.common.RegionalClientBuilder<Builder, AuditClient> {
+        private Builder(com.oracle.bmc.Service service) {
+            super(service);
+            requestSignerFactory =
+                    new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory(
+                            com.oracle.bmc.http.signing.SigningStrategy.STANDARD);
         }
 
         /**
-         * Set the authentication details provider. Once this is called, the builder can build the client.
+         * Build the client.
          * @param authenticationDetailsProvider authentication details provider
-         * @return a builder that can build the client
+         * @return the client
          */
         public AuditClient build(
                 @lombok.NonNull

bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/GetConfigurationConverter.java

@@ -6,6 +6,7 @@
 import com.oracle.bmc.audit.model.*;
 import com.oracle.bmc.audit.requests.*;
 import com.oracle.bmc.audit.responses.*;
+import org.apache.commons.lang3.Validate;
 
 @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
 @lombok.extern.slf4j.Slf4j
@@ -21,13 +22,8 @@ public static GetConfigurationRequest interceptRequest(GetConfigurationRequest r
 
     public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest(
             com.oracle.bmc.http.internal.RestClient client, GetConfigurationRequest request) {
-        if (request == null) {
-            throw new NullPointerException("request instance is required");
-        }
-
-        if (request.getCompartmentId() == null) {
-            throw new NullPointerException("compartmentId is required");
-        }
+        Validate.notNull(request, "request instance is required");
+        Validate.notNull(request.getCompartmentId(), "compartmentId is required");
 
         com.oracle.bmc.http.internal.WrappedWebTarget target =
                 client.getBaseTarget().path("/20160918").path("configuration");

bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java

@@ -6,6 +6,7 @@
 import com.oracle.bmc.audit.model.*;
 import com.oracle.bmc.audit.requests.*;
 import com.oracle.bmc.audit.responses.*;
+import org.apache.commons.lang3.Validate;
 
 @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
 @lombok.extern.slf4j.Slf4j
@@ -21,21 +22,10 @@ public static ListEventsRequest interceptRequest(ListEventsRequest request) {
 
     public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest(
             com.oracle.bmc.http.internal.RestClient client, ListEventsRequest request) {
-        if (request == null) {
-            throw new NullPointerException("request instance is required");
-        }
-
-        if (request.getCompartmentId() == null) {
-            throw new NullPointerException("compartmentId is required");
-        }
-
-        if (request.getStartTime() == null) {
-            throw new NullPointerException("startTime is required");
-        }
-
-        if (request.getEndTime() == null) {
-            throw new NullPointerException("endTime is required");
-        }
+        Validate.notNull(request, "request instance is required");
+        Validate.notNull(request.getCompartmentId(), "compartmentId is required");
+        Validate.notNull(request.getStartTime(), "startTime is required");
+        Validate.notNull(request.getEndTime(), "endTime is required");
 
         com.oracle.bmc.http.internal.WrappedWebTarget target =
                 client.getBaseTarget().path("/20160918").path("auditEvents");