diff --git a/CHANGELOG.md b/CHANGELOG.md index ac3f9b18f38..ffb388b1bc1 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/bmc-audit/pom.xml b/bmc-audit/pom.xml index 0086b17367a..ee44792e950 100644 --- a/bmc-audit/pom.xml +++ b/bmc-audit/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java index 406d08f9204..b31f76d0257 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java +++ b/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 - 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 - 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 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 { + 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 */ diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java index 8b3b1331baa..ab13141f721 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java +++ b/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 - 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 - 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 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 { + 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 diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/GetConfigurationConverter.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/GetConfigurationConverter.java index 0dab84b1ac0..44d8217039b 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/GetConfigurationConverter.java +++ b/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"); diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java index 8b91d857eb2..eb555214b5e 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/ListEventsConverter.java +++ b/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"); diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/UpdateConfigurationConverter.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/UpdateConfigurationConverter.java index 4556e9cc88c..966f5c69b62 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/UpdateConfigurationConverter.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/internal/http/UpdateConfigurationConverter.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,17 +22,10 @@ public static UpdateConfigurationRequest interceptRequest(UpdateConfigurationReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateConfigurationRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getUpdateConfigurationDetails() == null) { - throw new NullPointerException("updateConfigurationDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull( + request.getUpdateConfigurationDetails(), "updateConfigurationDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("configuration"); diff --git a/bmc-bom/pom.xml b/bmc-bom/pom.xml index 4e4fb28856d..59170e4c97e 100644 --- a/bmc-bom/pom.xml +++ b/bmc-bom/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml oci-java-sdk-bom @@ -19,62 +19,62 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-audit - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-core - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-database - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-dns - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-email - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-filestorage - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-identity - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-loadbalancer - 1.2.33 + 1.2.34 false com.oracle.oci.sdk oci-java-sdk-objectstorage - 1.2.33 + 1.2.34 false diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml index eb57dcab8f9..a48c786e390 100644 --- a/bmc-common/pom.xml +++ b/bmc-common/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml diff --git a/bmc-common/src/main/java/com/oracle/bmc/common/ClientBuilderBase.java b/bmc-common/src/main/java/com/oracle/bmc/common/ClientBuilderBase.java new file mode 100644 index 00000000000..1c8faea10ff --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/common/ClientBuilderBase.java @@ -0,0 +1,97 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.common; + +import com.oracle.bmc.Service; + +/** + * Base client builder. + * @param actual class of the builder + */ +public abstract class ClientBuilderBase { + protected final Service service; + protected com.oracle.bmc.ClientConfiguration configuration; + protected com.oracle.bmc.http.ClientConfigurator clientConfigurator; + protected java.util.List 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; + + public ClientBuilderBase(Service service) { + this.service = service; + } + + /** + * Set the configuration. May be null. + * @param configuration configuration. May be null. + * @return this builder + */ + public B configuration(com.oracle.bmc.ClientConfiguration configuration) { + this.configuration = configuration; + return (B) this; + } + + /** + * Set the client configurator. May be null. + * @param clientConfigurator client configurator. May be null. + * @return this builder + */ + public B clientConfigurator(com.oracle.bmc.http.ClientConfigurator clientConfigurator) { + this.clientConfigurator = clientConfigurator; + return (B) this; + } + + /** + * Add an additional client configurator to be run after the primary configurator. + * @param additionalClientConfigurator the additional client configurator + * @return this builder + */ + public B additionalClientConfigurator( + @lombok.NonNull com.oracle.bmc.http.ClientConfigurator additionalClientConfigurator) { + if (additionalClientConfigurator == null) { + throw new NullPointerException("additionalClientConfigurator"); + } + this.additionalClientConfigurators.add(additionalClientConfigurator); + return (B) this; + } + + /** + * Set the request signer factory. May be null. + * @param requestSignerFactory request signer factory. May be null. + * @return this builder + */ + public B 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 (B) this; + } + + /** + * Set the endpoint for the client to be created. + * @param endpoint endpoint + * @return this builder + */ + public B endpoint(String endpoint) { + this.endpoint = endpoint; + return (B) this; + } + + /** + * Set the authentication details provider. Once this is called, the builder can build the client. + * @param authenticationDetailsProvider authentication details provider + * @return a builder that can build the client + */ + public abstract C build( + @lombok.NonNull + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider + authenticationDetailsProvider); +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/common/RegionalClientBuilder.java b/bmc-common/src/main/java/com/oracle/bmc/common/RegionalClientBuilder.java new file mode 100644 index 00000000000..ccfce855ed0 --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/common/RegionalClientBuilder.java @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.common; + +import com.oracle.bmc.Service; + +import java.util.Locale; + +/** + * A builder for clients that can be configured to target a certain region + * @param actual builder class + * @param client class + */ +@lombok.extern.slf4j.Slf4j +public abstract class RegionalClientBuilder + extends ClientBuilderBase { + public RegionalClientBuilder(Service service) { + super(service); + } + + /** + * Set the region for the client to be created. + * @param region region + * @return this builder + */ + public B region(com.oracle.bmc.Region region) { + com.google.common.base.Optional endpoint = region.getEndpoint(service); + if (endpoint.isPresent()) { + endpoint(endpoint.get()); + } else { + throw new IllegalArgumentException( + "Endpoint for " + service + " is not known in region " + region); + } + return (B) this; + } + + /** + * Set the region for the client to be created. + * @param regionId region + * @return this builder + */ + public B 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); + } + } +} diff --git a/bmc-core/pom.xml b/bmc-core/pom.xml index 859758f1ac4..7dc2bec8df6 100644 --- a/bmc-core/pom.xml +++ b/bmc-core/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsyncClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsyncClient.java index 3777e996422..df313b43146 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsyncClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsyncClient.java @@ -165,133 +165,24 @@ public BlockstorageAsyncClient( * @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 - 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 - 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 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 { + 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 */ diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageClient.java index 4261475d149..0c90976e79c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageClient.java @@ -187,135 +187,26 @@ public BlockstorageClient( * @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 - 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 - 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 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 { + 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 BlockstorageClient build( @lombok.NonNull diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java index 10dac211f25..9730df8caac 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java @@ -165,133 +165,24 @@ public ComputeAsyncClient( * @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 - 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 - 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 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 { + 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 */ diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeClient.java index db0a7ac218b..804d347db72 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeClient.java @@ -187,135 +187,26 @@ public ComputeClient( * @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 - 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 - 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 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 { + 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 ComputeClient build( @lombok.NonNull diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsyncClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsyncClient.java index 1e4c109bded..22ba7ab1f53 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsyncClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsyncClient.java @@ -165,133 +165,25 @@ public VirtualNetworkAsyncClient( * @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 - 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 - 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 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, VirtualNetworkAsyncClient> { + 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 */ diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java index 0b09f351971..f638f2bbdfe 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java @@ -187,135 +187,26 @@ public VirtualNetworkClient( * @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 - 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 - 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 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 { + 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 VirtualNetworkClient build( @lombok.NonNull diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachBootVolumeConverter.java index 2d009f3233e..5a00caacf0f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachBootVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachBootVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static AttachBootVolumeRequest interceptRequest(AttachBootVolumeRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, AttachBootVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getAttachBootVolumeDetails() == null) { - throw new NullPointerException("attachBootVolumeDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getAttachBootVolumeDetails(), "attachBootVolumeDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("bootVolumeAttachments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVnicConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVnicConverter.java index 1bccb866593..fe88863911f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVnicConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVnicConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 AttachVnicRequest interceptRequest(AttachVnicRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, AttachVnicRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getAttachVnicDetails() == null) { - throw new NullPointerException("attachVnicDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getAttachVnicDetails(), "attachVnicDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("vnicAttachments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVolumeConverter.java index 2dbaf9e058f..6132d395b9f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 AttachVolumeRequest interceptRequest(AttachVolumeRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, AttachVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getAttachVolumeDetails() == null) { - throw new NullPointerException("attachVolumeDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getAttachVolumeDetails(), "attachVolumeDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("volumeAttachments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/BulkAddVirtualCircuitPublicPrefixesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/BulkAddVirtualCircuitPublicPrefixesConverter.java index 5fa914573f2..3b8b327d045 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/BulkAddVirtualCircuitPublicPrefixesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/BulkAddVirtualCircuitPublicPrefixesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,18 +24,11 @@ public static BulkAddVirtualCircuitPublicPrefixesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, BulkAddVirtualCircuitPublicPrefixesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVirtualCircuitId() == null) { - throw new NullPointerException("virtualCircuitId is required"); - } - - if (request.getBulkAddVirtualCircuitPublicPrefixesDetails() == null) { - throw new NullPointerException( - "bulkAddVirtualCircuitPublicPrefixesDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVirtualCircuitId(), "virtualCircuitId must not be blank"); + Validate.notNull( + request.getBulkAddVirtualCircuitPublicPrefixesDetails(), + "bulkAddVirtualCircuitPublicPrefixesDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/BulkDeleteVirtualCircuitPublicPrefixesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/BulkDeleteVirtualCircuitPublicPrefixesConverter.java index 94a15efa014..c99757f7af7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/BulkDeleteVirtualCircuitPublicPrefixesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/BulkDeleteVirtualCircuitPublicPrefixesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,18 +24,11 @@ public static BulkDeleteVirtualCircuitPublicPrefixesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, BulkDeleteVirtualCircuitPublicPrefixesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVirtualCircuitId() == null) { - throw new NullPointerException("virtualCircuitId is required"); - } - - if (request.getBulkDeleteVirtualCircuitPublicPrefixesDetails() == null) { - throw new NullPointerException( - "bulkDeleteVirtualCircuitPublicPrefixesDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVirtualCircuitId(), "virtualCircuitId must not be blank"); + Validate.notNull( + request.getBulkDeleteVirtualCircuitPublicPrefixesDetails(), + "bulkDeleteVirtualCircuitPublicPrefixesDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CaptureConsoleHistoryConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CaptureConsoleHistoryConverter.java index bd60e5aa180..d659d49c52c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CaptureConsoleHistoryConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CaptureConsoleHistoryConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,10 @@ public static CaptureConsoleHistoryRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CaptureConsoleHistoryRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCaptureConsoleHistoryDetails() == null) { - throw new NullPointerException("captureConsoleHistoryDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCaptureConsoleHistoryDetails(), + "captureConsoleHistoryDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("instanceConsoleHistories"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectLocalPeeringGatewaysConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectLocalPeeringGatewaysConverter.java index 5448bfa2a49..3382a5dd70b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectLocalPeeringGatewaysConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectLocalPeeringGatewaysConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,12 @@ public static ConnectLocalPeeringGatewaysRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ConnectLocalPeeringGatewaysRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLocalPeeringGatewayId() == null) { - throw new NullPointerException("localPeeringGatewayId is required"); - } - - if (request.getConnectLocalPeeringGatewaysDetails() == null) { - throw new NullPointerException("connectLocalPeeringGatewaysDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getLocalPeeringGatewayId(), "localPeeringGatewayId must not be blank"); + Validate.notNull( + request.getConnectLocalPeeringGatewaysDetails(), + "connectLocalPeeringGatewaysDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectRemotePeeringConnectionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectRemotePeeringConnectionsConverter.java index 2031bb5263f..26215d9488b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectRemotePeeringConnectionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectRemotePeeringConnectionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,13 @@ public static ConnectRemotePeeringConnectionsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ConnectRemotePeeringConnectionsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getRemotePeeringConnectionId() == null) { - throw new NullPointerException("remotePeeringConnectionId is required"); - } - - if (request.getConnectRemotePeeringConnectionsDetails() == null) { - throw new NullPointerException("connectRemotePeeringConnectionsDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getRemotePeeringConnectionId(), + "remotePeeringConnectionId must not be blank"); + Validate.notNull( + request.getConnectRemotePeeringConnectionsDetails(), + "connectRemotePeeringConnectionsDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCpeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCpeConverter.java index 80eb9a724c9..b4f42e1cb23 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCpeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCpeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreateCpeRequest interceptRequest(CreateCpeRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateCpeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateCpeDetails() == null) { - throw new NullPointerException("createCpeDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateCpeDetails(), "createCpeDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("cpes"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCrossConnectConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCrossConnectConverter.java index 849c1c1c0c8..42e386c0631 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCrossConnectConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCrossConnectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateCrossConnectRequest interceptRequest(CreateCrossConnectReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateCrossConnectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateCrossConnectDetails() == null) { - throw new NullPointerException("createCrossConnectDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateCrossConnectDetails(), "createCrossConnectDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("crossConnects"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCrossConnectGroupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCrossConnectGroupConverter.java index ada76ecc2fb..579819626a2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCrossConnectGroupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateCrossConnectGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static CreateCrossConnectGroupRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateCrossConnectGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateCrossConnectGroupDetails() == null) { - throw new NullPointerException("createCrossConnectGroupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateCrossConnectGroupDetails(), + "createCrossConnectGroupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("crossConnectGroups"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDhcpOptionsConverter.java index ef37a1c1531..13b9f39d554 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDhcpOptionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreateDhcpOptionsRequest interceptRequest(CreateDhcpOptionsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateDhcpOptionsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateDhcpDetails() == null) { - throw new NullPointerException("createDhcpDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateDhcpDetails(), "createDhcpDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("dhcps"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgAttachmentConverter.java index 5ab8bbd2f54..43c8980f171 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgAttachmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateDrgAttachmentRequest interceptRequest(CreateDrgAttachmentReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateDrgAttachmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateDrgAttachmentDetails() == null) { - throw new NullPointerException("createDrgAttachmentDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateDrgAttachmentDetails(), "createDrgAttachmentDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("drgAttachments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgConverter.java index 1db4d515154..15b60e11cd2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateDrgConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreateDrgRequest interceptRequest(CreateDrgRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateDrgRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateDrgDetails() == null) { - throw new NullPointerException("createDrgDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateDrgDetails(), "createDrgDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("drgs"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateIPSecConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateIPSecConnectionConverter.java index 6b72a4e4ce3..858b59babb6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateIPSecConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateIPSecConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,10 @@ public static CreateIPSecConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateIPSecConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateIPSecConnectionDetails() == null) { - throw new NullPointerException("createIPSecConnectionDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateIPSecConnectionDetails(), + "createIPSecConnectionDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("ipsecConnections"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateImageConverter.java index b509fed3ddd..ee4abe83384 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateImageConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreateImageRequest interceptRequest(CreateImageRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateImageRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateImageDetails() == null) { - throw new NullPointerException("createImageDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateImageDetails(), "createImageDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("images"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInstanceConsoleConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInstanceConsoleConnectionConverter.java index 7522736597c..a45ffff061c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInstanceConsoleConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInstanceConsoleConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static CreateInstanceConsoleConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateInstanceConsoleConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateInstanceConsoleConnectionDetails() == null) { - throw new NullPointerException("createInstanceConsoleConnectionDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateInstanceConsoleConnectionDetails(), + "createInstanceConsoleConnectionDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("instanceConsoleConnections"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInternetGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInternetGatewayConverter.java index 55b333e5f90..e47f32f0f76 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInternetGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateInternetGatewayConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,10 @@ public static CreateInternetGatewayRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateInternetGatewayRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateInternetGatewayDetails() == null) { - throw new NullPointerException("createInternetGatewayDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateInternetGatewayDetails(), + "createInternetGatewayDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("internetGateways"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateLocalPeeringGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateLocalPeeringGatewayConverter.java index db1a160c66d..3aff8fb24d8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateLocalPeeringGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateLocalPeeringGatewayConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static CreateLocalPeeringGatewayRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateLocalPeeringGatewayRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateLocalPeeringGatewayDetails() == null) { - throw new NullPointerException("createLocalPeeringGatewayDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateLocalPeeringGatewayDetails(), + "createLocalPeeringGatewayDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("localPeeringGateways"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreatePrivateIpConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreatePrivateIpConverter.java index fba0f97df0c..18f642595d6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreatePrivateIpConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreatePrivateIpConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreatePrivateIpRequest interceptRequest(CreatePrivateIpRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreatePrivateIpRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreatePrivateIpDetails() == null) { - throw new NullPointerException("createPrivateIpDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreatePrivateIpDetails(), "createPrivateIpDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("privateIps"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreatePublicIpConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreatePublicIpConverter.java index 284f7966234..216a9f8ff51 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreatePublicIpConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreatePublicIpConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreatePublicIpRequest interceptRequest(CreatePublicIpRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreatePublicIpRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreatePublicIpDetails() == null) { - throw new NullPointerException("createPublicIpDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreatePublicIpDetails(), "createPublicIpDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("publicIps"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRemotePeeringConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRemotePeeringConnectionConverter.java index e5e239b74d0..19864ce3d41 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRemotePeeringConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRemotePeeringConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static CreateRemotePeeringConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateRemotePeeringConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateRemotePeeringConnectionDetails() == null) { - throw new NullPointerException("createRemotePeeringConnectionDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateRemotePeeringConnectionDetails(), + "createRemotePeeringConnectionDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("remotePeeringConnections"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRouteTableConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRouteTableConverter.java index 5093f8a3ec8..70fca20fd3e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRouteTableConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateRouteTableConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateRouteTableRequest interceptRequest(CreateRouteTableRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateRouteTableRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateRouteTableDetails() == null) { - throw new NullPointerException("createRouteTableDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateRouteTableDetails(), "createRouteTableDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("routeTables"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSecurityListConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSecurityListConverter.java index a6fbcd91c8b..c2603f5887c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSecurityListConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSecurityListConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateSecurityListRequest interceptRequest(CreateSecurityListReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateSecurityListRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateSecurityListDetails() == null) { - throw new NullPointerException("createSecurityListDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateSecurityListDetails(), "createSecurityListDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("securityLists"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSubnetConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSubnetConverter.java index 6dd4f5445d5..4f6c5afbd0f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSubnetConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateSubnetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreateSubnetRequest interceptRequest(CreateSubnetRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateSubnetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateSubnetDetails() == null) { - throw new NullPointerException("createSubnetDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateSubnetDetails(), "createSubnetDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("subnets"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVcnConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVcnConverter.java index 3585aae8435..67bd5c949f8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVcnConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVcnConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreateVcnRequest interceptRequest(CreateVcnRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateVcnRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateVcnDetails() == null) { - throw new NullPointerException("createVcnDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateVcnDetails(), "createVcnDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("vcns"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVirtualCircuitConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVirtualCircuitConverter.java index 96d4bac4845..1d857edf231 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVirtualCircuitConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVirtualCircuitConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,10 @@ public static CreateVirtualCircuitRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateVirtualCircuitRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateVirtualCircuitDetails() == null) { - throw new NullPointerException("createVirtualCircuitDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateVirtualCircuitDetails(), + "createVirtualCircuitDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("virtualCircuits"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupConverter.java index 3ce86b9b65a..d21bf81dde1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateVolumeBackupRequest interceptRequest(CreateVolumeBackupReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateVolumeBackupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateVolumeBackupDetails() == null) { - throw new NullPointerException("createVolumeBackupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateVolumeBackupDetails(), "createVolumeBackupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("volumeBackups"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupPolicyAssignmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupPolicyAssignmentConverter.java index 2eae16aff4d..40f259f7552 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupPolicyAssignmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeBackupPolicyAssignmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static CreateVolumeBackupPolicyAssignmentRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateVolumeBackupPolicyAssignmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateVolumeBackupPolicyAssignmentDetails() == null) { - throw new NullPointerException("createVolumeBackupPolicyAssignmentDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateVolumeBackupPolicyAssignmentDetails(), + "createVolumeBackupPolicyAssignmentDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("volumeBackupPolicyAssignments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeConverter.java index e1e52f5a23e..f502c803f92 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 CreateVolumeRequest interceptRequest(CreateVolumeRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateVolumeDetails() == null) { - throw new NullPointerException("createVolumeDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateVolumeDetails(), "createVolumeDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("volumes"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteBootVolumeConverter.java index c2e5ed0bb4b..e811862e576 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteBootVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteBootVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteBootVolumeRequest interceptRequest(DeleteBootVolumeRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteBootVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getBootVolumeId() == null) { - throw new NullPointerException("bootVolumeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getBootVolumeId(), "bootVolumeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteConsoleHistoryConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteConsoleHistoryConverter.java index bf6b1d1086b..397b75bcf69 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteConsoleHistoryConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteConsoleHistoryConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,10 @@ public static DeleteConsoleHistoryRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteConsoleHistoryRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceConsoleHistoryId() == null) { - throw new NullPointerException("instanceConsoleHistoryId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getInstanceConsoleHistoryId(), + "instanceConsoleHistoryId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCpeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCpeConverter.java index 325e82b9c89..50b6be9c7e8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCpeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCpeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteCpeRequest interceptRequest(DeleteCpeRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteCpeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCpeId() == null) { - throw new NullPointerException("cpeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCpeId(), "cpeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCrossConnectConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCrossConnectConverter.java index a7c0971b137..5a8bd3dab18 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCrossConnectConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCrossConnectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteCrossConnectRequest interceptRequest(DeleteCrossConnectReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteCrossConnectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCrossConnectId() == null) { - throw new NullPointerException("crossConnectId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCrossConnectId(), "crossConnectId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCrossConnectGroupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCrossConnectGroupConverter.java index 00028548b09..82aede63d3f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCrossConnectGroupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteCrossConnectGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,9 @@ public static DeleteCrossConnectGroupRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteCrossConnectGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCrossConnectGroupId() == null) { - throw new NullPointerException("crossConnectGroupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getCrossConnectGroupId(), "crossConnectGroupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDhcpOptionsConverter.java index 6aa102f4c0e..bcbf8f376c9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDhcpOptionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteDhcpOptionsRequest interceptRequest(DeleteDhcpOptionsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteDhcpOptionsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDhcpId() == null) { - throw new NullPointerException("dhcpId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDhcpId(), "dhcpId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgAttachmentConverter.java index 85c4306977b..f410c91d671 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgAttachmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteDrgAttachmentRequest interceptRequest(DeleteDrgAttachmentReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteDrgAttachmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDrgAttachmentId() == null) { - throw new NullPointerException("drgAttachmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDrgAttachmentId(), "drgAttachmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgConverter.java index bd858e301b0..260289b1c6c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteDrgConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteDrgRequest interceptRequest(DeleteDrgRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteDrgRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDrgId() == null) { - throw new NullPointerException("drgId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDrgId(), "drgId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteIPSecConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteIPSecConnectionConverter.java index 00f02874726..359e627faf9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteIPSecConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteIPSecConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static DeleteIPSecConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteIPSecConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIpscId() == null) { - throw new NullPointerException("ipscId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIpscId(), "ipscId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteImageConverter.java index 3912c7094d1..ed4cda53763 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteImageConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteImageRequest interceptRequest(DeleteImageRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteImageRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getImageId() == null) { - throw new NullPointerException("imageId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getImageId(), "imageId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInstanceConsoleConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInstanceConsoleConnectionConverter.java index 101dd385af6..06f8157d6f2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInstanceConsoleConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInstanceConsoleConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static DeleteInstanceConsoleConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteInstanceConsoleConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceConsoleConnectionId() == null) { - throw new NullPointerException("instanceConsoleConnectionId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getInstanceConsoleConnectionId(), + "instanceConsoleConnectionId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInternetGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInternetGatewayConverter.java index e6be4f489cb..dfaec54e029 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInternetGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteInternetGatewayConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static DeleteInternetGatewayRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteInternetGatewayRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIgId() == null) { - throw new NullPointerException("igId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIgId(), "igId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteLocalPeeringGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteLocalPeeringGatewayConverter.java index 682c1337a43..f301b63bf69 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteLocalPeeringGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteLocalPeeringGatewayConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,9 @@ public static DeleteLocalPeeringGatewayRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteLocalPeeringGatewayRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLocalPeeringGatewayId() == null) { - throw new NullPointerException("localPeeringGatewayId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getLocalPeeringGatewayId(), "localPeeringGatewayId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeletePrivateIpConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeletePrivateIpConverter.java index e682729f062..a839ee45a5a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeletePrivateIpConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeletePrivateIpConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeletePrivateIpRequest interceptRequest(DeletePrivateIpRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeletePrivateIpRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPrivateIpId() == null) { - throw new NullPointerException("privateIpId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPrivateIpId(), "privateIpId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeletePublicIpConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeletePublicIpConverter.java index c0c4a0622d9..f3c3a1fa64b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeletePublicIpConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeletePublicIpConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeletePublicIpRequest interceptRequest(DeletePublicIpRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeletePublicIpRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPublicIpId() == null) { - throw new NullPointerException("publicIpId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPublicIpId(), "publicIpId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRemotePeeringConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRemotePeeringConnectionConverter.java index 087d87a9ba8..f1c8505b19d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRemotePeeringConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRemotePeeringConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static DeleteRemotePeeringConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteRemotePeeringConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getRemotePeeringConnectionId() == null) { - throw new NullPointerException("remotePeeringConnectionId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getRemotePeeringConnectionId(), + "remotePeeringConnectionId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRouteTableConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRouteTableConverter.java index ac7b10e1db5..4f65b0d13a0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRouteTableConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteRouteTableConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteRouteTableRequest interceptRequest(DeleteRouteTableRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteRouteTableRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getRtId() == null) { - throw new NullPointerException("rtId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getRtId(), "rtId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSecurityListConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSecurityListConverter.java index 6960e60002c..1c48860c0c6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSecurityListConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSecurityListConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteSecurityListRequest interceptRequest(DeleteSecurityListReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteSecurityListRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSecurityListId() == null) { - throw new NullPointerException("securityListId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSecurityListId(), "securityListId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSubnetConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSubnetConverter.java index 26f91c01d1e..e7fb3d42b9d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSubnetConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteSubnetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteSubnetRequest interceptRequest(DeleteSubnetRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteSubnetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSubnetId() == null) { - throw new NullPointerException("subnetId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSubnetId(), "subnetId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVcnConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVcnConverter.java index 77e484e1f29..ba2078b2796 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVcnConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVcnConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteVcnRequest interceptRequest(DeleteVcnRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteVcnRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVcnId(), "vcnId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVirtualCircuitConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVirtualCircuitConverter.java index 833e0d7d476..2f0c82fb9aa 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVirtualCircuitConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVirtualCircuitConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static DeleteVirtualCircuitRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteVirtualCircuitRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVirtualCircuitId() == null) { - throw new NullPointerException("virtualCircuitId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVirtualCircuitId(), "virtualCircuitId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupConverter.java index 5614b549146..4df61537835 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteVolumeBackupRequest interceptRequest(DeleteVolumeBackupReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteVolumeBackupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVolumeBackupId() == null) { - throw new NullPointerException("volumeBackupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVolumeBackupId(), "volumeBackupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupPolicyAssignmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupPolicyAssignmentConverter.java index 4f8ac0fcb11..7edf21dff63 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupPolicyAssignmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeBackupPolicyAssignmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static DeleteVolumeBackupPolicyAssignmentRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteVolumeBackupPolicyAssignmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPolicyAssignmentId() == null) { - throw new NullPointerException("policyAssignmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPolicyAssignmentId(), "policyAssignmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeConverter.java index 811882950fc..21d18321a96 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DeleteVolumeRequest interceptRequest(DeleteVolumeRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVolumeId() == null) { - throw new NullPointerException("volumeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVolumeId(), "volumeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachBootVolumeConverter.java index 14506f2360c..4d85003efcf 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachBootVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachBootVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static DetachBootVolumeRequest interceptRequest(DetachBootVolumeRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DetachBootVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getBootVolumeAttachmentId() == null) { - throw new NullPointerException("bootVolumeAttachmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getBootVolumeAttachmentId(), "bootVolumeAttachmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVnicConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVnicConverter.java index 7e158fa574a..2981a7da8b3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVnicConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVnicConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DetachVnicRequest interceptRequest(DetachVnicRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DetachVnicRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVnicAttachmentId() == null) { - throw new NullPointerException("vnicAttachmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVnicAttachmentId(), "vnicAttachmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVolumeConverter.java index 9bb9e2b32da..c403fa67d21 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 DetachVolumeRequest interceptRequest(DetachVolumeRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DetachVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVolumeAttachmentId() == null) { - throw new NullPointerException("volumeAttachmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVolumeAttachmentId(), "volumeAttachmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ExportImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ExportImageConverter.java index 4ee863a3045..7f995b4c3c5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ExportImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ExportImageConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ExportImageRequest interceptRequest(ExportImageRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ExportImageRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getImageId() == null) { - throw new NullPointerException("imageId is required"); - } - - if (request.getExportImageDetails() == null) { - throw new NullPointerException("exportImageDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getImageId(), "imageId must not be blank"); + Validate.notNull(request.getExportImageDetails(), "exportImageDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeAttachmentConverter.java index d023e8846e5..336f0480faf 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeAttachmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,9 @@ public static GetBootVolumeAttachmentRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetBootVolumeAttachmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getBootVolumeAttachmentId() == null) { - throw new NullPointerException("bootVolumeAttachmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getBootVolumeAttachmentId(), "bootVolumeAttachmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeConverter.java index 8047eb20f79..ace2bdd7cff 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetBootVolumeRequest interceptRequest(GetBootVolumeRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetBootVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getBootVolumeId() == null) { - throw new NullPointerException("bootVolumeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getBootVolumeId(), "bootVolumeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryContentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryContentConverter.java index 330f6bd66d9..1da5da23cf7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryContentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryContentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static GetConsoleHistoryContentRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetConsoleHistoryContentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceConsoleHistoryId() == null) { - throw new NullPointerException("instanceConsoleHistoryId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getInstanceConsoleHistoryId(), + "instanceConsoleHistoryId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryConverter.java index 2c734f19363..c3718a5c0c6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetConsoleHistoryConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,10 @@ public static GetConsoleHistoryRequest interceptRequest(GetConsoleHistoryRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetConsoleHistoryRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceConsoleHistoryId() == null) { - throw new NullPointerException("instanceConsoleHistoryId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getInstanceConsoleHistoryId(), + "instanceConsoleHistoryId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCpeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCpeConverter.java index c3f6c8aff17..b077037ac8d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCpeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCpeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetCpeRequest interceptRequest(GetCpeRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetCpeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCpeId() == null) { - throw new NullPointerException("cpeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCpeId(), "cpeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectConverter.java index 9a9ef529b1e..f03de18766e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetCrossConnectRequest interceptRequest(GetCrossConnectRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetCrossConnectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCrossConnectId() == null) { - throw new NullPointerException("crossConnectId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCrossConnectId(), "crossConnectId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectGroupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectGroupConverter.java index 6e78f89affd..c9332baeba6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectGroupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,9 @@ public static GetCrossConnectGroupRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetCrossConnectGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCrossConnectGroupId() == null) { - throw new NullPointerException("crossConnectGroupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getCrossConnectGroupId(), "crossConnectGroupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectLetterOfAuthorityConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectLetterOfAuthorityConverter.java index 68fd3cf7de1..651f69d41a6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectLetterOfAuthorityConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectLetterOfAuthorityConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static GetCrossConnectLetterOfAuthorityRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetCrossConnectLetterOfAuthorityRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCrossConnectId() == null) { - throw new NullPointerException("crossConnectId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCrossConnectId(), "crossConnectId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectStatusConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectStatusConverter.java index 2422ad07802..58e8b09dd9c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectStatusConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetCrossConnectStatusConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static GetCrossConnectStatusRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetCrossConnectStatusRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCrossConnectId() == null) { - throw new NullPointerException("crossConnectId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCrossConnectId(), "crossConnectId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDhcpOptionsConverter.java index 93df3020ba1..11014b4e3b8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDhcpOptionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetDhcpOptionsRequest interceptRequest(GetDhcpOptionsRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDhcpOptionsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDhcpId() == null) { - throw new NullPointerException("dhcpId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDhcpId(), "dhcpId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgAttachmentConverter.java index dcf1e3ac5de..2137bb8bf18 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgAttachmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetDrgAttachmentRequest interceptRequest(GetDrgAttachmentRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDrgAttachmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDrgAttachmentId() == null) { - throw new NullPointerException("drgAttachmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDrgAttachmentId(), "drgAttachmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgConverter.java index 45c6c876399..defd5f6617f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetDrgConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetDrgRequest interceptRequest(GetDrgRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDrgRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDrgId() == null) { - throw new NullPointerException("drgId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDrgId(), "drgId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetFastConnectProviderServiceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetFastConnectProviderServiceConverter.java index 422944c3cf6..8d9d12ab4cb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetFastConnectProviderServiceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetFastConnectProviderServiceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static GetFastConnectProviderServiceRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetFastConnectProviderServiceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getProviderServiceId() == null) { - throw new NullPointerException("providerServiceId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getProviderServiceId(), "providerServiceId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionConverter.java index c284e7f4eb7..5567ed80fb5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetIPSecConnectionRequest interceptRequest(GetIPSecConnectionReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetIPSecConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIpscId() == null) { - throw new NullPointerException("ipscId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIpscId(), "ipscId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceConfigConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceConfigConverter.java index 2665787f58e..f3f1bba4355 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceConfigConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceConfigConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static GetIPSecConnectionDeviceConfigRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetIPSecConnectionDeviceConfigRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIpscId() == null) { - throw new NullPointerException("ipscId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIpscId(), "ipscId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceStatusConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceStatusConverter.java index 55c400e3617..7e77fe29520 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceStatusConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetIPSecConnectionDeviceStatusConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static GetIPSecConnectionDeviceStatusRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetIPSecConnectionDeviceStatusRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIpscId() == null) { - throw new NullPointerException("ipscId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIpscId(), "ipscId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetImageConverter.java index a83a5beb3d6..21da9d5e3ba 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetImageConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetImageRequest interceptRequest(GetImageRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetImageRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getImageId() == null) { - throw new NullPointerException("imageId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getImageId(), "imageId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConsoleConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConsoleConnectionConverter.java index 435162b300b..91fa85caa82 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConsoleConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConsoleConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static GetInstanceConsoleConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetInstanceConsoleConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceConsoleConnectionId() == null) { - throw new NullPointerException("instanceConsoleConnectionId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getInstanceConsoleConnectionId(), + "instanceConsoleConnectionId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConverter.java index f517ad4f232..5726c7f609c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInstanceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetInstanceRequest interceptRequest(GetInstanceRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetInstanceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceId() == null) { - throw new NullPointerException("instanceId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getInstanceId(), "instanceId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInternetGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInternetGatewayConverter.java index 741f52078c1..e21710cc078 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInternetGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetInternetGatewayConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetInternetGatewayRequest interceptRequest(GetInternetGatewayReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetInternetGatewayRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIgId() == null) { - throw new NullPointerException("igId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIgId(), "igId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetLocalPeeringGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetLocalPeeringGatewayConverter.java index b284795aba4..6ee3810047b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetLocalPeeringGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetLocalPeeringGatewayConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,9 @@ public static GetLocalPeeringGatewayRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetLocalPeeringGatewayRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLocalPeeringGatewayId() == null) { - throw new NullPointerException("localPeeringGatewayId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getLocalPeeringGatewayId(), "localPeeringGatewayId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPrivateIpConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPrivateIpConverter.java index a6280fe8eb8..68ea4a35e6d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPrivateIpConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPrivateIpConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetPrivateIpRequest interceptRequest(GetPrivateIpRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetPrivateIpRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPrivateIpId() == null) { - throw new NullPointerException("privateIpId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPrivateIpId(), "privateIpId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpByIpAddressConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpByIpAddressConverter.java index 1cea9c1ef7e..357f285e070 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpByIpAddressConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpByIpAddressConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,10 @@ public static GetPublicIpByIpAddressRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetPublicIpByIpAddressRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getGetPublicIpByIpAddressDetails() == null) { - throw new NullPointerException("getPublicIpByIpAddressDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getGetPublicIpByIpAddressDetails(), + "getPublicIpByIpAddressDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpByPrivateIpIdConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpByPrivateIpIdConverter.java index 204e4554bed..a38a557eb75 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpByPrivateIpIdConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpByPrivateIpIdConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static GetPublicIpByPrivateIpIdRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetPublicIpByPrivateIpIdRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getGetPublicIpByPrivateIpIdDetails() == null) { - throw new NullPointerException("getPublicIpByPrivateIpIdDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getGetPublicIpByPrivateIpIdDetails(), + "getPublicIpByPrivateIpIdDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpConverter.java index 0ad8499c47f..31a8d651066 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetPublicIpConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetPublicIpRequest interceptRequest(GetPublicIpRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetPublicIpRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPublicIpId() == null) { - throw new NullPointerException("publicIpId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPublicIpId(), "publicIpId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRemotePeeringConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRemotePeeringConnectionConverter.java index 3929484c22f..d26f335a104 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRemotePeeringConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRemotePeeringConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,10 @@ public static GetRemotePeeringConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetRemotePeeringConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getRemotePeeringConnectionId() == null) { - throw new NullPointerException("remotePeeringConnectionId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getRemotePeeringConnectionId(), + "remotePeeringConnectionId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRouteTableConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRouteTableConverter.java index fa76b88d1fc..5465a4bd0ea 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRouteTableConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetRouteTableConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetRouteTableRequest interceptRequest(GetRouteTableRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetRouteTableRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getRtId() == null) { - throw new NullPointerException("rtId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getRtId(), "rtId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSecurityListConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSecurityListConverter.java index faeb94972ec..ae6c5101e30 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSecurityListConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSecurityListConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetSecurityListRequest interceptRequest(GetSecurityListRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetSecurityListRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSecurityListId() == null) { - throw new NullPointerException("securityListId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSecurityListId(), "securityListId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSubnetConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSubnetConverter.java index 49d23c8491e..4cb12f5d970 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSubnetConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetSubnetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetSubnetRequest interceptRequest(GetSubnetRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetSubnetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSubnetId() == null) { - throw new NullPointerException("subnetId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSubnetId(), "subnetId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVcnConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVcnConverter.java index a9f429fb540..a604345576e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVcnConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVcnConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetVcnRequest interceptRequest(GetVcnRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVcnRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVcnId(), "vcnId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVirtualCircuitConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVirtualCircuitConverter.java index c93f34ccbc2..036ee7aa47c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVirtualCircuitConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVirtualCircuitConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetVirtualCircuitRequest interceptRequest(GetVirtualCircuitRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVirtualCircuitRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVirtualCircuitId() == null) { - throw new NullPointerException("virtualCircuitId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVirtualCircuitId(), "virtualCircuitId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicAttachmentConverter.java index d3a72f8dc5d..f4d3b128f6a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicAttachmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetVnicAttachmentRequest interceptRequest(GetVnicAttachmentRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVnicAttachmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVnicAttachmentId() == null) { - throw new NullPointerException("vnicAttachmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVnicAttachmentId(), "vnicAttachmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicConverter.java index 6c66cd25a94..19cf9027482 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVnicConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetVnicRequest interceptRequest(GetVnicRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVnicRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVnicId() == null) { - throw new NullPointerException("vnicId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVnicId(), "vnicId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeAttachmentConverter.java index e700852c900..f0ca4e03942 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeAttachmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetVolumeAttachmentRequest interceptRequest(GetVolumeAttachmentReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVolumeAttachmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVolumeAttachmentId() == null) { - throw new NullPointerException("volumeAttachmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVolumeAttachmentId(), "volumeAttachmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupConverter.java index fe3c1ad3b90..70d7cb35b01 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetVolumeBackupRequest interceptRequest(GetVolumeBackupRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVolumeBackupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVolumeBackupId() == null) { - throw new NullPointerException("volumeBackupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVolumeBackupId(), "volumeBackupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyAssetAssignmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyAssetAssignmentConverter.java index 3c63aca1eb7..d58140cb1ab 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyAssetAssignmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyAssetAssignmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static GetVolumeBackupPolicyAssetAssignmentRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVolumeBackupPolicyAssetAssignmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getAssetId() == null) { - throw new NullPointerException("assetId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getAssetId(), "assetId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("volumeBackupPolicyAssignments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyAssignmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyAssignmentConverter.java index e2794ae14d1..0195532b02c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyAssignmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyAssignmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static GetVolumeBackupPolicyAssignmentRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVolumeBackupPolicyAssignmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPolicyAssignmentId() == null) { - throw new NullPointerException("policyAssignmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPolicyAssignmentId(), "policyAssignmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyConverter.java index be681896890..31bc8610a77 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeBackupPolicyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static GetVolumeBackupPolicyRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVolumeBackupPolicyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPolicyId() == null) { - throw new NullPointerException("policyId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPolicyId(), "policyId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeConverter.java index b1703d4d3ea..e758b00c0c7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 GetVolumeRequest interceptRequest(GetVolumeRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVolumeId() == null) { - throw new NullPointerException("volumeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVolumeId(), "volumeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetWindowsInstanceInitialCredentialsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetWindowsInstanceInitialCredentialsConverter.java index 92af660c9fc..170db105e6f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetWindowsInstanceInitialCredentialsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetWindowsInstanceInitialCredentialsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static GetWindowsInstanceInitialCredentialsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetWindowsInstanceInitialCredentialsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceId() == null) { - throw new NullPointerException("instanceId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getInstanceId(), "instanceId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/InstanceActionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/InstanceActionConverter.java index 9a996d37c30..b17e1b68e12 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/InstanceActionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/InstanceActionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static InstanceActionRequest interceptRequest(InstanceActionRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, InstanceActionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceId() == null) { - throw new NullPointerException("instanceId is required"); - } - - if (request.getAction() == null) { - throw new NullPointerException("action is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getInstanceId(), "instanceId must not be blank"); + Validate.notNull(request.getAction(), "action is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/LaunchInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/LaunchInstanceConverter.java index 7af04706cdc..be4f0b1a384 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/LaunchInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/LaunchInstanceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 LaunchInstanceRequest interceptRequest(LaunchInstanceRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, LaunchInstanceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLaunchInstanceDetails() == null) { - throw new NullPointerException("launchInstanceDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getLaunchInstanceDetails(), "launchInstanceDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("instances"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListAllowedPeerRegionsForRemotePeeringConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListAllowedPeerRegionsForRemotePeeringConverter.java index 07b125f17a6..73211fb5eeb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListAllowedPeerRegionsForRemotePeeringConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListAllowedPeerRegionsForRemotePeeringConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,9 +24,7 @@ public static ListAllowedPeerRegionsForRemotePeeringRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListAllowedPeerRegionsForRemotePeeringRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } + Validate.notNull(request, "request instance is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("allowedPeerRegionsForRemotePeering"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumeAttachmentsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumeAttachmentsConverter.java index c4cbea781e8..4797bf53676 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumeAttachmentsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumeAttachmentsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,9 @@ public static ListBootVolumeAttachmentsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListBootVolumeAttachmentsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getAvailabilityDomain() == null) { - throw new NullPointerException("availabilityDomain is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getAvailabilityDomain(), "availabilityDomain is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("bootVolumeAttachments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumesConverter.java index bb2728768ae..69f40eed97d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListBootVolumesRequest interceptRequest(ListBootVolumesRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListBootVolumesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getAvailabilityDomain() == null) { - throw new NullPointerException("availabilityDomain is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getAvailabilityDomain(), "availabilityDomain is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("bootVolumes"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListConsoleHistoriesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListConsoleHistoriesConverter.java index 055261c3333..fe055b87f30 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListConsoleHistoriesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListConsoleHistoriesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static ListConsoleHistoriesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListConsoleHistoriesRequest 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("instanceConsoleHistories"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCpesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCpesConverter.java index b078f60e1e9..7608d197f5c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCpesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCpesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListCpesRequest interceptRequest(ListCpesRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListCpesRequest 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("cpes"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectGroupsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectGroupsConverter.java index cf679c4aa13..842700a1c3e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectGroupsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectGroupsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static ListCrossConnectGroupsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListCrossConnectGroupsRequest 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("crossConnectGroups"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectLocationsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectLocationsConverter.java index 809b40226c4..c6edc57801a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectLocationsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectLocationsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListCrossConnectLocationsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListCrossConnectLocationsRequest 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("crossConnectLocations"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectsConverter.java index c8764ff9c4b..0a7d9420b8a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossConnectsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListCrossConnectsRequest interceptRequest(ListCrossConnectsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListCrossConnectsRequest 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("crossConnects"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossconnectPortSpeedShapesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossconnectPortSpeedShapesConverter.java index 05ab2267720..5cc8505024a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossconnectPortSpeedShapesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListCrossconnectPortSpeedShapesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListCrossconnectPortSpeedShapesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListCrossconnectPortSpeedShapesRequest 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("crossConnectPortSpeedShapes"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDhcpOptionsConverter.java index f9e5240ae78..9560eb20f97 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDhcpOptionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListDhcpOptionsRequest interceptRequest(ListDhcpOptionsRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDhcpOptionsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getVcnId(), "vcnId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("dhcps"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgAttachmentsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgAttachmentsConverter.java index 63ed7522a49..e77ba88ca7a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgAttachmentsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgAttachmentsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListDrgAttachmentsRequest interceptRequest(ListDrgAttachmentsReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDrgAttachmentsRequest 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("drgAttachments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgsConverter.java index ee743d48134..d91d29726a1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListDrgsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListDrgsRequest interceptRequest(ListDrgsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDrgsRequest 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("drgs"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListFastConnectProviderServicesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListFastConnectProviderServicesConverter.java index 6da62947cc1..dc7c1b30a10 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListFastConnectProviderServicesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListFastConnectProviderServicesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListFastConnectProviderServicesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListFastConnectProviderServicesRequest 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("fastConnectProviderServices"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListFastConnectProviderVirtualCircuitBandwidthShapesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListFastConnectProviderVirtualCircuitBandwidthShapesConverter.java index f111671fe89..b6c6fa5e7b8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListFastConnectProviderVirtualCircuitBandwidthShapesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListFastConnectProviderVirtualCircuitBandwidthShapesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListFastConnectProviderVirtualCircuitBandwidthShapesRequest interc public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListFastConnectProviderVirtualCircuitBandwidthShapesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getProviderServiceId() == null) { - throw new NullPointerException("providerServiceId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getProviderServiceId(), "providerServiceId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListIPSecConnectionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListIPSecConnectionsConverter.java index 00c3c2de42d..cf65288054b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListIPSecConnectionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListIPSecConnectionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static ListIPSecConnectionsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListIPSecConnectionsRequest 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("ipsecConnections"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListImagesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListImagesConverter.java index 28b9299ee43..11786fc6ffe 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListImagesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListImagesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListImagesRequest interceptRequest(ListImagesRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListImagesRequest 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("images"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstanceConsoleConnectionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstanceConsoleConnectionsConverter.java index 41d78049f71..a14737c20e6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstanceConsoleConnectionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstanceConsoleConnectionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListInstanceConsoleConnectionsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListInstanceConsoleConnectionsRequest 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("instanceConsoleConnections"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstancesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstancesConverter.java index 5503b9a747c..ba3b315a316 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstancesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInstancesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListInstancesRequest interceptRequest(ListInstancesRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListInstancesRequest 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("instances"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInternetGatewaysConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInternetGatewaysConverter.java index 55268d995a5..a8054382a49 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInternetGatewaysConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListInternetGatewaysConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,9 @@ public static ListInternetGatewaysRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListInternetGatewaysRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getVcnId(), "vcnId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("internetGateways"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListLocalPeeringGatewaysConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListLocalPeeringGatewaysConverter.java index eb7bc684cba..e68169ca1fe 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListLocalPeeringGatewaysConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListLocalPeeringGatewaysConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,9 @@ public static ListLocalPeeringGatewaysRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListLocalPeeringGatewaysRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getVcnId(), "vcnId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("localPeeringGateways"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListPrivateIpsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListPrivateIpsConverter.java index 829e1865374..e4cefdaa39c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListPrivateIpsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListPrivateIpsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,9 +22,7 @@ public static ListPrivateIpsRequest interceptRequest(ListPrivateIpsRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListPrivateIpsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } + Validate.notNull(request, "request instance is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("privateIps"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListPublicIpsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListPublicIpsConverter.java index ff8a26b3b34..27f9e454872 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListPublicIpsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListPublicIpsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListPublicIpsRequest interceptRequest(ListPublicIpsRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListPublicIpsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getScope() == null) { - throw new NullPointerException("scope is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getScope(), "scope is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("publicIps"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRemotePeeringConnectionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRemotePeeringConnectionsConverter.java index cf7f7b17baa..b19cb418cad 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRemotePeeringConnectionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRemotePeeringConnectionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListRemotePeeringConnectionsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListRemotePeeringConnectionsRequest 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("remotePeeringConnections"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRouteTablesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRouteTablesConverter.java index 5f6c4f805f2..8b97946b5f2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRouteTablesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListRouteTablesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListRouteTablesRequest interceptRequest(ListRouteTablesRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListRouteTablesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getVcnId(), "vcnId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("routeTables"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSecurityListsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSecurityListsConverter.java index b2578abafb4..353bd1b9aa8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSecurityListsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSecurityListsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListSecurityListsRequest interceptRequest(ListSecurityListsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListSecurityListsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getVcnId(), "vcnId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("securityLists"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListShapesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListShapesConverter.java index 5b20e39a429..2a42aa03fec 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListShapesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListShapesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListShapesRequest interceptRequest(ListShapesRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListShapesRequest 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("shapes"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSubnetsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSubnetsConverter.java index cf4e623e846..596514c1717 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSubnetsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListSubnetsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListSubnetsRequest interceptRequest(ListSubnetsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListSubnetsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getVcnId(), "vcnId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("subnets"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVcnsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVcnsConverter.java index 9e3cbf34eaf..bf919b53712 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVcnsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVcnsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListVcnsRequest interceptRequest(ListVcnsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVcnsRequest 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("vcns"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitBandwidthShapesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitBandwidthShapesConverter.java index 599f9765a70..dc393ec0d67 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitBandwidthShapesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitBandwidthShapesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListVirtualCircuitBandwidthShapesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVirtualCircuitBandwidthShapesRequest 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("virtualCircuitBandwidthShapes"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitPublicPrefixesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitPublicPrefixesConverter.java index d86fd407603..202c5a866a7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitPublicPrefixesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitPublicPrefixesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListVirtualCircuitPublicPrefixesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVirtualCircuitPublicPrefixesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVirtualCircuitId() == null) { - throw new NullPointerException("virtualCircuitId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVirtualCircuitId(), "virtualCircuitId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitsConverter.java index b3f338828f8..7520e0f4f93 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVirtualCircuitsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListVirtualCircuitsRequest interceptRequest(ListVirtualCircuitsReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVirtualCircuitsRequest 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("virtualCircuits"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVnicAttachmentsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVnicAttachmentsConverter.java index 0028d5dd089..8a7d478d40c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVnicAttachmentsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVnicAttachmentsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListVnicAttachmentsRequest interceptRequest(ListVnicAttachmentsReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVnicAttachmentsRequest 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("vnicAttachments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeAttachmentsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeAttachmentsConverter.java index 32be6899562..3baf17e474c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeAttachmentsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeAttachmentsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static ListVolumeAttachmentsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVolumeAttachmentsRequest 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("volumeAttachments"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupPoliciesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupPoliciesConverter.java index 98d9dac47b7..a73bf365f8f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupPoliciesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupPoliciesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,9 +24,7 @@ public static ListVolumeBackupPoliciesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVolumeBackupPoliciesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } + Validate.notNull(request, "request instance is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("volumeBackupPolicies"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupsConverter.java index f25d19aa052..210d4e72902 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumeBackupsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListVolumeBackupsRequest interceptRequest(ListVolumeBackupsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVolumeBackupsRequest 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("volumeBackups"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumesConverter.java index cc0cd350f99..0c923a41c25 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumesConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListVolumesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 ListVolumesRequest interceptRequest(ListVolumesRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListVolumesRequest 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("volumes"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java index 8aa69f871ef..c1ad7851fb8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.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 TerminateInstanceRequest interceptRequest(TerminateInstanceRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, TerminateInstanceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceId() == null) { - throw new NullPointerException("instanceId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getInstanceId(), "instanceId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateBootVolumeConverter.java index 3e91796ac9a..2c5fc208f3c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateBootVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateBootVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateBootVolumeRequest interceptRequest(UpdateBootVolumeRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateBootVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getBootVolumeId() == null) { - throw new NullPointerException("bootVolumeId is required"); - } - - if (request.getUpdateBootVolumeDetails() == null) { - throw new NullPointerException("updateBootVolumeDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getBootVolumeId(), "bootVolumeId must not be blank"); + Validate.notNull( + request.getUpdateBootVolumeDetails(), "updateBootVolumeDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateConsoleHistoryConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateConsoleHistoryConverter.java index 5eaec7cc694..8490a61faa7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateConsoleHistoryConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateConsoleHistoryConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,13 @@ public static UpdateConsoleHistoryRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateConsoleHistoryRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceConsoleHistoryId() == null) { - throw new NullPointerException("instanceConsoleHistoryId is required"); - } - - if (request.getUpdateConsoleHistoryDetails() == null) { - throw new NullPointerException("updateConsoleHistoryDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getInstanceConsoleHistoryId(), + "instanceConsoleHistoryId must not be blank"); + Validate.notNull( + request.getUpdateConsoleHistoryDetails(), + "updateConsoleHistoryDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCpeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCpeConverter.java index 781ca705597..675a0c34686 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCpeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCpeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateCpeRequest interceptRequest(UpdateCpeRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateCpeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCpeId() == null) { - throw new NullPointerException("cpeId is required"); - } - - if (request.getUpdateCpeDetails() == null) { - throw new NullPointerException("updateCpeDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCpeId(), "cpeId must not be blank"); + Validate.notNull(request.getUpdateCpeDetails(), "updateCpeDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCrossConnectConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCrossConnectConverter.java index 6ffdc966db6..49bed356482 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCrossConnectConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCrossConnectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateCrossConnectRequest interceptRequest(UpdateCrossConnectReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateCrossConnectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCrossConnectId() == null) { - throw new NullPointerException("crossConnectId is required"); - } - - if (request.getUpdateCrossConnectDetails() == null) { - throw new NullPointerException("updateCrossConnectDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCrossConnectId(), "crossConnectId must not be blank"); + Validate.notNull( + request.getUpdateCrossConnectDetails(), "updateCrossConnectDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCrossConnectGroupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCrossConnectGroupConverter.java index e788c3794b8..09f8723c2b9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCrossConnectGroupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateCrossConnectGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,12 @@ public static UpdateCrossConnectGroupRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateCrossConnectGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCrossConnectGroupId() == null) { - throw new NullPointerException("crossConnectGroupId is required"); - } - - if (request.getUpdateCrossConnectGroupDetails() == null) { - throw new NullPointerException("updateCrossConnectGroupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getCrossConnectGroupId(), "crossConnectGroupId must not be blank"); + Validate.notNull( + request.getUpdateCrossConnectGroupDetails(), + "updateCrossConnectGroupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDhcpOptionsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDhcpOptionsConverter.java index 3b8d146f043..a1c3e2af548 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDhcpOptionsConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDhcpOptionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateDhcpOptionsRequest interceptRequest(UpdateDhcpOptionsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateDhcpOptionsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDhcpId() == null) { - throw new NullPointerException("dhcpId is required"); - } - - if (request.getUpdateDhcpDetails() == null) { - throw new NullPointerException("updateDhcpDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDhcpId(), "dhcpId must not be blank"); + Validate.notNull(request.getUpdateDhcpDetails(), "updateDhcpDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgAttachmentConverter.java index 27693620a91..e09479127ee 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgAttachmentConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgAttachmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateDrgAttachmentRequest interceptRequest(UpdateDrgAttachmentReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateDrgAttachmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDrgAttachmentId() == null) { - throw new NullPointerException("drgAttachmentId is required"); - } - - if (request.getUpdateDrgAttachmentDetails() == null) { - throw new NullPointerException("updateDrgAttachmentDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDrgAttachmentId(), "drgAttachmentId must not be blank"); + Validate.notNull( + request.getUpdateDrgAttachmentDetails(), "updateDrgAttachmentDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgConverter.java index 0406ca38aea..51b3ba8134e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateDrgConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateDrgRequest interceptRequest(UpdateDrgRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateDrgRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDrgId() == null) { - throw new NullPointerException("drgId is required"); - } - - if (request.getUpdateDrgDetails() == null) { - throw new NullPointerException("updateDrgDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDrgId(), "drgId must not be blank"); + Validate.notNull(request.getUpdateDrgDetails(), "updateDrgDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateIPSecConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateIPSecConnectionConverter.java index f3e19798eb3..adf436aa2bc 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateIPSecConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateIPSecConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,11 @@ public static UpdateIPSecConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateIPSecConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIpscId() == null) { - throw new NullPointerException("ipscId is required"); - } - - if (request.getUpdateIPSecConnectionDetails() == null) { - throw new NullPointerException("updateIPSecConnectionDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIpscId(), "ipscId must not be blank"); + Validate.notNull( + request.getUpdateIPSecConnectionDetails(), + "updateIPSecConnectionDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateImageConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateImageConverter.java index 7d0e0799eae..40700d32784 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateImageConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateImageConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateImageRequest interceptRequest(UpdateImageRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateImageRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getImageId() == null) { - throw new NullPointerException("imageId is required"); - } - - if (request.getUpdateImageDetails() == null) { - throw new NullPointerException("updateImageDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getImageId(), "imageId must not be blank"); + Validate.notNull(request.getUpdateImageDetails(), "updateImageDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInstanceConverter.java index 418b683ae14..2ac981ace93 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInstanceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateInstanceRequest interceptRequest(UpdateInstanceRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateInstanceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getInstanceId() == null) { - throw new NullPointerException("instanceId is required"); - } - - if (request.getUpdateInstanceDetails() == null) { - throw new NullPointerException("updateInstanceDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getInstanceId(), "instanceId must not be blank"); + Validate.notNull(request.getUpdateInstanceDetails(), "updateInstanceDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInternetGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInternetGatewayConverter.java index 4b0d7d15a97..e5ef54d597e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInternetGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateInternetGatewayConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,11 @@ public static UpdateInternetGatewayRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateInternetGatewayRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIgId() == null) { - throw new NullPointerException("igId is required"); - } - - if (request.getUpdateInternetGatewayDetails() == null) { - throw new NullPointerException("updateInternetGatewayDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIgId(), "igId must not be blank"); + Validate.notNull( + request.getUpdateInternetGatewayDetails(), + "updateInternetGatewayDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateLocalPeeringGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateLocalPeeringGatewayConverter.java index 60346a9d872..ee06db95512 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateLocalPeeringGatewayConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateLocalPeeringGatewayConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,12 @@ public static UpdateLocalPeeringGatewayRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateLocalPeeringGatewayRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLocalPeeringGatewayId() == null) { - throw new NullPointerException("localPeeringGatewayId is required"); - } - - if (request.getUpdateLocalPeeringGatewayDetails() == null) { - throw new NullPointerException("updateLocalPeeringGatewayDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getLocalPeeringGatewayId(), "localPeeringGatewayId must not be blank"); + Validate.notNull( + request.getUpdateLocalPeeringGatewayDetails(), + "updateLocalPeeringGatewayDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdatePrivateIpConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdatePrivateIpConverter.java index 69c92dc6b4a..5f5acd25ea5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdatePrivateIpConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdatePrivateIpConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdatePrivateIpRequest interceptRequest(UpdatePrivateIpRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdatePrivateIpRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPrivateIpId() == null) { - throw new NullPointerException("privateIpId is required"); - } - - if (request.getUpdatePrivateIpDetails() == null) { - throw new NullPointerException("updatePrivateIpDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPrivateIpId(), "privateIpId must not be blank"); + Validate.notNull(request.getUpdatePrivateIpDetails(), "updatePrivateIpDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdatePublicIpConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdatePublicIpConverter.java index e738ed02fb7..f529248b519 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdatePublicIpConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdatePublicIpConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdatePublicIpRequest interceptRequest(UpdatePublicIpRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdatePublicIpRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPublicIpId() == null) { - throw new NullPointerException("publicIpId is required"); - } - - if (request.getUpdatePublicIpDetails() == null) { - throw new NullPointerException("updatePublicIpDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPublicIpId(), "publicIpId must not be blank"); + Validate.notNull(request.getUpdatePublicIpDetails(), "updatePublicIpDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRemotePeeringConnectionConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRemotePeeringConnectionConverter.java index 400dad9d2eb..1208825446e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRemotePeeringConnectionConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRemotePeeringConnectionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,13 @@ public static UpdateRemotePeeringConnectionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateRemotePeeringConnectionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getRemotePeeringConnectionId() == null) { - throw new NullPointerException("remotePeeringConnectionId is required"); - } - - if (request.getUpdateRemotePeeringConnectionDetails() == null) { - throw new NullPointerException("updateRemotePeeringConnectionDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getRemotePeeringConnectionId(), + "remotePeeringConnectionId must not be blank"); + Validate.notNull( + request.getUpdateRemotePeeringConnectionDetails(), + "updateRemotePeeringConnectionDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRouteTableConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRouteTableConverter.java index 0ca1f4664d1..c7c72819879 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRouteTableConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateRouteTableConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateRouteTableRequest interceptRequest(UpdateRouteTableRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateRouteTableRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getRtId() == null) { - throw new NullPointerException("rtId is required"); - } - - if (request.getUpdateRouteTableDetails() == null) { - throw new NullPointerException("updateRouteTableDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getRtId(), "rtId must not be blank"); + Validate.notNull( + request.getUpdateRouteTableDetails(), "updateRouteTableDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSecurityListConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSecurityListConverter.java index eff68ff81be..1738a7a26e3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSecurityListConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSecurityListConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateSecurityListRequest interceptRequest(UpdateSecurityListReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateSecurityListRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSecurityListId() == null) { - throw new NullPointerException("securityListId is required"); - } - - if (request.getUpdateSecurityListDetails() == null) { - throw new NullPointerException("updateSecurityListDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSecurityListId(), "securityListId must not be blank"); + Validate.notNull( + request.getUpdateSecurityListDetails(), "updateSecurityListDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSubnetConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSubnetConverter.java index f87c4a18016..c3f1bab80b5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSubnetConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateSubnetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateSubnetRequest interceptRequest(UpdateSubnetRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateSubnetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSubnetId() == null) { - throw new NullPointerException("subnetId is required"); - } - - if (request.getUpdateSubnetDetails() == null) { - throw new NullPointerException("updateSubnetDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSubnetId(), "subnetId must not be blank"); + Validate.notNull(request.getUpdateSubnetDetails(), "updateSubnetDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVcnConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVcnConverter.java index 64bf899fcf3..ec480739298 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVcnConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVcnConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateVcnRequest interceptRequest(UpdateVcnRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateVcnRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVcnId() == null) { - throw new NullPointerException("vcnId is required"); - } - - if (request.getUpdateVcnDetails() == null) { - throw new NullPointerException("updateVcnDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVcnId(), "vcnId must not be blank"); + Validate.notNull(request.getUpdateVcnDetails(), "updateVcnDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVirtualCircuitConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVirtualCircuitConverter.java index faf4419de7e..8544d9dbcba 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVirtualCircuitConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVirtualCircuitConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,11 @@ public static UpdateVirtualCircuitRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateVirtualCircuitRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVirtualCircuitId() == null) { - throw new NullPointerException("virtualCircuitId is required"); - } - - if (request.getUpdateVirtualCircuitDetails() == null) { - throw new NullPointerException("updateVirtualCircuitDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVirtualCircuitId(), "virtualCircuitId must not be blank"); + Validate.notNull( + request.getUpdateVirtualCircuitDetails(), + "updateVirtualCircuitDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVnicConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVnicConverter.java index a0c37f1d2e1..0c5dae1c981 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVnicConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVnicConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateVnicRequest interceptRequest(UpdateVnicRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateVnicRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVnicId() == null) { - throw new NullPointerException("vnicId is required"); - } - - if (request.getUpdateVnicDetails() == null) { - throw new NullPointerException("updateVnicDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVnicId(), "vnicId must not be blank"); + Validate.notNull(request.getUpdateVnicDetails(), "updateVnicDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeBackupConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeBackupConverter.java index 61d5ff81b8d..ab992ac2a5e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeBackupConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeBackupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateVolumeBackupRequest interceptRequest(UpdateVolumeBackupReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateVolumeBackupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVolumeBackupId() == null) { - throw new NullPointerException("volumeBackupId is required"); - } - - if (request.getUpdateVolumeBackupDetails() == null) { - throw new NullPointerException("updateVolumeBackupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVolumeBackupId(), "volumeBackupId must not be blank"); + Validate.notNull( + request.getUpdateVolumeBackupDetails(), "updateVolumeBackupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeConverter.java index 828aa00694b..4d0b3f468b4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateVolumeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.core.model.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateVolumeRequest interceptRequest(UpdateVolumeRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateVolumeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getVolumeId() == null) { - throw new NullPointerException("volumeId is required"); - } - - if (request.getUpdateVolumeDetails() == null) { - throw new NullPointerException("updateVolumeDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getVolumeId(), "volumeId must not be blank"); + Validate.notNull(request.getUpdateVolumeDetails(), "updateVolumeDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/pom.xml b/bmc-database/pom.xml index f47c7bbcac7..8ded7771481 100644 --- a/bmc-database/pom.xml +++ b/bmc-database/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseAsyncClient.java b/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseAsyncClient.java index 5f3e03bf26d..244ea164313 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseAsyncClient.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseAsyncClient.java @@ -165,133 +165,24 @@ public DatabaseAsyncClient( * @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 - 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 - 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 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 { + 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 */ diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseClient.java b/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseClient.java index 04ea2006be7..2ff24e451f0 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseClient.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseClient.java @@ -187,135 +187,26 @@ public DatabaseClient( * @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 - 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 - 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 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 { + 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 DatabaseClient build( @lombok.NonNull diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateBackupConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateBackupConverter.java index f155c2604c5..209db9a7a8a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateBackupConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateBackupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 CreateBackupRequest interceptRequest(CreateBackupRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateBackupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateBackupDetails() == null) { - throw new NullPointerException("createBackupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateBackupDetails(), "createBackupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("backups"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateDataGuardAssociationConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateDataGuardAssociationConverter.java index fc0f639beed..ae0d8bbcd98 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateDataGuardAssociationConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateDataGuardAssociationConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,11 @@ public static CreateDataGuardAssociationRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateDataGuardAssociationRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } - - if (request.getCreateDataGuardAssociationDetails() == null) { - throw new NullPointerException("createDataGuardAssociationDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); + Validate.notNull( + request.getCreateDataGuardAssociationDetails(), + "createDataGuardAssociationDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateDbHomeConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateDbHomeConverter.java index 70ef83bfdaa..b76085d5ad4 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateDbHomeConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/CreateDbHomeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,10 @@ public static CreateDbHomeRequest interceptRequest(CreateDbHomeRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateDbHomeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateDbHomeWithDbSystemIdDetails() == null) { - throw new NullPointerException("createDbHomeWithDbSystemIdDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateDbHomeWithDbSystemIdDetails(), + "createDbHomeWithDbSystemIdDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("dbHomes"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DbNodeActionConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DbNodeActionConverter.java index 9b068a51d68..3677cc3d69d 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DbNodeActionConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DbNodeActionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DbNodeActionRequest interceptRequest(DbNodeActionRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DbNodeActionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbNodeId() == null) { - throw new NullPointerException("dbNodeId is required"); - } - - if (request.getAction() == null) { - throw new NullPointerException("action is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbNodeId(), "dbNodeId must not be blank"); + Validate.notNull(request.getAction(), "action is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DeleteBackupConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DeleteBackupConverter.java index 9c27efcab21..7c3460774d4 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DeleteBackupConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DeleteBackupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 DeleteBackupRequest interceptRequest(DeleteBackupRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteBackupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getBackupId() == null) { - throw new NullPointerException("backupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getBackupId(), "backupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DeleteDbHomeConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DeleteDbHomeConverter.java index 7cbd0e3d9ba..324c05613bf 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DeleteDbHomeConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/DeleteDbHomeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 DeleteDbHomeRequest interceptRequest(DeleteDbHomeRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteDbHomeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbHomeId() == null) { - throw new NullPointerException("dbHomeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbHomeId(), "dbHomeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/FailoverDataGuardAssociationConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/FailoverDataGuardAssociationConverter.java index 5ff5513cac6..9a8c2d878a4 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/FailoverDataGuardAssociationConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/FailoverDataGuardAssociationConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,21 +24,13 @@ public static FailoverDataGuardAssociationRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, FailoverDataGuardAssociationRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } - - if (request.getDataGuardAssociationId() == null) { - throw new NullPointerException("dataGuardAssociationId is required"); - } - - if (request.getFailoverDataGuardAssociationDetails() == null) { - throw new NullPointerException("failoverDataGuardAssociationDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); + Validate.notBlank( + request.getDataGuardAssociationId(), "dataGuardAssociationId must not be blank"); + Validate.notNull( + request.getFailoverDataGuardAssociationDetails(), + "failoverDataGuardAssociationDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetBackupConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetBackupConverter.java index c68e59c77e9..027e50f5d3c 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetBackupConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetBackupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 GetBackupRequest interceptRequest(GetBackupRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetBackupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getBackupId() == null) { - throw new NullPointerException("backupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getBackupId(), "backupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDataGuardAssociationConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDataGuardAssociationConverter.java index bae6601043b..7169ba5d0cb 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDataGuardAssociationConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDataGuardAssociationConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,10 @@ public static GetDataGuardAssociationRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDataGuardAssociationRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } - - if (request.getDataGuardAssociationId() == null) { - throw new NullPointerException("dataGuardAssociationId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); + Validate.notBlank( + request.getDataGuardAssociationId(), "dataGuardAssociationId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDatabaseConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDatabaseConverter.java index 58dbff1033a..2cd19f06944 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDatabaseConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDatabaseConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 GetDatabaseRequest interceptRequest(GetDatabaseRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDatabaseRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomeConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomeConverter.java index 45acd6692ea..5ee39ccf5be 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomeConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 GetDbHomeRequest interceptRequest(GetDbHomeRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDbHomeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbHomeId() == null) { - throw new NullPointerException("dbHomeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbHomeId(), "dbHomeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomePatchConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomePatchConverter.java index 987600fbf87..ad24d57a028 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomePatchConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomePatchConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetDbHomePatchRequest interceptRequest(GetDbHomePatchRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDbHomePatchRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbHomeId() == null) { - throw new NullPointerException("dbHomeId is required"); - } - - if (request.getPatchId() == null) { - throw new NullPointerException("patchId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbHomeId(), "dbHomeId must not be blank"); + Validate.notBlank(request.getPatchId(), "patchId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomePatchHistoryEntryConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomePatchHistoryEntryConverter.java index 5c48d2ac2b3..538b6a2354f 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomePatchHistoryEntryConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbHomePatchHistoryEntryConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,10 @@ public static GetDbHomePatchHistoryEntryRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDbHomePatchHistoryEntryRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbHomeId() == null) { - throw new NullPointerException("dbHomeId is required"); - } - - if (request.getPatchHistoryEntryId() == null) { - throw new NullPointerException("patchHistoryEntryId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbHomeId(), "dbHomeId must not be blank"); + Validate.notBlank( + request.getPatchHistoryEntryId(), "patchHistoryEntryId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbNodeConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbNodeConverter.java index 6574a00803d..3fdea65a3ef 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbNodeConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbNodeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 GetDbNodeRequest interceptRequest(GetDbNodeRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDbNodeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbNodeId() == null) { - throw new NullPointerException("dbNodeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbNodeId(), "dbNodeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemConverter.java index 101a56d3a29..f097951f33f 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 GetDbSystemRequest interceptRequest(GetDbSystemRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDbSystemRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbSystemId(), "dbSystemId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemPatchConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemPatchConverter.java index c941d530386..1e09c3982ae 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemPatchConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemPatchConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetDbSystemPatchRequest interceptRequest(GetDbSystemPatchRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDbSystemPatchRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } - - if (request.getPatchId() == null) { - throw new NullPointerException("patchId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbSystemId(), "dbSystemId must not be blank"); + Validate.notBlank(request.getPatchId(), "patchId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemPatchHistoryEntryConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemPatchHistoryEntryConverter.java index 69212f5c8ed..23a9a7c970c 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemPatchHistoryEntryConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GetDbSystemPatchHistoryEntryConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,10 @@ public static GetDbSystemPatchHistoryEntryRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDbSystemPatchHistoryEntryRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } - - if (request.getPatchHistoryEntryId() == null) { - throw new NullPointerException("patchHistoryEntryId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbSystemId(), "dbSystemId must not be blank"); + Validate.notBlank( + request.getPatchHistoryEntryId(), "patchHistoryEntryId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/LaunchDbSystemConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/LaunchDbSystemConverter.java index 3a4d654745f..40d30f0bdd2 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/LaunchDbSystemConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/LaunchDbSystemConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 LaunchDbSystemRequest interceptRequest(LaunchDbSystemRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, LaunchDbSystemRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLaunchDbSystemDetails() == null) { - throw new NullPointerException("launchDbSystemDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getLaunchDbSystemDetails(), "launchDbSystemDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("dbSystems"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListBackupsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListBackupsConverter.java index be9caff653b..498b4fb2573 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListBackupsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListBackupsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,9 +22,7 @@ public static ListBackupsRequest interceptRequest(ListBackupsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListBackupsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } + Validate.notNull(request, "request instance is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("backups"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDataGuardAssociationsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDataGuardAssociationsConverter.java index fcaaeb81bc8..4c935b2bee3 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDataGuardAssociationsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDataGuardAssociationsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListDataGuardAssociationsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDataGuardAssociationsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDatabasesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDatabasesConverter.java index db381923c6b..4a95b4337f9 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDatabasesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDatabasesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListDatabasesRequest interceptRequest(ListDatabasesRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDatabasesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getDbHomeId() == null) { - throw new NullPointerException("dbHomeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getDbHomeId(), "dbHomeId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("databases"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchHistoryEntriesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchHistoryEntriesConverter.java index eba3365eadb..7f2a9dc9ee8 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchHistoryEntriesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchHistoryEntriesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListDbHomePatchHistoryEntriesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbHomePatchHistoryEntriesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbHomeId() == null) { - throw new NullPointerException("dbHomeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbHomeId(), "dbHomeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchesConverter.java index aeda0ebb076..552076a7a77 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 ListDbHomePatchesRequest interceptRequest(ListDbHomePatchesRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbHomePatchesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbHomeId() == null) { - throw new NullPointerException("dbHomeId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbHomeId(), "dbHomeId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomesConverter.java index d7994da679b..0c3414a8f0e 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListDbHomesRequest interceptRequest(ListDbHomesRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbHomesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getDbSystemId(), "dbSystemId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("dbHomes"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbNodesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbNodesConverter.java index a6f71ee1e2b..40834e6a9a6 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbNodesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbNodesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListDbNodesRequest interceptRequest(ListDbNodesRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbNodesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getDbSystemId(), "dbSystemId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("dbNodes"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchHistoryEntriesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchHistoryEntriesConverter.java index 1489f245586..afe6a005aa0 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchHistoryEntriesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchHistoryEntriesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListDbSystemPatchHistoryEntriesRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbSystemPatchHistoryEntriesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbSystemId(), "dbSystemId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchesConverter.java index 2f0e2626978..bfde305fabc 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 ListDbSystemPatchesRequest interceptRequest(ListDbSystemPatchesReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbSystemPatchesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbSystemId(), "dbSystemId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemShapesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemShapesConverter.java index 6a1386c353a..e5a1070a034 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemShapesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemShapesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListDbSystemShapesRequest interceptRequest(ListDbSystemShapesReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbSystemShapesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getAvailabilityDomain() == null) { - throw new NullPointerException("availabilityDomain is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getAvailabilityDomain(), "availabilityDomain is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("dbSystemShapes"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemsConverter.java index b1b4c5f4a7f..d744f92d463 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 ListDbSystemsRequest interceptRequest(ListDbSystemsRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbSystemsRequest 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("dbSystems"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbVersionsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbVersionsConverter.java index 186e141981a..0473a43d14b 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbVersionsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbVersionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 ListDbVersionsRequest interceptRequest(ListDbVersionsRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDbVersionsRequest 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("dbVersions"); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ReinstateDataGuardAssociationConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ReinstateDataGuardAssociationConverter.java index c8c0bfab229..0ced64f8c21 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ReinstateDataGuardAssociationConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ReinstateDataGuardAssociationConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,21 +24,13 @@ public static ReinstateDataGuardAssociationRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ReinstateDataGuardAssociationRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } - - if (request.getDataGuardAssociationId() == null) { - throw new NullPointerException("dataGuardAssociationId is required"); - } - - if (request.getReinstateDataGuardAssociationDetails() == null) { - throw new NullPointerException("reinstateDataGuardAssociationDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); + Validate.notBlank( + request.getDataGuardAssociationId(), "dataGuardAssociationId must not be blank"); + Validate.notNull( + request.getReinstateDataGuardAssociationDetails(), + "reinstateDataGuardAssociationDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/RestoreDatabaseConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/RestoreDatabaseConverter.java index cf33bdce83a..7f674975434 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/RestoreDatabaseConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/RestoreDatabaseConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static RestoreDatabaseRequest interceptRequest(RestoreDatabaseRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, RestoreDatabaseRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } - - if (request.getRestoreDatabaseDetails() == null) { - throw new NullPointerException("restoreDatabaseDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); + Validate.notNull(request.getRestoreDatabaseDetails(), "restoreDatabaseDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/SwitchoverDataGuardAssociationConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/SwitchoverDataGuardAssociationConverter.java index eb0736225d6..44298d25d1a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/SwitchoverDataGuardAssociationConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/SwitchoverDataGuardAssociationConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,21 +24,13 @@ public static SwitchoverDataGuardAssociationRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, SwitchoverDataGuardAssociationRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } - - if (request.getDataGuardAssociationId() == null) { - throw new NullPointerException("dataGuardAssociationId is required"); - } - - if (request.getSwitchoverDataGuardAssociationDetails() == null) { - throw new NullPointerException("switchoverDataGuardAssociationDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); + Validate.notBlank( + request.getDataGuardAssociationId(), "dataGuardAssociationId must not be blank"); + Validate.notNull( + request.getSwitchoverDataGuardAssociationDetails(), + "switchoverDataGuardAssociationDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/TerminateDbSystemConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/TerminateDbSystemConverter.java index 2b7e6e6eb2e..6556c787f96 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/TerminateDbSystemConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/TerminateDbSystemConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.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 TerminateDbSystemRequest interceptRequest(TerminateDbSystemRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, TerminateDbSystemRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbSystemId(), "dbSystemId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDatabaseConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDatabaseConverter.java index 5110f7feda2..c95c711695a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDatabaseConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDatabaseConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateDatabaseRequest interceptRequest(UpdateDatabaseRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateDatabaseRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDatabaseId() == null) { - throw new NullPointerException("databaseId is required"); - } - - if (request.getUpdateDatabaseDetails() == null) { - throw new NullPointerException("updateDatabaseDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDatabaseId(), "databaseId must not be blank"); + Validate.notNull(request.getUpdateDatabaseDetails(), "updateDatabaseDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDbHomeConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDbHomeConverter.java index 490e739832e..42dbb533e4e 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDbHomeConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDbHomeConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateDbHomeRequest interceptRequest(UpdateDbHomeRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateDbHomeRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbHomeId() == null) { - throw new NullPointerException("dbHomeId is required"); - } - - if (request.getUpdateDbHomeDetails() == null) { - throw new NullPointerException("updateDbHomeDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbHomeId(), "dbHomeId must not be blank"); + Validate.notNull(request.getUpdateDbHomeDetails(), "updateDbHomeDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDbSystemConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDbSystemConverter.java index 5cd09d9cdce..3e926799e92 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDbSystemConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/UpdateDbSystemConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.database.model.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateDbSystemRequest interceptRequest(UpdateDbSystemRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateDbSystemRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDbSystemId() == null) { - throw new NullPointerException("dbSystemId is required"); - } - - if (request.getUpdateDbSystemDetails() == null) { - throw new NullPointerException("updateDbSystemDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDbSystemId(), "dbSystemId must not be blank"); + Validate.notNull(request.getUpdateDbSystemDetails(), "updateDbSystemDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/pom.xml b/bmc-dns/pom.xml index 4a3d4879841..6bbe01fb7a9 100644 --- a/bmc-dns/pom.xml +++ b/bmc-dns/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsAsyncClient.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsAsyncClient.java index aba60121aa9..1f698908e8e 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsAsyncClient.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsAsyncClient.java @@ -165,133 +165,24 @@ public DnsAsyncClient( * @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 - 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 - 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 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 { + 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 */ diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsClient.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsClient.java index a9b99f387a0..ca608bda374 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsClient.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsClient.java @@ -187,135 +187,26 @@ public DnsClient( * @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 - 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 - 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 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 { + 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 DnsClient build( @lombok.NonNull diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/CreateZoneConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/CreateZoneConverter.java index 5b3c4ce3d4a..8694de0ce02 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/CreateZoneConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/CreateZoneConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static CreateZoneRequest interceptRequest(CreateZoneRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateZoneRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateZoneDetails() == null) { - throw new NullPointerException("createZoneDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateZoneDetails(), "createZoneDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20180115").path("zones"); diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteDomainRecordsConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteDomainRecordsConverter.java index 09e97e11eb0..bdff09a3b97 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteDomainRecordsConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteDomainRecordsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DeleteDomainRecordsRequest interceptRequest(DeleteDomainRecordsReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteDomainRecordsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getDomain() == null) { - throw new NullPointerException("domain is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notBlank(request.getDomain(), "domain must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteRRSetConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteRRSetConverter.java index 9a90d6e8f48..704612b4d34 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteRRSetConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteRRSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,10 @@ public static DeleteRRSetRequest interceptRequest(DeleteRRSetRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteRRSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getDomain() == null) { - throw new NullPointerException("domain is required"); - } - - if (request.getRtype() == null) { - throw new NullPointerException("rtype is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notBlank(request.getDomain(), "domain must not be blank"); + Validate.notBlank(request.getRtype(), "rtype must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteZoneConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteZoneConverter.java index 7b526eaadbd..9402ce84cec 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteZoneConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/DeleteZoneConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static DeleteZoneRequest interceptRequest(DeleteZoneRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteZoneRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetDomainRecordsConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetDomainRecordsConverter.java index 1901cb1ac52..3749490b8c7 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetDomainRecordsConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetDomainRecordsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetDomainRecordsRequest interceptRequest(GetDomainRecordsRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDomainRecordsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getDomain() == null) { - throw new NullPointerException("domain is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notBlank(request.getDomain(), "domain must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetRRSetConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetRRSetConverter.java index 1db01a48b25..5e1d9cfef95 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetRRSetConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetRRSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,10 @@ public static GetRRSetRequest interceptRequest(GetRRSetRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetRRSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getDomain() == null) { - throw new NullPointerException("domain is required"); - } - - if (request.getRtype() == null) { - throw new NullPointerException("rtype is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notBlank(request.getDomain(), "domain must not be blank"); + Validate.notBlank(request.getRtype(), "rtype must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetZoneConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetZoneConverter.java index c2b85b4befb..75f048fa780 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetZoneConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetZoneConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetZoneRequest interceptRequest(GetZoneRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetZoneRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetZoneRecordsConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetZoneRecordsConverter.java index 403559e3b66..7221d1fd1e9 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetZoneRecordsConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/GetZoneRecordsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetZoneRecordsRequest interceptRequest(GetZoneRecordsRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetZoneRecordsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/ListZonesConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/ListZonesConverter.java index b8f87710f82..56dd71c70e9 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/ListZonesConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/ListZonesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListZonesRequest interceptRequest(ListZonesRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListZonesRequest 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("/20180115").path("zones"); diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchDomainRecordsConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchDomainRecordsConverter.java index 336d1887e09..43645e1a0d4 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchDomainRecordsConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchDomainRecordsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,11 @@ public static PatchDomainRecordsRequest interceptRequest(PatchDomainRecordsReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, PatchDomainRecordsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getDomain() == null) { - throw new NullPointerException("domain is required"); - } - - if (request.getPatchDomainRecordsDetails() == null) { - throw new NullPointerException("patchDomainRecordsDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notBlank(request.getDomain(), "domain must not be blank"); + Validate.notNull( + request.getPatchDomainRecordsDetails(), "patchDomainRecordsDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchRRSetConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchRRSetConverter.java index 76b9df56a73..acf6624952e 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchRRSetConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchRRSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,25 +22,11 @@ public static PatchRRSetRequest interceptRequest(PatchRRSetRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, PatchRRSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getDomain() == null) { - throw new NullPointerException("domain is required"); - } - - if (request.getRtype() == null) { - throw new NullPointerException("rtype is required"); - } - - if (request.getPatchRRSetDetails() == null) { - throw new NullPointerException("patchRRSetDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notBlank(request.getDomain(), "domain must not be blank"); + Validate.notBlank(request.getRtype(), "rtype must not be blank"); + Validate.notNull(request.getPatchRRSetDetails(), "patchRRSetDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchZoneRecordsConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchZoneRecordsConverter.java index 686c682f8bc..49283d8a48b 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchZoneRecordsConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/PatchZoneRecordsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static PatchZoneRecordsRequest interceptRequest(PatchZoneRecordsRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, PatchZoneRecordsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getPatchZoneRecordsDetails() == null) { - throw new NullPointerException("patchZoneRecordsDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notNull( + request.getPatchZoneRecordsDetails(), "patchZoneRecordsDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateDomainRecordsConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateDomainRecordsConverter.java index f1a97be931e..1026e614dbf 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateDomainRecordsConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateDomainRecordsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,11 @@ public static UpdateDomainRecordsRequest interceptRequest(UpdateDomainRecordsReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateDomainRecordsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getDomain() == null) { - throw new NullPointerException("domain is required"); - } - - if (request.getUpdateDomainRecordsDetails() == null) { - throw new NullPointerException("updateDomainRecordsDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notBlank(request.getDomain(), "domain must not be blank"); + Validate.notNull( + request.getUpdateDomainRecordsDetails(), "updateDomainRecordsDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateRRSetConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateRRSetConverter.java index 1adbe320893..efd9ca69e66 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateRRSetConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateRRSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,25 +22,11 @@ public static UpdateRRSetRequest interceptRequest(UpdateRRSetRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateRRSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getDomain() == null) { - throw new NullPointerException("domain is required"); - } - - if (request.getRtype() == null) { - throw new NullPointerException("rtype is required"); - } - - if (request.getUpdateRRSetDetails() == null) { - throw new NullPointerException("updateRRSetDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notBlank(request.getDomain(), "domain must not be blank"); + Validate.notBlank(request.getRtype(), "rtype must not be blank"); + Validate.notNull(request.getUpdateRRSetDetails(), "updateRRSetDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateZoneConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateZoneConverter.java index 67fdbcaca8c..a5a8b416c74 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateZoneConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateZoneConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateZoneRequest interceptRequest(UpdateZoneRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateZoneRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getUpdateZoneDetails() == null) { - throw new NullPointerException("updateZoneDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notNull(request.getUpdateZoneDetails(), "updateZoneDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateZoneRecordsConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateZoneRecordsConverter.java index a09e436e9a5..e261efc0dd8 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateZoneRecordsConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/UpdateZoneRecordsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.dns.model.*; import com.oracle.bmc.dns.requests.*; import com.oracle.bmc.dns.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateZoneRecordsRequest interceptRequest(UpdateZoneRecordsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateZoneRecordsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getZoneNameOrId() == null) { - throw new NullPointerException("zoneNameOrId is required"); - } - - if (request.getUpdateZoneRecordsDetails() == null) { - throw new NullPointerException("updateZoneRecordsDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getZoneNameOrId(), "zoneNameOrId must not be blank"); + Validate.notNull( + request.getUpdateZoneRecordsDetails(), "updateZoneRecordsDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-email/pom.xml b/bmc-email/pom.xml index ca42e90ea8f..c8922e6a084 100644 --- a/bmc-email/pom.xml +++ b/bmc-email/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/EmailAsyncClient.java b/bmc-email/src/main/java/com/oracle/bmc/email/EmailAsyncClient.java index ed4131798f8..4c80ad94632 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/EmailAsyncClient.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/EmailAsyncClient.java @@ -165,133 +165,24 @@ public EmailAsyncClient( * @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 - 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 - 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 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 { + 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 */ diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/EmailClient.java b/bmc-email/src/main/java/com/oracle/bmc/email/EmailClient.java index 337df76c25c..a512a09c052 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/EmailClient.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/EmailClient.java @@ -187,135 +187,26 @@ public EmailClient( * @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 - 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 - 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 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 { + 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 EmailClient build( @lombok.NonNull diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/CreateSenderConverter.java b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/CreateSenderConverter.java index 5b470eac53d..c23826e2c42 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/CreateSenderConverter.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/CreateSenderConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.email.model.*; import com.oracle.bmc.email.requests.*; import com.oracle.bmc.email.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static CreateSenderRequest interceptRequest(CreateSenderRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateSenderRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateSenderDetails() == null) { - throw new NullPointerException("createSenderDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateSenderDetails(), "createSenderDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20170907").path("senders"); diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/CreateSuppressionConverter.java b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/CreateSuppressionConverter.java index 86db818918f..97f18dfcc23 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/CreateSuppressionConverter.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/CreateSuppressionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.email.model.*; import com.oracle.bmc.email.requests.*; import com.oracle.bmc.email.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateSuppressionRequest interceptRequest(CreateSuppressionRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateSuppressionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateSuppressionDetails() == null) { - throw new NullPointerException("createSuppressionDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateSuppressionDetails(), "createSuppressionDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20170907").path("suppressions"); diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/DeleteSenderConverter.java b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/DeleteSenderConverter.java index 572e1a106ec..6b971e79157 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/DeleteSenderConverter.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/DeleteSenderConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.email.model.*; import com.oracle.bmc.email.requests.*; import com.oracle.bmc.email.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static DeleteSenderRequest interceptRequest(DeleteSenderRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteSenderRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSenderId() == null) { - throw new NullPointerException("senderId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSenderId(), "senderId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/DeleteSuppressionConverter.java b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/DeleteSuppressionConverter.java index f9f472c0774..b5d3322b766 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/DeleteSuppressionConverter.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/DeleteSuppressionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.email.model.*; import com.oracle.bmc.email.requests.*; import com.oracle.bmc.email.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static DeleteSuppressionRequest interceptRequest(DeleteSuppressionRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteSuppressionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSuppressionId() == null) { - throw new NullPointerException("suppressionId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSuppressionId(), "suppressionId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/GetSenderConverter.java b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/GetSenderConverter.java index 9ec1de68cad..b5b86f4d1dc 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/GetSenderConverter.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/GetSenderConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.email.model.*; import com.oracle.bmc.email.requests.*; import com.oracle.bmc.email.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetSenderRequest interceptRequest(GetSenderRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetSenderRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSenderId() == null) { - throw new NullPointerException("senderId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSenderId(), "senderId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/GetSuppressionConverter.java b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/GetSuppressionConverter.java index 8426faac901..a85969737c2 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/GetSuppressionConverter.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/GetSuppressionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.email.model.*; import com.oracle.bmc.email.requests.*; import com.oracle.bmc.email.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetSuppressionRequest interceptRequest(GetSuppressionRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetSuppressionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSuppressionId() == null) { - throw new NullPointerException("suppressionId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSuppressionId(), "suppressionId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/ListSendersConverter.java b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/ListSendersConverter.java index db3c154fab5..1e06b9363e8 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/ListSendersConverter.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/ListSendersConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.email.model.*; import com.oracle.bmc.email.requests.*; import com.oracle.bmc.email.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListSendersRequest interceptRequest(ListSendersRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListSendersRequest 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("/20170907").path("senders"); diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/ListSuppressionsConverter.java b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/ListSuppressionsConverter.java index 7030a778b7d..89eb08c46d7 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/ListSuppressionsConverter.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/internal/http/ListSuppressionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.email.model.*; import com.oracle.bmc.email.requests.*; import com.oracle.bmc.email.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListSuppressionsRequest interceptRequest(ListSuppressionsRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListSuppressionsRequest 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("/20170907").path("suppressions"); diff --git a/bmc-examples/pom.xml b/bmc-examples/pom.xml index 94f940a3d25..84339c49e19 100644 --- a/bmc-examples/pom.xml +++ b/bmc-examples/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-bom - 1.2.33 + 1.2.34 pom import @@ -35,6 +35,10 @@ com.oracle.oci.sdk oci-java-sdk-core + + com.oracle.oci.sdk + oci-java-sdk-database + com.oracle.oci.sdk oci-java-sdk-dns diff --git a/bmc-examples/src/main/java/LaunchDbSystemExample.java b/bmc-examples/src/main/java/LaunchDbSystemExample.java new file mode 100644 index 00000000000..0f12e8868b9 --- /dev/null +++ b/bmc-examples/src/main/java/LaunchDbSystemExample.java @@ -0,0 +1,438 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.ConfigFileReader; +import com.oracle.bmc.Region; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.core.VirtualNetwork; +import com.oracle.bmc.core.VirtualNetworkClient; +import com.oracle.bmc.core.model.CreateSubnetDetails; +import com.oracle.bmc.core.model.CreateVcnDetails; +import com.oracle.bmc.core.model.Subnet; +import com.oracle.bmc.core.model.Vcn; +import com.oracle.bmc.core.requests.CreateSubnetRequest; +import com.oracle.bmc.core.requests.CreateVcnRequest; +import com.oracle.bmc.core.requests.DeleteSubnetRequest; +import com.oracle.bmc.core.requests.DeleteVcnRequest; +import com.oracle.bmc.core.requests.GetSubnetRequest; +import com.oracle.bmc.core.requests.GetVcnRequest; +import com.oracle.bmc.core.responses.CreateSubnetResponse; +import com.oracle.bmc.core.responses.CreateVcnResponse; +import com.oracle.bmc.database.DatabaseClient; +import com.oracle.bmc.database.model.CreateDatabaseDetails; +import com.oracle.bmc.database.model.CreateDbHomeDetails; +import com.oracle.bmc.database.model.Database; +import com.oracle.bmc.database.model.DatabaseSummary; +import com.oracle.bmc.database.model.DbHome; +import com.oracle.bmc.database.model.DbHomeSummary; +import com.oracle.bmc.database.model.DbSystem; +import com.oracle.bmc.database.model.DbSystemShapeSummary; +import com.oracle.bmc.database.model.DbVersionSummary; +import com.oracle.bmc.database.model.LaunchDbSystemDetails; +import com.oracle.bmc.database.requests.GetDatabaseRequest; +import com.oracle.bmc.database.requests.GetDbHomeRequest; +import com.oracle.bmc.database.requests.GetDbSystemRequest; +import com.oracle.bmc.database.requests.LaunchDbSystemRequest; +import com.oracle.bmc.database.requests.ListDatabasesRequest; +import com.oracle.bmc.database.requests.ListDbHomesRequest; +import com.oracle.bmc.database.requests.ListDbSystemShapesRequest; +import com.oracle.bmc.database.requests.ListDbVersionsRequest; +import com.oracle.bmc.database.requests.TerminateDbSystemRequest; +import com.oracle.bmc.database.responses.GetDbSystemResponse; +import com.oracle.bmc.database.responses.LaunchDbSystemResponse; +import com.oracle.bmc.waiter.ExponentialBackoffDelayStrategy; +import com.oracle.bmc.waiter.MaxTimeTerminationStrategy; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * This class provides a basic example of how to launch a DB system using the Java SDK. This will cover: + *

+ *
    + *
  • Create a VCN and subnet for the DB system and its related resources
    • + *
  • + * Launch a DB system containing a single DB home and database. See: + * overview and + * managing DB systems + * for more information + *
  • Demonstrate listing and retrieving information on individual DB systems, DB homes and databases
    • + *
  • Demonstrate taking action on nodes
    • + *
+ *

+ * Resources created by this class will be removed when this example is done. + *

+ * This class also makes assumptions on the following database parameters: + *

+ *
    + *
  • Core count
    • + *
  • DB edition
    • + *
  • DB version
    • + *
+ */ +public class LaunchDbSystemExample { + private static final String CONFIG_LOCATION = "~/.oci/config"; + private static final String CONFIG_PROFILE = "DEFAULT"; + private static final String DB_VERSION = "12.1.0.2"; + private static final int DB_SYSTEM_CPU_CORE_COUNT = 4; + private static final LaunchDbSystemDetails.DatabaseEdition DB_SYSTEM_DB_EDITION = + LaunchDbSystemDetails.DatabaseEdition.EnterpriseEdition; + private static final String DB_SYSTEM_SHAPE = "BM.DenseIO1.36"; + + /** + * The entry point for the example. + * + * @param args Arguments to provide to the example. The following arguments are expected: + *
    + *
  • The OCID of the compartment which owns the DB system
    • + *
  • The availability domain where the DB system will be launched
    • + *
  • The CIDR block for the VCN and subnet (these will use the same CIDR)
    • + *
  • Admin password for the DB system
    • + *
+ */ + public static void main(String[] args) throws Exception { + if (args.length != 4) { + throw new IllegalAccessException( + "This example expects four arguments: a compartment OCID, availability domain, CIDR block for the VCN and admin password."); + } + final String compartmentId = args[0]; + final String availabilityDomain = args[1]; + final String cidrBlock = args[2]; + final String adminPassword = args[3]; + // Sample of sshPublicKey format is provided in the value for sshPublicKey + String sshPublicKey = + "ssh-rsa AAAAB3NzaC1y...key shortened for example...fdK/ABqxgH7sy3AWgBjfj some description"; + + final ConfigFileReader.ConfigFile configFile = + ConfigFileReader.parse(CONFIG_LOCATION, CONFIG_PROFILE); + final AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(configFile); + final DatabaseClient databaseClient = new DatabaseClient(provider); + final VirtualNetworkClient virtualNetworkClient = new VirtualNetworkClient(provider); + + databaseClient.setRegion(Region.US_PHOENIX_1); + virtualNetworkClient.setRegion(Region.US_PHOENIX_1); + + Vcn vcn = null; + Subnet subnet = null; + + listDbSystemShapes(databaseClient, compartmentId, availabilityDomain); + listDbVersions(databaseClient, compartmentId); + + try { + vcn = createVcn(virtualNetworkClient, compartmentId, cidrBlock); + subnet = createSubnet(virtualNetworkClient, vcn, availabilityDomain); + + final List sshPublicKeys = Arrays.asList(sshPublicKey); + + LaunchDbSystemDetails launchDbSystemDetails = + LaunchDbSystemDetails.builder() + .availabilityDomain(availabilityDomain) + .compartmentId(compartmentId) + .cpuCoreCount(DB_SYSTEM_CPU_CORE_COUNT) + .databaseEdition(DB_SYSTEM_DB_EDITION) + .dbHome( + CreateDbHomeDetails.builder() + .dbVersion(DB_VERSION) + .displayName("java sdk example db home") + .database( + CreateDatabaseDetails.builder() + .adminPassword(adminPassword) + .dbName("testdb") + .build()) + .build()) + .displayName("testdb") + .hostname("javasdk-example-db-host") + .shape(DB_SYSTEM_SHAPE) + .sshPublicKeys(sshPublicKeys) + .subnetId(subnet.getId()) + .build(); + + LaunchDbSystemResponse launchDbSystemResponse = + databaseClient.launchDbSystem( + LaunchDbSystemRequest.builder() + .launchDbSystemDetails(launchDbSystemDetails) + .build()); + System.out.println("Launched DB System"); + System.out.println("==========================="); + System.out.println(launchDbSystemResponse.getDbSystem().toString()); + System.out.println(); + + /* + We can wait until the DB system is available. A DB system can take some time to launch (e.g. on the order + of magnitude of hours) so we can change the ExponentialBackoffDelayStrategy and MaxTimeTerminationStrategy + to account for this. + + The defaults of checking every 30 seconds and waiting for a maximum of 1200 seconds (20 minutes) + may not be sufficient. + + In the below example, we check every 900 seconds (15 minutes) and wait a max of 21600 seconds (6 hours) + */ + + GetDbSystemResponse getDbSystemResponse = + databaseClient + .getWaiters() + .forDbSystem( + GetDbSystemRequest.builder() + .dbSystemId( + launchDbSystemResponse.getDbSystem().getId()) + .build(), + DbSystem.LifecycleState.Available, + new MaxTimeTerminationStrategy(21600L * 1000), + new ExponentialBackoffDelayStrategy(900L * 1000)) + .execute(); + + System.out.println("DB System Available"); + System.out.println("==========================="); + System.out.println(getDbSystemResponse.getDbSystem().toString()); + System.out.println(); + + listDbHomeAndDatabaseUnderDbSystems( + databaseClient, compartmentId, getDbSystemResponse.getDbSystem()); + + /* + Once we're done with the DB system, we can terminate it and wait for it to be terminated. + + In this basic scenario where we have a single DB system, DB home and database, terminating the DB system + will also delete the DB home and database. + + Note: Please comment out the code below if you would like to keep the launched DB system. + */ + databaseClient.terminateDbSystem( + TerminateDbSystemRequest.builder() + .dbSystemId(launchDbSystemResponse.getDbSystem().getId()) + .build()); + databaseClient + .getWaiters() + .forDbSystem( + GetDbSystemRequest.builder() + .dbSystemId(launchDbSystemResponse.getDbSystem().getId()) + .build(), + DbSystem.LifecycleState.Terminated) + .execute(); + + System.out.println("Terminated DB system"); + } finally { + if (subnet != null) { + deleteSubnet(virtualNetworkClient, subnet); + } + + if (vcn != null) { + deleteVcn(virtualNetworkClient, vcn); + } + } + } + + private static Vcn createVcn( + VirtualNetwork virtualNetwork, String compartmentId, String cidrBlock) + throws Exception { + final String vcnName = "JavaSdkExampleVcn"; + CreateVcnResponse response = + virtualNetwork.createVcn( + CreateVcnRequest.builder() + .createVcnDetails( + CreateVcnDetails.builder() + .cidrBlock(cidrBlock) + .compartmentId(compartmentId) + .displayName(vcnName) + .dnsLabel("javasdkex") + .build()) + .build()); + + virtualNetwork + .getWaiters() + .forVcn( + GetVcnRequest.builder().vcnId(response.getVcn().getId()).build(), + Vcn.LifecycleState.Available) + .execute(); + System.out.println("Created VCN: " + response.getVcn().getId()); + + return response.getVcn(); + } + + private static void deleteVcn(VirtualNetwork virtualNetwork, Vcn vcn) throws Exception { + virtualNetwork.deleteVcn(DeleteVcnRequest.builder().vcnId(vcn.getId()).build()); + virtualNetwork + .getWaiters() + .forVcn( + GetVcnRequest.builder().vcnId(vcn.getId()).build(), + Vcn.LifecycleState.Terminated) + .execute(); + System.out.println("Deleted VCN: " + vcn.getId()); + } + + private static Subnet createSubnet( + VirtualNetwork virtualNetwork, Vcn vcn, String availabilityDomain) throws Exception { + final String subnetName = "JavaSdkExampleSubnet1"; + CreateSubnetResponse response = + virtualNetwork.createSubnet( + CreateSubnetRequest.builder() + .createSubnetDetails( + CreateSubnetDetails.builder() + .compartmentId(vcn.getCompartmentId()) + .availabilityDomain(availabilityDomain) + .displayName(subnetName) + .vcnId(vcn.getId()) + .cidrBlock(vcn.getCidrBlock()) + .dnsLabel("javasdksubex") + .build()) + .build()); + + virtualNetwork + .getWaiters() + .forSubnet( + GetSubnetRequest.builder().subnetId(response.getSubnet().getId()).build(), + Subnet.LifecycleState.Available) + .execute(); + System.out.println("Created Subnet: " + response.getSubnet().getId()); + return response.getSubnet(); + } + + private static void deleteSubnet(VirtualNetwork virtualNetwork, Subnet subnet) + throws Exception { + virtualNetwork.deleteSubnet(DeleteSubnetRequest.builder().subnetId(subnet.getId()).build()); + virtualNetwork + .getWaiters() + .forSubnet( + GetSubnetRequest.builder().subnetId(subnet.getId()).build(), + Subnet.LifecycleState.Terminated) + .execute(); + System.out.println("Deleted Subnet: " + subnet.getId()); + } + + private static void listDbSystemShapes( + DatabaseClient databaseClient, String compartmentId, String availabilityDomain) { + /* + We can list the different database shapes available to us. This is a paginated operation so we can use the functions + in getPaginators() to get all the results without having to manually deal with page tokens + */ + System.out.println("DB System Shapes"); + System.out.println("==========================="); + for (DbSystemShapeSummary dbSystemShape : + databaseClient + .getPaginators() + .listDbSystemShapesRecordIterator( + ListDbSystemShapesRequest.builder() + .compartmentId(compartmentId) + .availabilityDomain(availabilityDomain) + .build())) { + System.out.println(dbSystemShape.getShape().toString()); + } + System.out.println(); + } + + private static void listDbVersions(DatabaseClient databaseClient, String compartmentId) { + /* + We can list DB versions. This is a paginated operation so we can use the functions in getPaginators() to get + all the results without having to manually deal with page tokens + */ + System.out.println("DB Versions"); + System.out.println("==========================="); + for (DbVersionSummary dbVersion : + databaseClient + .getPaginators() + .listDbVersionsRecordIterator( + ListDbVersionsRequest.builder() + .compartmentId(compartmentId) + .build())) { + System.out.println(dbVersion.toString()); + } + System.out.println(); + + /* + We can do some additional filtering so that only versions compatible with a given shape are returned. Note + the usage of the dbSystemShape parameter + */ + System.out.println("DB Versions by shape: " + DB_SYSTEM_SHAPE); + System.out.println("==========================="); + for (DbVersionSummary dbVersion : + databaseClient + .getPaginators() + .listDbVersionsRecordIterator( + ListDbVersionsRequest.builder() + .compartmentId(compartmentId) + .dbSystemShape(DB_SYSTEM_SHAPE) + .build())) { + System.out.println(dbVersion.toString()); + } + System.out.println(); + } + + private static void listDbHomeAndDatabaseUnderDbSystems( + DatabaseClient databaseClient, String compartmentId, DbSystem dbSystem) { + /* + A DB System contains DB Homes and the DB Homes contain databases. First, let's find the DB homes for the + DB system by listing them. Listing is a paginated operation so we can use the functions in getPaginators() + here + */ + System.out.println("DB Homes For DB System"); + System.out.println("==========================="); + List dbHomeSummaries = new ArrayList<>(); + for (DbHomeSummary dbHome : + databaseClient + .getPaginators() + .listDbHomesRecordIterator( + ListDbHomesRequest.builder() + .compartmentId(compartmentId) + .dbSystemId(dbSystem.getId()) + .build())) { + dbHomeSummaries.add(dbHome); + System.out.println(dbHome.toString()); + } + System.out.println(); + + /* + The results returned in the list operation are DatabaseSummary objects. We can also call getDatabase to fetch + the full information about the DB home + */ + System.out.println("Get DB Home"); + System.out.println("==========================="); + DbHomeSummary dbHomeSummary = dbHomeSummaries.get(0); + DbHome dbHome = + databaseClient + .getDbHome( + GetDbHomeRequest.builder().dbHomeId(dbHomeSummary.getId()).build()) + .getDbHome(); + System.out.println(dbHome); + System.out.println(); + + /* + DB Homes contain databases. We can find the databases in a DB home by listing them. This is a paginated + operation so we can use the getPaginators().listDatabasesRecordIterator() function here + */ + System.out.println("Databases for DB Home"); + System.out.println("==========================="); + List dbSummaries = new ArrayList<>(); + for (DatabaseSummary dbSummary : + databaseClient + .getPaginators() + .listDatabasesRecordIterator( + ListDatabasesRequest.builder() + .compartmentId(compartmentId) + .dbHomeId(dbHomeSummary.getId()) + .build())) { + dbSummaries.add(dbSummary); + System.out.println(dbSummary); + } + System.out.println(); + + /* + The results returned in the list operation are DatabaseSummary objects. We can also call getDatabase to fetch + the full information about the DB home + */ + DatabaseSummary databaseSummary = dbSummaries.get(0); + Database database = + databaseClient + .getDatabase( + GetDatabaseRequest.builder() + .databaseId(databaseSummary.getId()) + .build()) + .getDatabase(); + System.out.println("Get Database"); + System.out.println("===========================\""); + System.out.println(database); + System.out.println(); + } +} diff --git a/bmc-examples/src/main/java/ObjectStorageBucketTaggingExample.java b/bmc-examples/src/main/java/ObjectStorageBucketTaggingExample.java new file mode 100644 index 00000000000..93cd4409e7c --- /dev/null +++ b/bmc-examples/src/main/java/ObjectStorageBucketTaggingExample.java @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.ConfigFileReader; +import com.oracle.bmc.Region; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.objectstorage.ObjectStorageClient; +import com.oracle.bmc.objectstorage.model.BucketSummary; +import com.oracle.bmc.objectstorage.model.CreateBucketDetails; +import com.oracle.bmc.objectstorage.model.UpdateBucketDetails; +import com.oracle.bmc.objectstorage.requests.CreateBucketRequest; +import com.oracle.bmc.objectstorage.requests.DeleteBucketRequest; +import com.oracle.bmc.objectstorage.requests.GetBucketRequest; +import com.oracle.bmc.objectstorage.requests.GetNamespaceRequest; +import com.oracle.bmc.objectstorage.requests.ListBucketsRequest; +import com.oracle.bmc.objectstorage.requests.UpdateBucketRequest; +import com.oracle.bmc.objectstorage.responses.CreateBucketResponse; +import com.oracle.bmc.objectstorage.responses.GetBucketResponse; +import com.oracle.bmc.objectstorage.responses.UpdateBucketResponse; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * This class provides a basic example of how to tag buckets in Object Storage. + */ +public class ObjectStorageBucketTaggingExample { + private static final String CONFIG_LOCATION = "~/.oci/config"; + private static final String CONFIG_PROFILE = "DEFAULT"; + + /** + * The entry point for the example. + * + * @param args Arguments to provide to the example. The following arguments are expected: + *
    + *
  • The first argument is the OCID of the compartment where we'll create a bucket
    • + *
  • The second is the name of bucket to create
    • + *
  • The third is the name (not OCID) of the tag namespace to use in defined tags
    • + *
  • The fourth is the name of a tag in the tag namespace to use defined tags
    • + *
+ */ + public static void main(String[] args) throws Exception { + if (args.length != 4) { + throw new IllegalArgumentException( + "Unexpected number of arguments received. Consult the script header comments for expected arguments"); + } + + final String compartmentId = args[0]; + final String bucketName = args[1]; + final String tagNamespace = args[2]; + final String tagName = args[3]; + + final ConfigFileReader.ConfigFile configFile = + ConfigFileReader.parse(CONFIG_LOCATION, CONFIG_PROFILE); + final AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(configFile); + ObjectStorageClient objectStorageClient = new ObjectStorageClient(provider); + objectStorageClient.setRegion(Region.US_PHOENIX_1); + + String namespace = + objectStorageClient.getNamespace(GetNamespaceRequest.builder().build()).getValue(); + + /* + We can assign tags to a bucket at creation time. Like other taggable resources, we can + assign freeform and defined tags to a bucket. Freeform tags are a dictionary of + string-to-string, where the key is the tag name and the value is the tag value. + + Defined tags are a dictionary where the key is the tag namespace (string) and the value is another dictionary. In + this second dictionary, the key is the tag name (string) and the value is the tag value. The tag names have to + correspond to the name of a tag within the specified namespace (and the namespace must exist). + */ + Map freeformTags = new HashMap<>(); + freeformTags.put("free", "form"); + freeformTags.put("another", "item"); + + Map definedTagsMap = new HashMap<>(); + definedTagsMap.put(tagName, "value at create"); + + Map> definedTags = new HashMap<>(); + definedTags.put(tagNamespace, definedTagsMap); + + CreateBucketResponse createBucketResponse = + objectStorageClient.createBucket( + CreateBucketRequest.builder() + .namespaceName(namespace) + .createBucketDetails( + CreateBucketDetails.builder() + .name(bucketName) + .compartmentId(compartmentId) + .publicAccessType( + CreateBucketDetails.PublicAccessType + .ObjectRead) + .freeformTags(freeformTags) + .definedTags(definedTags) + .build()) + .build()); + System.out.println("Created a bucket with tags:\n " + createBucketResponse.getBucket()); + System.out.println("=========================\n"); + + // Tags come back when retrieving the bucket + GetBucketResponse getBucketResponse = + objectStorageClient.getBucket( + GetBucketRequest.builder() + .namespaceName(namespace) + .bucketName(bucketName) + .build()); + System.out.println("Retrieved bucket with tags:\n " + getBucketResponse.getBucket()); + System.out.println("=========================\n"); + + /* + Unlike other resources (e.g. instances, VCNs, and block volumes), when listing buckets + tags are not returned by default. Instead, you need to provide a value to the fields + parameter when listing buckets in order to have those tags returned. + + Here we can see the result of providing and not providing that parameter. + */ + for (BucketSummary bucket : + objectStorageClient + .getPaginators() + .listBucketsRecordIterator( + ListBucketsRequest.builder() + .compartmentId(compartmentId) + .namespaceName(namespace) + .build())) { + if (bucket.getName().equals(bucketName)) { + System.out.println("Bucket summary without tags:\n " + bucket); + System.out.println("=========================\n"); + break; + } + } + + List fields = new ArrayList<>(); + fields.add(ListBucketsRequest.Fields.Tags); + for (BucketSummary bucket : + objectStorageClient + .getPaginators() + .listBucketsRecordIterator( + ListBucketsRequest.builder() + .compartmentId(compartmentId) + .namespaceName(namespace) + .fields(fields) + .build())) { + if (bucket.getName().equals(bucketName)) { + System.out.println("Bucket summary with tags:\n " + bucket); + System.out.println("=========================\n"); + break; + } + } + + /* + We can also update tags on a bucket. Note that this is a total replacement for any + previously set freeform or defined tags. + */ + Map updateFreeformTags = new HashMap<>(); + updateFreeformTags.put("new", "freeform"); + Map updateDefinedTagsMap = new HashMap<>(); + updateDefinedTagsMap.put(tagName, "replaced"); + Map> updateDefinedTags = new HashMap<>(); + updateDefinedTags.put(tagNamespace, updateDefinedTagsMap); + + UpdateBucketResponse updateBucketResponse = + objectStorageClient.updateBucket( + UpdateBucketRequest.builder() + .namespaceName(namespace) + .bucketName(bucketName) + .updateBucketDetails( + UpdateBucketDetails.builder() + .name(bucketName) + .freeformTags(updateFreeformTags) + .definedTags(updateDefinedTags) + .build()) + .build()); + System.out.println("Updated a bucket with new tags:\n " + updateBucketResponse.getBucket()); + System.out.println("=========================\n"); + + // We can also clear tags from a bucket by passing empty dicts to the tag parameters + updateBucketResponse = + objectStorageClient.updateBucket( + UpdateBucketRequest.builder() + .namespaceName(namespace) + .bucketName(bucketName) + .updateBucketDetails( + UpdateBucketDetails.builder() + .name(bucketName) + .freeformTags(new HashMap()) + .definedTags( + new HashMap>()) + .build()) + .build()); + System.out.println("Cleared tags on the bucket:\n " + updateBucketResponse.getBucket()); + System.out.println("=========================\n"); + + // Clean up + objectStorageClient.deleteBucket( + DeleteBucketRequest.builder() + .namespaceName(namespace) + .bucketName(bucketName) + .build()); + System.out.println("Deleted bucket"); + } +} diff --git a/bmc-examples/src/main/java/TaggingExample.java b/bmc-examples/src/main/java/TaggingExample.java new file mode 100644 index 00000000000..f25fd645baa --- /dev/null +++ b/bmc-examples/src/main/java/TaggingExample.java @@ -0,0 +1,353 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.ConfigFileReader; +import com.oracle.bmc.Region; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.core.VirtualNetworkClient; +import com.oracle.bmc.core.model.CreateVcnDetails; +import com.oracle.bmc.core.model.UpdateVcnDetails; +import com.oracle.bmc.core.model.Vcn; +import com.oracle.bmc.core.requests.CreateVcnRequest; +import com.oracle.bmc.core.requests.GetVcnRequest; +import com.oracle.bmc.core.requests.UpdateVcnRequest; +import com.oracle.bmc.core.responses.CreateVcnResponse; +import com.oracle.bmc.core.responses.GetVcnResponse; +import com.oracle.bmc.core.responses.UpdateVcnResponse; +import com.oracle.bmc.identity.IdentityClient; +import com.oracle.bmc.identity.model.CreateTagDetails; +import com.oracle.bmc.identity.model.CreateTagNamespaceDetails; +import com.oracle.bmc.identity.model.Tag; +import com.oracle.bmc.identity.model.TagNamespace; +import com.oracle.bmc.identity.model.TagNamespaceSummary; +import com.oracle.bmc.identity.model.TagSummary; +import com.oracle.bmc.identity.model.UpdateTagDetails; +import com.oracle.bmc.identity.model.UpdateTagNamespaceDetails; +import com.oracle.bmc.identity.requests.CreateTagNamespaceRequest; +import com.oracle.bmc.identity.requests.CreateTagRequest; +import com.oracle.bmc.identity.requests.GetTagNamespaceRequest; +import com.oracle.bmc.identity.requests.GetTagRequest; +import com.oracle.bmc.identity.requests.ListTagNamespacesRequest; +import com.oracle.bmc.identity.requests.ListTagsRequest; +import com.oracle.bmc.identity.requests.UpdateTagNamespaceRequest; +import com.oracle.bmc.identity.requests.UpdateTagRequest; +import com.oracle.bmc.identity.responses.CreateTagNamespaceResponse; +import com.oracle.bmc.identity.responses.CreateTagResponse; +import com.oracle.bmc.identity.responses.UpdateTagNamespaceResponse; +import com.oracle.bmc.identity.responses.UpdateTagResponse; +import com.oracle.bmc.model.BmcException; + +import java.security.SecureRandom; +import java.util.HashMap; +import java.util.Map; + +/** + * This class provides an example on how to use tagging in the Java SDK to manage tags and tag namespaces, as + * well as how to apply freeform and defined tags to a resource. + */ +public class TaggingExample { + private static final String CONFIG_LOCATION = "~/.oci/config"; + private static final String CONFIG_PROFILE = "DEFAULT"; + + /** + * The entry point for the example. + * + * @param args Arguments to provide to the example. The following arguments are expected: + *
    + *
  • The OCID of the compartment where a VCN will be created for tagging.
    • + *
+ */ + public static void main(String[] args) throws Exception { + if (args.length != 1) { + throw new IllegalArgumentException( + "This example expects one argument: a compartment OCID"); + } + + final String compartmentId = args[0]; + + final ConfigFileReader.ConfigFile configFile = + ConfigFileReader.parse(CONFIG_LOCATION, CONFIG_PROFILE); + final AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(configFile); + final IdentityClient identityClient = new IdentityClient(provider); + final VirtualNetworkClient virtualNetworkClient = new VirtualNetworkClient(provider); + + identityClient.setRegion(Region.US_PHOENIX_1); + virtualNetworkClient.setRegion(Region.US_PHOENIX_1); + + SecureRandom rnd = SecureRandom.getInstance("SHA1PRNG"); + final String exampleNamespaceName = "examplens_" + rnd.nextInt(1000000); + + // Create a namespace + CreateTagNamespaceResponse createTagNamespaceResponse = + identityClient.createTagNamespace( + CreateTagNamespaceRequest.builder() + .createTagNamespaceDetails( + CreateTagNamespaceDetails.builder() + .compartmentId(compartmentId) + .name(exampleNamespaceName) + .description("Java SDK example tag namespace") + .build()) + .build()); + final String tagNamespaceId = createTagNamespaceResponse.getTagNamespace().getId(); + + System.out.printf( + "Created tag namespace: %s\n", createTagNamespaceResponse.getTagNamespace()); + + // Create a tag + final String tagOneName = "tagone_" + rnd.nextInt(1000000); + CreateTagResponse createTagOneResponse = + identityClient.createTag( + CreateTagRequest.builder() + .tagNamespaceId(tagNamespaceId) + .createTagDetails( + CreateTagDetails.builder() + .name(tagOneName) + .description("Java SDK example tag one") + .build()) + .build()); + + System.out.printf("Created tag: %s\n", createTagOneResponse.getTag()); + + // Create another tag + final String tagTwoName = "tagtwo_" + rnd.nextInt(1000000); + CreateTagResponse createTagTwoResponse = + identityClient.createTag( + CreateTagRequest.builder() + .tagNamespaceId(tagNamespaceId) + .createTagDetails( + CreateTagDetails.builder() + .name(tagTwoName) + .description("Java SDK example tag two") + .build()) + .build()); + + System.out.printf("Created tag: %s\n", createTagTwoResponse.getTag()); + + // We can retire a tag by using the update tag operation + UpdateTagResponse updateTagOneResponse = + identityClient.updateTag( + UpdateTagRequest.builder() + .tagNamespaceId(tagNamespaceId) + .tagName(tagOneName) + .updateTagDetails( + UpdateTagDetails.builder().isRetired(true).build()) + .build()); + System.out.printf("Updated tag (retired): %s\n", updateTagOneResponse.getTag()); + + // We can retrieve individual tags and namespaces + TagNamespace tagNamespace = + identityClient + .getTagNamespace( + GetTagNamespaceRequest.builder() + .tagNamespaceId(tagNamespaceId) + .build()) + .getTagNamespace(); + Tag tagOne = + identityClient + .getTag( + GetTagRequest.builder() + .tagNamespaceId(tagNamespaceId) + .tagName(tagOneName) + .build()) + .getTag(); + Tag tagTwo = + identityClient + .getTag( + GetTagRequest.builder() + .tagNamespaceId(tagNamespaceId) + .tagName(tagTwoName) + .build()) + .getTag(); + + /* + We can list tags and namespaces. These operations are paginated and take a "page" parameter to allow you + to get the next batch of items from the server + */ + for (TagNamespaceSummary tagNamespaceSummary : + identityClient + .getPaginators() + .listTagNamespacesRecordIterator( + ListTagNamespacesRequest.builder() + .compartmentId(compartmentId) + .build())) { + System.out.println("TagNamespace: " + tagNamespaceSummary.getName()); + } + for (TagSummary tagInNamespace : + identityClient + .getPaginators() + .listTagsRecordIterator( + ListTagsRequest.builder().tagNamespaceId(tagNamespaceId).build())) { + System.out.println("Tag: " + tagInNamespace.getName()); + } + + // We can also reactivate a tag using the update tag operation + updateTagOneResponse = + identityClient.updateTag( + UpdateTagRequest.builder() + .tagNamespaceId(tagNamespaceId) + .tagName(tagOneName) + .updateTagDetails( + UpdateTagDetails.builder().isRetired(false).build()) + .build()); + System.out.println("Updated tag (reactivated): " + updateTagOneResponse.getTag()); + + Map freeformTags = new HashMap<>(); + freeformTags.put("free", "form"); + freeformTags.put("another", "item"); + + Map definedTagsMap = new HashMap<>(); + definedTagsMap.put(tagOneName, "hello"); + definedTagsMap.put(tagTwoName, "world"); + + Map> definedTags = new HashMap<>(); + definedTags.put(tagNamespace.getName(), definedTagsMap); + + /* + We can assign freeform and defined tags at creation time. Freeform tags are a dictionary of string-to-string, + where the key is the tag name and the value is the tag value. + + Defined tags are a dictionary where the key is the tag namespace (string) and the value is another dictionary. In + this second dictionary, the key is the tag name (string) and the value is the tag value. The tag names have to + correspond to the name of a tag within the specified namespace (and the namespace must exist). + + Resources where we can create/update tags will have the freeform_tags and defined_tags attributes. Consult the API + documentation to see what these are (https://oracle-cloud-infrastructure-python-sdk.readthedocs.io/en/latest/api/index.html) + */ + String vcnId; + int numTries = 0; + while (true) { + try { + CreateVcnResponse createVcnResponse = + virtualNetworkClient.createVcn( + CreateVcnRequest.builder() + .createVcnDetails( + CreateVcnDetails.builder() + .cidrBlock("10.0.0.0/16") + .compartmentId(compartmentId) + .displayName("Java SDK tagging example VCN") + .dnsLabel("vnc" + rnd.nextInt(1000000)) + .freeformTags(freeformTags) + .definedTags(definedTags) + .build()) + .build()); + vcnId = createVcnResponse.getVcn().getId(); + GetVcnResponse getVcnResponse = + virtualNetworkClient + .getWaiters() + .forVcn( + GetVcnRequest.builder().vcnId(vcnId).build(), + Vcn.LifecycleState.Available) + .execute(); + System.out.println("Created VCN with tags: " + getVcnResponse.getVcn()); + break; + } catch (BmcException e) { + if (e.getStatusCode() == 404) { + System.out.println("Retrying on 404: " + e.getMessage()); + numTries++; + if (numTries >= 3) { + // If we can't get it in 3 tries, something else may be going on + throw e; + } else { + Thread.sleep(2000L); + } + } else { + throw e; + } + } + } + + /* + We can also update tags on a resource. Note that this is a total replacement for any previously set freeform or defined tags. + + Resources where we can create/update tags will have the freeform_tags and defined_tags attributes. Consult the API + documentation to see what these are (https://oracle-cloud-infrastructure-python-sdk.readthedocs.io/en/latest/api/index.html) + */ + Map updateFreeformTags = new HashMap<>(); + updateFreeformTags.put("total", "replace"); + + Map updateDefinedTagsMap = new HashMap<>(); + updateDefinedTagsMap.put(tagTwoName, "also replaced"); + + Map> updatedDefinedTags = new HashMap<>(); + updatedDefinedTags.put(tagNamespace.getName(), updateDefinedTagsMap); + + UpdateVcnResponse updateVcnResponse = + virtualNetworkClient.updateVcn( + UpdateVcnRequest.builder() + .vcnId(vcnId) + .updateVcnDetails( + UpdateVcnDetails.builder() + .freeformTags(updateFreeformTags) + .definedTags(updatedDefinedTags) + .build()) + .build()); + System.out.println("Updated tags on VCN: " + updateVcnResponse.getVcn()); + + // We can also totally remove tags on a resource by passing in an empty dictionary for those tagging parameters + updateVcnResponse = + virtualNetworkClient.updateVcn( + UpdateVcnRequest.builder() + .vcnId(vcnId) + .updateVcnDetails( + UpdateVcnDetails.builder() + .freeformTags(new HashMap()) + .definedTags( + new HashMap>()) + .build()) + .build()); + System.out.println("Removed tags from VCN: " + updateVcnResponse.getVcn()); + + // Previously we saw retiring a tag. We can also retire a tag namespace - this will also retire any tags in that namespace + UpdateTagNamespaceResponse updateTagNamespaceResponse = + identityClient.updateTagNamespace( + UpdateTagNamespaceRequest.builder() + .tagNamespaceId(tagNamespaceId) + .updateTagNamespaceDetails( + UpdateTagNamespaceDetails.builder().isRetired(true).build()) + .build()); + System.out.println( + "Updated tag namespace (retired): " + updateTagNamespaceResponse.getTagNamespace()); + System.out.println( + "Tags in namespace: " + + identityClient + .listTags( + ListTagsRequest.builder() + .tagNamespaceId(tagNamespaceId) + .build()) + .getItems()); + + /* + We can also reactivate a namespace. Note that this doesn't reactivate the tags in that namespace - those tags will need + to be reactivated individually + */ + updateTagNamespaceResponse = + identityClient.updateTagNamespace( + UpdateTagNamespaceRequest.builder() + .tagNamespaceId(tagNamespaceId) + .updateTagNamespaceDetails( + UpdateTagNamespaceDetails.builder() + .isRetired(false) + .build()) + .build()); + System.out.println( + "Updated tag namespace (reactivated): " + + updateTagNamespaceResponse.getTagNamespace()); + System.out.println( + "Tags in namespace: " + + identityClient + .listTags( + ListTagsRequest.builder() + .tagNamespaceId(tagNamespaceId) + .build()) + .getItems()); + + identityClient.updateTagNamespace( + UpdateTagNamespaceRequest.builder() + .tagNamespaceId(tagNamespaceId) + .updateTagNamespaceDetails( + UpdateTagNamespaceDetails.builder().isRetired(true).build()) + .build()); + } +} diff --git a/bmc-filestorage/pom.xml b/bmc-filestorage/pom.xml index 169bc0a884c..1d526581752 100644 --- a/bmc-filestorage/pom.xml +++ b/bmc-filestorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/FileStorageAsyncClient.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/FileStorageAsyncClient.java index 149d9e3294a..5bb86255f88 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/FileStorageAsyncClient.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/FileStorageAsyncClient.java @@ -165,133 +165,24 @@ public FileStorageAsyncClient( * @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 - 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 - 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 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 { + 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 */ diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/FileStorageClient.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/FileStorageClient.java index fb6c4841feb..beba7bb3dbd 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/FileStorageClient.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/FileStorageClient.java @@ -187,135 +187,26 @@ public FileStorageClient( * @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 - 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 - 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 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 { + 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 FileStorageClient build( @lombok.NonNull diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateExportConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateExportConverter.java index 53cb1e499ad..85dc180c7d1 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateExportConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateExportConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static CreateExportRequest interceptRequest(CreateExportRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateExportRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateExportDetails() == null) { - throw new NullPointerException("createExportDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateExportDetails(), "createExportDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20171215").path("exports"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateFileSystemConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateFileSystemConverter.java index 0df5b04aecd..91690a4dd00 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateFileSystemConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateFileSystemConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateFileSystemRequest interceptRequest(CreateFileSystemRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateFileSystemRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateFileSystemDetails() == null) { - throw new NullPointerException("createFileSystemDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateFileSystemDetails(), "createFileSystemDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20171215").path("fileSystems"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateMountTargetConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateMountTargetConverter.java index 334c53df5ef..3292ff37251 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateMountTargetConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateMountTargetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateMountTargetRequest interceptRequest(CreateMountTargetRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateMountTargetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateMountTargetDetails() == null) { - throw new NullPointerException("createMountTargetDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateMountTargetDetails(), "createMountTargetDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20171215").path("mountTargets"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateSnapshotConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateSnapshotConverter.java index c99223768fb..33652099968 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateSnapshotConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/CreateSnapshotConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static CreateSnapshotRequest interceptRequest(CreateSnapshotRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateSnapshotRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateSnapshotDetails() == null) { - throw new NullPointerException("createSnapshotDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateSnapshotDetails(), "createSnapshotDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20171215").path("snapshots"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteExportConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteExportConverter.java index 01812e5c801..e1c0627acda 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteExportConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteExportConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static DeleteExportRequest interceptRequest(DeleteExportRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteExportRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getExportId() == null) { - throw new NullPointerException("exportId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getExportId(), "exportId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteFileSystemConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteFileSystemConverter.java index 26441fce133..b6d9af46aa8 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteFileSystemConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteFileSystemConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static DeleteFileSystemRequest interceptRequest(DeleteFileSystemRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteFileSystemRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getFileSystemId() == null) { - throw new NullPointerException("fileSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getFileSystemId(), "fileSystemId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteMountTargetConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteMountTargetConverter.java index e5f1dd59143..8b45319afb0 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteMountTargetConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteMountTargetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static DeleteMountTargetRequest interceptRequest(DeleteMountTargetRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteMountTargetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getMountTargetId() == null) { - throw new NullPointerException("mountTargetId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getMountTargetId(), "mountTargetId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteSnapshotConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteSnapshotConverter.java index 6b121d86010..2547e4da10d 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteSnapshotConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/DeleteSnapshotConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static DeleteSnapshotRequest interceptRequest(DeleteSnapshotRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteSnapshotRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSnapshotId() == null) { - throw new NullPointerException("snapshotId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSnapshotId(), "snapshotId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetExportConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetExportConverter.java index ab8dc874984..eb904450642 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetExportConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetExportConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetExportRequest interceptRequest(GetExportRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetExportRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getExportId() == null) { - throw new NullPointerException("exportId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getExportId(), "exportId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetExportSetConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetExportSetConverter.java index 8461934bbe6..a5d75e3892d 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetExportSetConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetExportSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetExportSetRequest interceptRequest(GetExportSetRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetExportSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getExportSetId() == null) { - throw new NullPointerException("exportSetId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getExportSetId(), "exportSetId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetFileSystemConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetFileSystemConverter.java index 2a902f9fae5..611eeda345c 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetFileSystemConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetFileSystemConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetFileSystemRequest interceptRequest(GetFileSystemRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetFileSystemRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getFileSystemId() == null) { - throw new NullPointerException("fileSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getFileSystemId(), "fileSystemId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetMountTargetConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetMountTargetConverter.java index e6480a82081..4121af30789 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetMountTargetConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetMountTargetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetMountTargetRequest interceptRequest(GetMountTargetRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetMountTargetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getMountTargetId() == null) { - throw new NullPointerException("mountTargetId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getMountTargetId(), "mountTargetId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetSnapshotConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetSnapshotConverter.java index d61cee809db..d59617f59ba 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetSnapshotConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/GetSnapshotConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetSnapshotRequest interceptRequest(GetSnapshotRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetSnapshotRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getSnapshotId() == null) { - throw new NullPointerException("snapshotId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getSnapshotId(), "snapshotId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListExportSetsConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListExportSetsConverter.java index 42b8a6cf6ce..4b5f1764c55 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListExportSetsConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListExportSetsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListExportSetsRequest interceptRequest(ListExportSetsRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListExportSetsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getAvailabilityDomain() == null) { - throw new NullPointerException("availabilityDomain is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getAvailabilityDomain(), "availabilityDomain is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20171215").path("exportSets"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListExportsConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListExportsConverter.java index 170ec82d74c..2a7865f66dc 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListExportsConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListExportsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListExportsRequest interceptRequest(ListExportsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListExportsRequest 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("/20171215").path("exports"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListFileSystemsConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListFileSystemsConverter.java index c12fb4f8ddd..ecd42493b04 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListFileSystemsConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListFileSystemsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListFileSystemsRequest interceptRequest(ListFileSystemsRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListFileSystemsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getAvailabilityDomain() == null) { - throw new NullPointerException("availabilityDomain is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getAvailabilityDomain(), "availabilityDomain is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20171215").path("fileSystems"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListMountTargetsConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListMountTargetsConverter.java index 804141b535a..b07b2f7ebcf 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListMountTargetsConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListMountTargetsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListMountTargetsRequest interceptRequest(ListMountTargetsRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListMountTargetsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getAvailabilityDomain() == null) { - throw new NullPointerException("availabilityDomain is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); + Validate.notNull(request.getAvailabilityDomain(), "availabilityDomain is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20171215").path("mountTargets"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListSnapshotsConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListSnapshotsConverter.java index 74425f21883..68078b657e3 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListSnapshotsConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/ListSnapshotsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListSnapshotsRequest interceptRequest(ListSnapshotsRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListSnapshotsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getFileSystemId() == null) { - throw new NullPointerException("fileSystemId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getFileSystemId(), "fileSystemId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20171215").path("snapshots"); diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateExportSetConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateExportSetConverter.java index 6b7340002a7..633617c5e78 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateExportSetConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateExportSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateExportSetRequest interceptRequest(UpdateExportSetRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateExportSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getExportSetId() == null) { - throw new NullPointerException("exportSetId is required"); - } - - if (request.getUpdateExportSetDetails() == null) { - throw new NullPointerException("updateExportSetDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getExportSetId(), "exportSetId must not be blank"); + Validate.notNull(request.getUpdateExportSetDetails(), "updateExportSetDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateFileSystemConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateFileSystemConverter.java index 612e24d6941..80b748365ae 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateFileSystemConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateFileSystemConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateFileSystemRequest interceptRequest(UpdateFileSystemRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateFileSystemRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getFileSystemId() == null) { - throw new NullPointerException("fileSystemId is required"); - } - - if (request.getUpdateFileSystemDetails() == null) { - throw new NullPointerException("updateFileSystemDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getFileSystemId(), "fileSystemId must not be blank"); + Validate.notNull( + request.getUpdateFileSystemDetails(), "updateFileSystemDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateMountTargetConverter.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateMountTargetConverter.java index e97cf43f502..fd7825930dc 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateMountTargetConverter.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/internal/http/UpdateMountTargetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.filestorage.model.*; import com.oracle.bmc.filestorage.requests.*; import com.oracle.bmc.filestorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateMountTargetRequest interceptRequest(UpdateMountTargetRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateMountTargetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getMountTargetId() == null) { - throw new NullPointerException("mountTargetId is required"); - } - - if (request.getUpdateMountTargetDetails() == null) { - throw new NullPointerException("updateMountTargetDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getMountTargetId(), "mountTargetId must not be blank"); + Validate.notNull( + request.getUpdateMountTargetDetails(), "updateMountTargetDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/pom.xml b/bmc-identity/pom.xml index cc8ccfbff2d..c3581ebe826 100644 --- a/bmc-identity/pom.xml +++ b/bmc-identity/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsyncClient.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsyncClient.java index 947f028fc17..90602e02c39 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsyncClient.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsyncClient.java @@ -165,133 +165,24 @@ public IdentityAsyncClient( * @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 - 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 - 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 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 { + 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 */ diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityClient.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityClient.java index b26a3193466..7e0c74ddcb3 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityClient.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityClient.java @@ -187,135 +187,26 @@ public IdentityClient( * @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 - 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 - 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 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 { + 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 IdentityClient build( @lombok.NonNull diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/AddUserToGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/AddUserToGroupConverter.java index 6cea178df43..3a93f79dd7e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/AddUserToGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/AddUserToGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 AddUserToGroupRequest interceptRequest(AddUserToGroupRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, AddUserToGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getAddUserToGroupDetails() == null) { - throw new NullPointerException("addUserToGroupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getAddUserToGroupDetails(), "addUserToGroupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("userGroupMemberships"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCompartmentConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCompartmentConverter.java index ea13332e0cd..dbe3459d289 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCompartmentConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCompartmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateCompartmentRequest interceptRequest(CreateCompartmentRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateCompartmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateCompartmentDetails() == null) { - throw new NullPointerException("createCompartmentDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateCompartmentDetails(), "createCompartmentDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("compartments"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCustomerSecretKeyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCustomerSecretKeyConverter.java index c462579b243..36685b54d55 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCustomerSecretKeyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateCustomerSecretKeyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,11 @@ public static CreateCustomerSecretKeyRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateCustomerSecretKeyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateCustomerSecretKeyDetails() == null) { - throw new NullPointerException("createCustomerSecretKeyDetails is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateCustomerSecretKeyDetails(), + "createCustomerSecretKeyDetails is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateDynamicGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateDynamicGroupConverter.java index e0306d77d72..53f35f03def 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateDynamicGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateDynamicGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateDynamicGroupRequest interceptRequest(CreateDynamicGroupReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateDynamicGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateDynamicGroupDetails() == null) { - throw new NullPointerException("createDynamicGroupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateDynamicGroupDetails(), "createDynamicGroupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("dynamicGroups"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateGroupConverter.java index 851751fc075..882a8cc8085 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 CreateGroupRequest interceptRequest(CreateGroupRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateGroupDetails() == null) { - throw new NullPointerException("createGroupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateGroupDetails(), "createGroupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("groups"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateIdentityProviderConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateIdentityProviderConverter.java index d120f73908e..dfc73b55d4c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateIdentityProviderConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateIdentityProviderConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,10 @@ public static CreateIdentityProviderRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateIdentityProviderRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateIdentityProviderDetails() == null) { - throw new NullPointerException("createIdentityProviderDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateIdentityProviderDetails(), + "createIdentityProviderDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("identityProviders"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateIdpGroupMappingConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateIdpGroupMappingConverter.java index 26dd3c90061..bf3cf25a913 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateIdpGroupMappingConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateIdpGroupMappingConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,11 @@ public static CreateIdpGroupMappingRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateIdpGroupMappingRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateIdpGroupMappingDetails() == null) { - throw new NullPointerException("createIdpGroupMappingDetails is required"); - } - - if (request.getIdentityProviderId() == null) { - throw new NullPointerException("identityProviderId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateIdpGroupMappingDetails(), + "createIdpGroupMappingDetails is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateOrResetUIPasswordConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateOrResetUIPasswordConverter.java index 5ce9abf5b79..58c96f3cdeb 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateOrResetUIPasswordConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateOrResetUIPasswordConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static CreateOrResetUIPasswordRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateOrResetUIPasswordRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreatePolicyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreatePolicyConverter.java index 0981f712f7b..df09dce4eb9 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreatePolicyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreatePolicyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 CreatePolicyRequest interceptRequest(CreatePolicyRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreatePolicyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreatePolicyDetails() == null) { - throw new NullPointerException("createPolicyDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreatePolicyDetails(), "createPolicyDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("policies"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateRegionSubscriptionConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateRegionSubscriptionConverter.java index 34401502bf7..fabb58b6f2a 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateRegionSubscriptionConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateRegionSubscriptionConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,11 @@ public static CreateRegionSubscriptionRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateRegionSubscriptionRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateRegionSubscriptionDetails() == null) { - throw new NullPointerException("createRegionSubscriptionDetails is required"); - } - - if (request.getTenancyId() == null) { - throw new NullPointerException("tenancyId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateRegionSubscriptionDetails(), + "createRegionSubscriptionDetails is required"); + Validate.notBlank(request.getTenancyId(), "tenancyId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSmtpCredentialConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSmtpCredentialConverter.java index 8606e4b1732..adb0d335d80 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSmtpCredentialConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSmtpCredentialConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,11 @@ public static CreateSmtpCredentialRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateSmtpCredentialRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateSmtpCredentialDetails() == null) { - throw new NullPointerException("createSmtpCredentialDetails is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateSmtpCredentialDetails(), + "createSmtpCredentialDetails is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSwiftPasswordConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSwiftPasswordConverter.java index 7aa6b054b79..a650354aaa6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSwiftPasswordConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateSwiftPasswordConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static CreateSwiftPasswordRequest interceptRequest(CreateSwiftPasswordReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateSwiftPasswordRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateSwiftPasswordDetails() == null) { - throw new NullPointerException("createSwiftPasswordDetails is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateSwiftPasswordDetails(), "createSwiftPasswordDetails is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateTagConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateTagConverter.java index cd583e46934..fd6716b9c2f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateTagConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateTagConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static CreateTagRequest interceptRequest(CreateTagRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateTagRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getTagNamespaceId() == null) { - throw new NullPointerException("tagNamespaceId is required"); - } - - if (request.getCreateTagDetails() == null) { - throw new NullPointerException("createTagDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getTagNamespaceId(), "tagNamespaceId must not be blank"); + Validate.notNull(request.getCreateTagDetails(), "createTagDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateTagNamespaceConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateTagNamespaceConverter.java index e0cdd5d267e..1c69c03bcb2 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateTagNamespaceConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateTagNamespaceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateTagNamespaceRequest interceptRequest(CreateTagNamespaceReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateTagNamespaceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateTagNamespaceDetails() == null) { - throw new NullPointerException("createTagNamespaceDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateTagNamespaceDetails(), "createTagNamespaceDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("tagNamespaces"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateUserConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateUserConverter.java index a6d0c30b1b9..8a26b92ecc1 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateUserConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/CreateUserConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 CreateUserRequest interceptRequest(CreateUserRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateUserRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateUserDetails() == null) { - throw new NullPointerException("createUserDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateUserDetails(), "createUserDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("users"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteApiKeyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteApiKeyConverter.java index acc50193254..ac0d68a030f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteApiKeyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteApiKeyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DeleteApiKeyRequest interceptRequest(DeleteApiKeyRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteApiKeyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getFingerprint() == null) { - throw new NullPointerException("fingerprint is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notBlank(request.getFingerprint(), "fingerprint must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteCustomerSecretKeyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteCustomerSecretKeyConverter.java index 172a3c24271..226eb15b96d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteCustomerSecretKeyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteCustomerSecretKeyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,10 @@ public static DeleteCustomerSecretKeyRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteCustomerSecretKeyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getCustomerSecretKeyId() == null) { - throw new NullPointerException("customerSecretKeyId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notBlank( + request.getCustomerSecretKeyId(), "customerSecretKeyId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteDynamicGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteDynamicGroupConverter.java index 7c07dc1e36a..d3e33fb2d90 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteDynamicGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteDynamicGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 DeleteDynamicGroupRequest interceptRequest(DeleteDynamicGroupReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteDynamicGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDynamicGroupId() == null) { - throw new NullPointerException("dynamicGroupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDynamicGroupId(), "dynamicGroupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteGroupConverter.java index 3ea79e2a96b..9c23840379c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 DeleteGroupRequest interceptRequest(DeleteGroupRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getGroupId() == null) { - throw new NullPointerException("groupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getGroupId(), "groupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteIdentityProviderConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteIdentityProviderConverter.java index e5713953e01..90d6bcd1240 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteIdentityProviderConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteIdentityProviderConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static DeleteIdentityProviderRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteIdentityProviderRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIdentityProviderId() == null) { - throw new NullPointerException("identityProviderId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteIdpGroupMappingConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteIdpGroupMappingConverter.java index 45ec76ee9a5..f15705e7054 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteIdpGroupMappingConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteIdpGroupMappingConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,9 @@ public static DeleteIdpGroupMappingRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteIdpGroupMappingRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIdentityProviderId() == null) { - throw new NullPointerException("identityProviderId is required"); - } - - if (request.getMappingId() == null) { - throw new NullPointerException("mappingId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); + Validate.notBlank(request.getMappingId(), "mappingId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeletePolicyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeletePolicyConverter.java index 1c9ac2adecb..1fd0b81ffe1 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeletePolicyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeletePolicyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 DeletePolicyRequest interceptRequest(DeletePolicyRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeletePolicyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPolicyId() == null) { - throw new NullPointerException("policyId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPolicyId(), "policyId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSmtpCredentialConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSmtpCredentialConverter.java index 8f3f7aaf485..14980626af1 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSmtpCredentialConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSmtpCredentialConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,9 @@ public static DeleteSmtpCredentialRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteSmtpCredentialRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getSmtpCredentialId() == null) { - throw new NullPointerException("smtpCredentialId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notBlank(request.getSmtpCredentialId(), "smtpCredentialId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSwiftPasswordConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSwiftPasswordConverter.java index 3b2035d3fa0..017b0a7830d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSwiftPasswordConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteSwiftPasswordConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DeleteSwiftPasswordRequest interceptRequest(DeleteSwiftPasswordReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteSwiftPasswordRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getSwiftPasswordId() == null) { - throw new NullPointerException("swiftPasswordId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notBlank(request.getSwiftPasswordId(), "swiftPasswordId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteUserConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteUserConverter.java index 5e9b21cf291..99ad4f18741 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteUserConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/DeleteUserConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 DeleteUserRequest interceptRequest(DeleteUserRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteUserRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetCompartmentConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetCompartmentConverter.java index 786ce19f6e9..685d53836ad 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetCompartmentConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetCompartmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 GetCompartmentRequest interceptRequest(GetCompartmentRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetCompartmentRequest 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.notBlank(request.getCompartmentId(), "compartmentId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetDynamicGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetDynamicGroupConverter.java index 4ea6b3836c1..3093497540c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetDynamicGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetDynamicGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 GetDynamicGroupRequest interceptRequest(GetDynamicGroupRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetDynamicGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDynamicGroupId() == null) { - throw new NullPointerException("dynamicGroupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDynamicGroupId(), "dynamicGroupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetGroupConverter.java index f758461d160..ad3f9a52536 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 GetGroupRequest interceptRequest(GetGroupRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getGroupId() == null) { - throw new NullPointerException("groupId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getGroupId(), "groupId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetIdentityProviderConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetIdentityProviderConverter.java index 68d252f0bf8..382dcd75568 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetIdentityProviderConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetIdentityProviderConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 GetIdentityProviderRequest interceptRequest(GetIdentityProviderReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetIdentityProviderRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIdentityProviderId() == null) { - throw new NullPointerException("identityProviderId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetIdpGroupMappingConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetIdpGroupMappingConverter.java index b6bed64b703..b3744045bd6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetIdpGroupMappingConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetIdpGroupMappingConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetIdpGroupMappingRequest interceptRequest(GetIdpGroupMappingReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetIdpGroupMappingRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIdentityProviderId() == null) { - throw new NullPointerException("identityProviderId is required"); - } - - if (request.getMappingId() == null) { - throw new NullPointerException("mappingId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); + Validate.notBlank(request.getMappingId(), "mappingId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetPolicyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetPolicyConverter.java index 42ba0fbf484..a662a0fa83c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetPolicyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetPolicyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 GetPolicyRequest interceptRequest(GetPolicyRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetPolicyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPolicyId() == null) { - throw new NullPointerException("policyId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPolicyId(), "policyId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTagConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTagConverter.java index 0cb4287a5e3..f41e6b00603 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTagConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTagConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetTagRequest interceptRequest(GetTagRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetTagRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getTagNamespaceId() == null) { - throw new NullPointerException("tagNamespaceId is required"); - } - - if (request.getTagName() == null) { - throw new NullPointerException("tagName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getTagNamespaceId(), "tagNamespaceId must not be blank"); + Validate.notBlank(request.getTagName(), "tagName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTagNamespaceConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTagNamespaceConverter.java index 1ca1f3934ad..c081ee44124 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTagNamespaceConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTagNamespaceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 GetTagNamespaceRequest interceptRequest(GetTagNamespaceRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetTagNamespaceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getTagNamespaceId() == null) { - throw new NullPointerException("tagNamespaceId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getTagNamespaceId(), "tagNamespaceId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTenancyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTenancyConverter.java index 416beae49a2..edbc57dc107 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTenancyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetTenancyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 GetTenancyRequest interceptRequest(GetTenancyRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetTenancyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getTenancyId() == null) { - throw new NullPointerException("tenancyId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getTenancyId(), "tenancyId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserConverter.java index 7d2e4ec745f..2fb99c622e0 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 GetUserRequest interceptRequest(GetUserRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetUserRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserGroupMembershipConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserGroupMembershipConverter.java index 406ae572d61..815d1c70f74 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserGroupMembershipConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/GetUserGroupMembershipConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,9 @@ public static GetUserGroupMembershipRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetUserGroupMembershipRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserGroupMembershipId() == null) { - throw new NullPointerException("userGroupMembershipId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getUserGroupMembershipId(), "userGroupMembershipId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListApiKeysConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListApiKeysConverter.java index 8b6b206db9d..6dd7c7c8c1a 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListApiKeysConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListApiKeysConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListApiKeysRequest interceptRequest(ListApiKeysRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListApiKeysRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListAvailabilityDomainsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListAvailabilityDomainsConverter.java index 4069e57b50a..fe854f90569 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListAvailabilityDomainsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListAvailabilityDomainsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListAvailabilityDomainsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListAvailabilityDomainsRequest 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("availabilityDomains"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCompartmentsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCompartmentsConverter.java index 7ee9159ba23..ffa82805cd6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCompartmentsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCompartmentsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListCompartmentsRequest interceptRequest(ListCompartmentsRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListCompartmentsRequest 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("compartments"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCustomerSecretKeysConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCustomerSecretKeysConverter.java index 923189491d3..599dac0eb6d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCustomerSecretKeysConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListCustomerSecretKeysConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static ListCustomerSecretKeysRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListCustomerSecretKeysRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListDynamicGroupsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListDynamicGroupsConverter.java index 6c44fdbfd6f..377e949ccaf 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListDynamicGroupsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListDynamicGroupsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListDynamicGroupsRequest interceptRequest(ListDynamicGroupsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListDynamicGroupsRequest 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("dynamicGroups"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListGroupsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListGroupsConverter.java index 5bd270db75f..9f91ea23382 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListGroupsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListGroupsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListGroupsRequest interceptRequest(ListGroupsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListGroupsRequest 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("groups"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdentityProvidersConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdentityProvidersConverter.java index 9c6c1128fb4..c4c0cf28da8 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdentityProvidersConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdentityProvidersConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,9 @@ public static ListIdentityProvidersRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListIdentityProvidersRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getProtocol() == null) { - throw new NullPointerException("protocol is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getProtocol(), "protocol is required"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("identityProviders"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdpGroupMappingsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdpGroupMappingsConverter.java index 94633a3bc2d..0ee56b9c82d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdpGroupMappingsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdpGroupMappingsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static ListIdpGroupMappingsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListIdpGroupMappingsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIdentityProviderId() == null) { - throw new NullPointerException("identityProviderId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListPoliciesConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListPoliciesConverter.java index 09192b76f27..6b37cfb5571 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListPoliciesConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListPoliciesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListPoliciesRequest interceptRequest(ListPoliciesRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListPoliciesRequest 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("policies"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListRegionSubscriptionsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListRegionSubscriptionsConverter.java index 8bffa16ab06..76ea5cb3473 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListRegionSubscriptionsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListRegionSubscriptionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListRegionSubscriptionsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListRegionSubscriptionsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getTenancyId() == null) { - throw new NullPointerException("tenancyId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getTenancyId(), "tenancyId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListRegionsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListRegionsConverter.java index 0f45664e999..3d6d1f46f7c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListRegionsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListRegionsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,9 +22,7 @@ public static ListRegionsRequest interceptRequest(ListRegionsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListRegionsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } + Validate.notNull(request, "request instance is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20160918").path("regions"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSmtpCredentialsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSmtpCredentialsConverter.java index c03860f32bd..a0407649575 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSmtpCredentialsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSmtpCredentialsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListSmtpCredentialsRequest interceptRequest(ListSmtpCredentialsReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListSmtpCredentialsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSwiftPasswordsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSwiftPasswordsConverter.java index 846f077a20b..47c6ce03c28 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSwiftPasswordsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListSwiftPasswordsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListSwiftPasswordsRequest interceptRequest(ListSwiftPasswordsReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListSwiftPasswordsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListTagNamespacesConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListTagNamespacesConverter.java index 6291c918720..a40923344f5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListTagNamespacesConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListTagNamespacesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListTagNamespacesRequest interceptRequest(ListTagNamespacesRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListTagNamespacesRequest 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("tagNamespaces"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListTagsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListTagsConverter.java index 3e59b8dc320..8ce5faa2fa5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListTagsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListTagsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListTagsRequest interceptRequest(ListTagsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListTagsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getTagNamespaceId() == null) { - throw new NullPointerException("tagNamespaceId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getTagNamespaceId(), "tagNamespaceId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUserGroupMembershipsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUserGroupMembershipsConverter.java index f2af31f6903..bd3e15285a0 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUserGroupMembershipsConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUserGroupMembershipsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListUserGroupMembershipsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListUserGroupMembershipsRequest 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("userGroupMemberships"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java index fe8656ca63f..6a884962d6c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 ListUsersRequest interceptRequest(ListUsersRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListUsersRequest 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("users"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/RemoveUserFromGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/RemoveUserFromGroupConverter.java index 3113f13c708..65764733b3b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/RemoveUserFromGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/RemoveUserFromGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static RemoveUserFromGroupRequest interceptRequest(RemoveUserFromGroupReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, RemoveUserFromGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserGroupMembershipId() == null) { - throw new NullPointerException("userGroupMembershipId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank( + request.getUserGroupMembershipId(), "userGroupMembershipId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCompartmentConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCompartmentConverter.java index b01d337a448..70b277ff30b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCompartmentConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCompartmentConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateCompartmentRequest interceptRequest(UpdateCompartmentRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateCompartmentRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } - - if (request.getUpdateCompartmentDetails() == null) { - throw new NullPointerException("updateCompartmentDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getCompartmentId(), "compartmentId must not be blank"); + Validate.notNull( + request.getUpdateCompartmentDetails(), "updateCompartmentDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCustomerSecretKeyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCustomerSecretKeyConverter.java index 0c6ecf3e671..f0f11fd5db7 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCustomerSecretKeyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateCustomerSecretKeyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,21 +24,13 @@ public static UpdateCustomerSecretKeyRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateCustomerSecretKeyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getCustomerSecretKeyId() == null) { - throw new NullPointerException("customerSecretKeyId is required"); - } - - if (request.getUpdateCustomerSecretKeyDetails() == null) { - throw new NullPointerException("updateCustomerSecretKeyDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notBlank( + request.getCustomerSecretKeyId(), "customerSecretKeyId must not be blank"); + Validate.notNull( + request.getUpdateCustomerSecretKeyDetails(), + "updateCustomerSecretKeyDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateDynamicGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateDynamicGroupConverter.java index d5fa7cf2c5b..76bc615d760 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateDynamicGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateDynamicGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateDynamicGroupRequest interceptRequest(UpdateDynamicGroupReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateDynamicGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getDynamicGroupId() == null) { - throw new NullPointerException("dynamicGroupId is required"); - } - - if (request.getUpdateDynamicGroupDetails() == null) { - throw new NullPointerException("updateDynamicGroupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getDynamicGroupId(), "dynamicGroupId must not be blank"); + Validate.notNull( + request.getUpdateDynamicGroupDetails(), "updateDynamicGroupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateGroupConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateGroupConverter.java index 5607e25bd15..c82cc138ed9 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateGroupConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateGroupConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateGroupRequest interceptRequest(UpdateGroupRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateGroupRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getGroupId() == null) { - throw new NullPointerException("groupId is required"); - } - - if (request.getUpdateGroupDetails() == null) { - throw new NullPointerException("updateGroupDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getGroupId(), "groupId must not be blank"); + Validate.notNull(request.getUpdateGroupDetails(), "updateGroupDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateIdentityProviderConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateIdentityProviderConverter.java index 7a218dbbfe5..256c2fbcfb7 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateIdentityProviderConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateIdentityProviderConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,11 @@ public static UpdateIdentityProviderRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateIdentityProviderRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIdentityProviderId() == null) { - throw new NullPointerException("identityProviderId is required"); - } - - if (request.getUpdateIdentityProviderDetails() == null) { - throw new NullPointerException("updateIdentityProviderDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); + Validate.notNull( + request.getUpdateIdentityProviderDetails(), + "updateIdentityProviderDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateIdpGroupMappingConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateIdpGroupMappingConverter.java index b53b444e107..f60da3058ab 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateIdpGroupMappingConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateIdpGroupMappingConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,21 +23,12 @@ public static UpdateIdpGroupMappingRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateIdpGroupMappingRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getIdentityProviderId() == null) { - throw new NullPointerException("identityProviderId is required"); - } - - if (request.getMappingId() == null) { - throw new NullPointerException("mappingId is required"); - } - - if (request.getUpdateIdpGroupMappingDetails() == null) { - throw new NullPointerException("updateIdpGroupMappingDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); + Validate.notBlank(request.getMappingId(), "mappingId must not be blank"); + Validate.notNull( + request.getUpdateIdpGroupMappingDetails(), + "updateIdpGroupMappingDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdatePolicyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdatePolicyConverter.java index 5a794a529ea..a236f1730d0 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdatePolicyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdatePolicyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdatePolicyRequest interceptRequest(UpdatePolicyRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdatePolicyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getPolicyId() == null) { - throw new NullPointerException("policyId is required"); - } - - if (request.getUpdatePolicyDetails() == null) { - throw new NullPointerException("updatePolicyDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getPolicyId(), "policyId must not be blank"); + Validate.notNull(request.getUpdatePolicyDetails(), "updatePolicyDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSmtpCredentialConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSmtpCredentialConverter.java index 266b1d1305a..0b7cb7fa4d6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSmtpCredentialConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSmtpCredentialConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,21 +23,12 @@ public static UpdateSmtpCredentialRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateSmtpCredentialRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getSmtpCredentialId() == null) { - throw new NullPointerException("smtpCredentialId is required"); - } - - if (request.getUpdateSmtpCredentialDetails() == null) { - throw new NullPointerException("updateSmtpCredentialDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notBlank(request.getSmtpCredentialId(), "smtpCredentialId must not be blank"); + Validate.notNull( + request.getUpdateSmtpCredentialDetails(), + "updateSmtpCredentialDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSwiftPasswordConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSwiftPasswordConverter.java index aa669dca443..88a4cf1913c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSwiftPasswordConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateSwiftPasswordConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,11 @@ public static UpdateSwiftPasswordRequest interceptRequest(UpdateSwiftPasswordReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateSwiftPasswordRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getSwiftPasswordId() == null) { - throw new NullPointerException("swiftPasswordId is required"); - } - - if (request.getUpdateSwiftPasswordDetails() == null) { - throw new NullPointerException("updateSwiftPasswordDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notBlank(request.getSwiftPasswordId(), "swiftPasswordId must not be blank"); + Validate.notNull( + request.getUpdateSwiftPasswordDetails(), "updateSwiftPasswordDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateTagConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateTagConverter.java index b2b31226e11..af6f67778d6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateTagConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateTagConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.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 UpdateTagRequest interceptRequest(UpdateTagRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateTagRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getTagNamespaceId() == null) { - throw new NullPointerException("tagNamespaceId is required"); - } - - if (request.getTagName() == null) { - throw new NullPointerException("tagName is required"); - } - - if (request.getUpdateTagDetails() == null) { - throw new NullPointerException("updateTagDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getTagNamespaceId(), "tagNamespaceId must not be blank"); + Validate.notBlank(request.getTagName(), "tagName must not be blank"); + Validate.notNull(request.getUpdateTagDetails(), "updateTagDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateTagNamespaceConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateTagNamespaceConverter.java index 277ebd2acd9..8bff82c804e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateTagNamespaceConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateTagNamespaceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateTagNamespaceRequest interceptRequest(UpdateTagNamespaceReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateTagNamespaceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getTagNamespaceId() == null) { - throw new NullPointerException("tagNamespaceId is required"); - } - - if (request.getUpdateTagNamespaceDetails() == null) { - throw new NullPointerException("updateTagNamespaceDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getTagNamespaceId(), "tagNamespaceId must not be blank"); + Validate.notNull( + request.getUpdateTagNamespaceDetails(), "updateTagNamespaceDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserConverter.java index c66a5152c01..79a13886b53 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateUserRequest interceptRequest(UpdateUserRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateUserRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getUpdateUserDetails() == null) { - throw new NullPointerException("updateUserDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notNull(request.getUpdateUserDetails(), "updateUserDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserStateConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserStateConverter.java index d15fd534a70..84dde126136 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserStateConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserStateConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UpdateUserStateRequest interceptRequest(UpdateUserStateRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateUserStateRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getUpdateStateDetails() == null) { - throw new NullPointerException("updateStateDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notNull(request.getUpdateStateDetails(), "updateStateDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UploadApiKeyConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UploadApiKeyConverter.java index 62e644b6e52..caee68c16d3 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UploadApiKeyConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UploadApiKeyConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.identity.model.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static UploadApiKeyRequest interceptRequest(UploadApiKeyRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UploadApiKeyRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUserId() == null) { - throw new NullPointerException("userId is required"); - } - - if (request.getCreateApiKeyDetails() == null) { - throw new NullPointerException("createApiKeyDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notNull(request.getCreateApiKeyDetails(), "createApiKeyDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/pom.xml b/bmc-loadbalancer/pom.xml index 3bf0b6f4c1b..901f38818d0 100644 --- a/bmc-loadbalancer/pom.xml +++ b/bmc-loadbalancer/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerAsyncClient.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerAsyncClient.java index 593b09a9fdf..b6ce68c3c46 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerAsyncClient.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerAsyncClient.java @@ -165,133 +165,24 @@ public LoadBalancerAsyncClient( * @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 - 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 - 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 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 { + 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 */ diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerClient.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerClient.java index 5dbca011683..c8f9224ddc1 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerClient.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerClient.java @@ -187,135 +187,26 @@ public LoadBalancerClient( * @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 - 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 - 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 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 { + 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 LoadBalancerClient build( @lombok.NonNull diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateBackendConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateBackendConverter.java index 7f9258f00ab..cb91973e675 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateBackendConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateBackendConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,10 @@ public static CreateBackendRequest interceptRequest(CreateBackendRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateBackendRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateBackendDetails() == null) { - throw new NullPointerException("createBackendDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateBackendDetails(), "createBackendDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateBackendSetConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateBackendSetConverter.java index e9f578199be..1f5c0e4401f 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateBackendSetConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateBackendSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static CreateBackendSetRequest interceptRequest(CreateBackendSetRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateBackendSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateBackendSetDetails() == null) { - throw new NullPointerException("createBackendSetDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateBackendSetDetails(), "createBackendSetDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateCertificateConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateCertificateConverter.java index 52b2d71fd2c..44416ca7862 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateCertificateConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateCertificateConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static CreateCertificateRequest interceptRequest(CreateCertificateRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateCertificateRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateCertificateDetails() == null) { - throw new NullPointerException("createCertificateDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateCertificateDetails(), "createCertificateDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateListenerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateListenerConverter.java index e32ad4bdaf1..d07e6bc5d86 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateListenerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateListenerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static CreateListenerRequest interceptRequest(CreateListenerRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateListenerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateListenerDetails() == null) { - throw new NullPointerException("createListenerDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getCreateListenerDetails(), "createListenerDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateLoadBalancerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateLoadBalancerConverter.java index 650a79d987f..28c070108d1 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateLoadBalancerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreateLoadBalancerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,9 @@ public static CreateLoadBalancerRequest interceptRequest(CreateLoadBalancerReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateLoadBalancerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreateLoadBalancerDetails() == null) { - throw new NullPointerException("createLoadBalancerDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreateLoadBalancerDetails(), "createLoadBalancerDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/20170115").path("loadBalancers"); diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreatePathRouteSetConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreatePathRouteSetConverter.java index b73628d300e..9bb052857f7 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreatePathRouteSetConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/CreatePathRouteSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static CreatePathRouteSetRequest interceptRequest(CreatePathRouteSetReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreatePathRouteSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getCreatePathRouteSetDetails() == null) { - throw new NullPointerException("createPathRouteSetDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getCreatePathRouteSetDetails(), "createPathRouteSetDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteBackendConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteBackendConverter.java index 1e3dca95a49..7bf8e8f600f 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteBackendConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteBackendConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,10 @@ public static DeleteBackendRequest interceptRequest(DeleteBackendRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteBackendRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } - - if (request.getBackendName() == null) { - throw new NullPointerException("backendName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); + Validate.notBlank(request.getBackendName(), "backendName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteBackendSetConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteBackendSetConverter.java index 831949d4913..73eb88d11d0 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteBackendSetConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteBackendSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DeleteBackendSetRequest interceptRequest(DeleteBackendSetRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteBackendSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteCertificateConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteCertificateConverter.java index edad2cc32b5..8ccf5cca401 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteCertificateConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteCertificateConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DeleteCertificateRequest interceptRequest(DeleteCertificateRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteCertificateRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getCertificateName() == null) { - throw new NullPointerException("certificateName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getCertificateName(), "certificateName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteListenerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteListenerConverter.java index a00e1c6e9f6..90fbe1d395d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteListenerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteListenerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DeleteListenerRequest interceptRequest(DeleteListenerRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteListenerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getListenerName() == null) { - throw new NullPointerException("listenerName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getListenerName(), "listenerName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteLoadBalancerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteLoadBalancerConverter.java index 7fefda50098..afcccd29dfa 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteLoadBalancerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeleteLoadBalancerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static DeleteLoadBalancerRequest interceptRequest(DeleteLoadBalancerReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteLoadBalancerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeletePathRouteSetConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeletePathRouteSetConverter.java index 6a2c0221a95..d5669e5ee23 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeletePathRouteSetConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/DeletePathRouteSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DeletePathRouteSetRequest interceptRequest(DeletePathRouteSetReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeletePathRouteSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getPathRouteSetName() == null) { - throw new NullPointerException("pathRouteSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getPathRouteSetName(), "pathRouteSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendConverter.java index 16313da2d20..9bc47c3ac7a 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,10 @@ public static GetBackendRequest interceptRequest(GetBackendRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetBackendRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } - - if (request.getBackendName() == null) { - throw new NullPointerException("backendName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); + Validate.notBlank(request.getBackendName(), "backendName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendHealthConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendHealthConverter.java index e3c96180231..19214fa4c6d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendHealthConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendHealthConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,10 @@ public static GetBackendHealthRequest interceptRequest(GetBackendHealthRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetBackendHealthRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } - - if (request.getBackendName() == null) { - throw new NullPointerException("backendName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); + Validate.notBlank(request.getBackendName(), "backendName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendSetConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendSetConverter.java index 681069c5bfa..c603ece8569 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendSetConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetBackendSetRequest interceptRequest(GetBackendSetRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetBackendSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendSetHealthConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendSetHealthConverter.java index 0814b10ffd8..533fac4eccb 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendSetHealthConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetBackendSetHealthConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetBackendSetHealthRequest interceptRequest(GetBackendSetHealthReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetBackendSetHealthRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetHealthCheckerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetHealthCheckerConverter.java index 6d7dcf8155a..8afc80ada76 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetHealthCheckerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetHealthCheckerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetHealthCheckerRequest interceptRequest(GetHealthCheckerRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetHealthCheckerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetLoadBalancerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetLoadBalancerConverter.java index d57359a1ea3..f9dea6dd158 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetLoadBalancerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetLoadBalancerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetLoadBalancerRequest interceptRequest(GetLoadBalancerRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetLoadBalancerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetLoadBalancerHealthConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetLoadBalancerHealthConverter.java index f8b0601551d..6b858c5b687 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetLoadBalancerHealthConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetLoadBalancerHealthConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static GetLoadBalancerHealthRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetLoadBalancerHealthRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetPathRouteSetConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetPathRouteSetConverter.java index 2b7e8065a35..cbfe6e70c25 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetPathRouteSetConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetPathRouteSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetPathRouteSetRequest interceptRequest(GetPathRouteSetRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetPathRouteSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getPathRouteSetName() == null) { - throw new NullPointerException("pathRouteSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getPathRouteSetName(), "pathRouteSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetWorkRequestConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetWorkRequestConverter.java index 89ad9b5a5fb..1d0182617be 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetWorkRequestConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/GetWorkRequestConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static GetWorkRequestRequest interceptRequest(GetWorkRequestRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetWorkRequestRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getWorkRequestId() == null) { - throw new NullPointerException("workRequestId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getWorkRequestId(), "workRequestId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListBackendSetsConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListBackendSetsConverter.java index 76452c8f7e1..6a1d6c4ca0f 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListBackendSetsConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListBackendSetsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListBackendSetsRequest interceptRequest(ListBackendSetsRequest req public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListBackendSetsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListBackendsConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListBackendsConverter.java index eab680ae9a8..4d52954a39d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListBackendsConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListBackendsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListBackendsRequest interceptRequest(ListBackendsRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListBackendsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListCertificatesConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListCertificatesConverter.java index 49dc73bb9db..8369f5afb91 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListCertificatesConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListCertificatesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListCertificatesRequest interceptRequest(ListCertificatesRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListCertificatesRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancerHealthsConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancerHealthsConverter.java index 36936db18d6..751a353980d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancerHealthsConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancerHealthsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -23,13 +24,8 @@ public static ListLoadBalancerHealthsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListLoadBalancerHealthsRequest 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("/20170115").path("loadBalancerHealths"); diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancersConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancersConverter.java index ea917290b9c..97fe5f610de 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancersConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancersConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListLoadBalancersRequest interceptRequest(ListLoadBalancersRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListLoadBalancersRequest 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("/20170115").path("loadBalancers"); diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListPathRouteSetsConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListPathRouteSetsConverter.java index 64583d1b30c..b08e47345ae 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListPathRouteSetsConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListPathRouteSetsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListPathRouteSetsRequest interceptRequest(ListPathRouteSetsRequest public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListPathRouteSetsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListPoliciesConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListPoliciesConverter.java index 422f1aacfaa..623edcdc0bf 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListPoliciesConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListPoliciesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListPoliciesRequest interceptRequest(ListPoliciesRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListPoliciesRequest 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("/20170115").path("loadBalancerPolicies"); diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListProtocolsConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListProtocolsConverter.java index 728acccbea1..f46589b38b6 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListProtocolsConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListProtocolsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListProtocolsRequest interceptRequest(ListProtocolsRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListProtocolsRequest 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("/20170115").path("loadBalancerProtocols"); diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListShapesConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListShapesConverter.java index 09395191264..7b09e919518 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListShapesConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListShapesConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListShapesRequest interceptRequest(ListShapesRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListShapesRequest 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("/20170115").path("loadBalancerShapes"); diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListWorkRequestsConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListWorkRequestsConverter.java index d48d753c63c..e4081b280a7 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListWorkRequestsConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListWorkRequestsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,13 +22,8 @@ public static ListWorkRequestsRequest interceptRequest(ListWorkRequestsRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListWorkRequestsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateBackendConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateBackendConverter.java index f611e8946fa..c09e05652d8 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateBackendConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateBackendConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,25 +22,11 @@ public static UpdateBackendRequest interceptRequest(UpdateBackendRequest request public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateBackendRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUpdateBackendDetails() == null) { - throw new NullPointerException("updateBackendDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } - - if (request.getBackendName() == null) { - throw new NullPointerException("backendName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getUpdateBackendDetails(), "updateBackendDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); + Validate.notBlank(request.getBackendName(), "backendName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateBackendSetConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateBackendSetConverter.java index e5a2e41b11c..5fb9877a95b 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateBackendSetConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateBackendSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,11 @@ public static UpdateBackendSetRequest interceptRequest(UpdateBackendSetRequest r public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateBackendSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUpdateBackendSetDetails() == null) { - throw new NullPointerException("updateBackendSetDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getUpdateBackendSetDetails(), "updateBackendSetDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateHealthCheckerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateHealthCheckerConverter.java index b3083ca7897..d5140451bf2 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateHealthCheckerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateHealthCheckerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,10 @@ public static UpdateHealthCheckerRequest interceptRequest(UpdateHealthCheckerReq public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateHealthCheckerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getHealthChecker() == null) { - throw new NullPointerException("healthChecker is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getBackendSetName() == null) { - throw new NullPointerException("backendSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getHealthChecker(), "healthChecker is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getBackendSetName(), "backendSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateListenerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateListenerConverter.java index 90c9afa0c57..1280918b379 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateListenerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateListenerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,10 @@ public static UpdateListenerRequest interceptRequest(UpdateListenerRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateListenerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUpdateListenerDetails() == null) { - throw new NullPointerException("updateListenerDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getListenerName() == null) { - throw new NullPointerException("listenerName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull(request.getUpdateListenerDetails(), "updateListenerDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getListenerName(), "listenerName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateLoadBalancerConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateLoadBalancerConverter.java index 764692d0991..d487ba430ab 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateLoadBalancerConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdateLoadBalancerConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,10 @@ public static UpdateLoadBalancerRequest interceptRequest(UpdateLoadBalancerReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateLoadBalancerRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUpdateLoadBalancerDetails() == null) { - throw new NullPointerException("updateLoadBalancerDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getUpdateLoadBalancerDetails(), "updateLoadBalancerDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdatePathRouteSetConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdatePathRouteSetConverter.java index b733d5c378b..f5b514f3e81 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdatePathRouteSetConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/UpdatePathRouteSetConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.loadbalancer.model.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @lombok.extern.slf4j.Slf4j @@ -21,21 +22,11 @@ public static UpdatePathRouteSetRequest interceptRequest(UpdatePathRouteSetReque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdatePathRouteSetRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getUpdatePathRouteSetDetails() == null) { - throw new NullPointerException("updatePathRouteSetDetails is required"); - } - - if (request.getLoadBalancerId() == null) { - throw new NullPointerException("loadBalancerId is required"); - } - - if (request.getPathRouteSetName() == null) { - throw new NullPointerException("pathRouteSetName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notNull( + request.getUpdatePathRouteSetDetails(), "updatePathRouteSetDetails is required"); + Validate.notBlank(request.getLoadBalancerId(), "loadBalancerId must not be blank"); + Validate.notBlank(request.getPathRouteSetName(), "pathRouteSetName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-combined/pom.xml b/bmc-objectstorage/bmc-objectstorage-combined/pom.xml index ba97bccc3f2..b63640ae5ea 100644 --- a/bmc-objectstorage/bmc-objectstorage-combined/pom.xml +++ b/bmc-objectstorage/bmc-objectstorage-combined/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-parent - 1.2.33 + 1.2.34 ../pom.xml @@ -47,14 +47,14 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-generated - 1.2.33 + 1.2.34 jar compile com.oracle.oci.sdk oci-java-sdk-objectstorage-extensions - 1.2.33 + 1.2.34 jar compile diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml b/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml index f49c1b11291..e943f84853f 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml +++ b/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-parent - 1.2.33 + 1.2.34 ../pom.xml @@ -18,12 +18,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 com.oracle.oci.sdk oci-java-sdk-objectstorage-generated - 1.2.33 + 1.2.34 diff --git a/bmc-objectstorage/bmc-objectstorage-generated/pom.xml b/bmc-objectstorage/bmc-objectstorage-generated/pom.xml index 2c03ba1d346..1ca2a82dc7c 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/pom.xml +++ b/bmc-objectstorage/bmc-objectstorage-generated/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-parent - 1.2.33 + 1.2.34 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java index 3360ed3db42..912ee8f8aa3 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java @@ -167,133 +167,24 @@ public ObjectStorageAsyncClient( * @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 - 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.OBJECT_STORAGE); - protected String endpoint; - - private Builder() {} - - private Builder( - com.oracle.bmc.ClientConfiguration configuration, - com.oracle.bmc.http.ClientConfigurator clientConfigurator, - java.util.List - 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.OBJECT_STORAGE); - } 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 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 { + private Builder(com.oracle.bmc.Service service) { + super(service); + requestSignerFactory = + new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory( + com.oracle.bmc.http.signing.SigningStrategy.OBJECT_STORAGE); } /** - * Build the client, with the authentication details provider. + * Build the client. * @param authenticationDetailsProvider authentication details provider * @return the client */ diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java index 7ca02adfc23..b292f124b7c 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java @@ -173,135 +173,26 @@ public ObjectStorageClient( * @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 - 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.OBJECT_STORAGE); - protected String endpoint; - - private Builder() {} - - private Builder( - com.oracle.bmc.ClientConfiguration configuration, - com.oracle.bmc.http.ClientConfigurator clientConfigurator, - java.util.List - 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.OBJECT_STORAGE); - } 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 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 { + private Builder(com.oracle.bmc.Service service) { + super(service); + requestSignerFactory = + new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory( + com.oracle.bmc.http.signing.SigningStrategy.OBJECT_STORAGE); } /** - * 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 ObjectStorageClient build( @lombok.NonNull diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/AbortMultipartUploadConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/AbortMultipartUploadConverter.java index 0851d032b86..8e81b63c273 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/AbortMultipartUploadConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/AbortMultipartUploadConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,25 +23,11 @@ public static AbortMultipartUploadRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, AbortMultipartUploadRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getObjectName() == null) { - throw new NullPointerException("objectName is required"); - } - - if (request.getUploadId() == null) { - throw new NullPointerException("uploadId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getObjectName(), "objectName must not be blank"); + Validate.notNull(request.getUploadId(), "uploadId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CommitMultipartUploadConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CommitMultipartUploadConverter.java index 01b037b78cf..5d7c5b69109 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CommitMultipartUploadConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CommitMultipartUploadConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,29 +23,14 @@ public static CommitMultipartUploadRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CommitMultipartUploadRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getObjectName() == null) { - throw new NullPointerException("objectName is required"); - } - - if (request.getUploadId() == null) { - throw new NullPointerException("uploadId is required"); - } - - if (request.getCommitMultipartUploadDetails() == null) { - throw new NullPointerException("commitMultipartUploadDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getObjectName(), "objectName must not be blank"); + Validate.notNull(request.getUploadId(), "uploadId is required"); + Validate.notNull( + request.getCommitMultipartUploadDetails(), + "commitMultipartUploadDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateBucketConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateBucketConverter.java index 8a6c5665124..c10bf3acca9 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateBucketConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateBucketConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static CreateBucketRequest interceptRequest(CreateBucketRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateBucketRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getCreateBucketDetails() == null) { - throw new NullPointerException("createBucketDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notNull(request.getCreateBucketDetails(), "createBucketDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateMultipartUploadConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateMultipartUploadConverter.java index 5190a9f1356..f3776161d3d 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateMultipartUploadConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreateMultipartUploadConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,21 +23,12 @@ public static CreateMultipartUploadRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreateMultipartUploadRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getCreateMultipartUploadDetails() == null) { - throw new NullPointerException("createMultipartUploadDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notNull( + request.getCreateMultipartUploadDetails(), + "createMultipartUploadDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreatePreauthenticatedRequestConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreatePreauthenticatedRequestConverter.java index 8f0fcdc8854..34c73fe35d8 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreatePreauthenticatedRequestConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/CreatePreauthenticatedRequestConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,21 +24,12 @@ public static CreatePreauthenticatedRequestRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, CreatePreauthenticatedRequestRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getCreatePreauthenticatedRequestDetails() == null) { - throw new NullPointerException("createPreauthenticatedRequestDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notNull( + request.getCreatePreauthenticatedRequestDetails(), + "createPreauthenticatedRequestDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteBucketConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteBucketConverter.java index 83e99252df9..11ea411a5c0 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteBucketConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteBucketConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static DeleteBucketRequest interceptRequest(DeleteBucketRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteBucketRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteObjectConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteObjectConverter.java index 75d9d50744d..5457fb8467e 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteObjectConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeleteObjectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.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 DeleteObjectRequest interceptRequest(DeleteObjectRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeleteObjectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getObjectName() == null) { - throw new NullPointerException("objectName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getObjectName(), "objectName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeletePreauthenticatedRequestConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeletePreauthenticatedRequestConverter.java index d7df664aa5e..2419aa297de 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeletePreauthenticatedRequestConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/DeletePreauthenticatedRequestConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,21 +24,10 @@ public static DeletePreauthenticatedRequestRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, DeletePreauthenticatedRequestRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getParId() == null) { - throw new NullPointerException("parId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getParId(), "parId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetBucketConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetBucketConverter.java index f8439c4cee0..daff2662f33 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetBucketConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetBucketConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static GetBucketRequest interceptRequest(GetBucketRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetBucketRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceConverter.java index 4d8fa9a5510..da5b0c2122f 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,9 +22,7 @@ public static GetNamespaceRequest interceptRequest(GetNamespaceRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetNamespaceRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } + Validate.notNull(request, "request instance is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget().path("/").path("n"); diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceMetadataConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceMetadataConverter.java index c1bebe7796f..0d627bca78c 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceMetadataConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetNamespaceMetadataConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,13 +23,8 @@ public static GetNamespaceMetadataRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetNamespaceMetadataRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java index cf1f829a5ca..f308f4ca131 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.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 GetObjectRequest interceptRequest(GetObjectRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetObjectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getObjectName() == null) { - throw new NullPointerException("objectName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getObjectName(), "objectName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetPreauthenticatedRequestConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetPreauthenticatedRequestConverter.java index e6b0d47d4b2..5aaa7d687a1 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetPreauthenticatedRequestConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetPreauthenticatedRequestConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,21 +24,10 @@ public static GetPreauthenticatedRequestRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, GetPreauthenticatedRequestRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getParId() == null) { - throw new NullPointerException("parId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getParId(), "parId must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadBucketConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadBucketConverter.java index fb75a177035..099fdea2e1f 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadBucketConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadBucketConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static HeadBucketRequest interceptRequest(HeadBucketRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, HeadBucketRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java index d314974a0f1..eacee1b21e1 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.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 HeadObjectRequest interceptRequest(HeadObjectRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, HeadObjectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getObjectName() == null) { - throw new NullPointerException("objectName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getObjectName(), "objectName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListBucketsConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListBucketsConverter.java index dba02da4570..5d7ff35b47b 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListBucketsConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListBucketsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListBucketsRequest interceptRequest(ListBucketsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListBucketsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getCompartmentId() == null) { - throw new NullPointerException("compartmentId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notNull(request.getCompartmentId(), "compartmentId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListMultipartUploadPartsConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListMultipartUploadPartsConverter.java index 79533dc2e3a..1fa46bfa896 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListMultipartUploadPartsConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListMultipartUploadPartsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,25 +24,11 @@ public static ListMultipartUploadPartsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListMultipartUploadPartsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getObjectName() == null) { - throw new NullPointerException("objectName is required"); - } - - if (request.getUploadId() == null) { - throw new NullPointerException("uploadId is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getObjectName(), "objectName must not be blank"); + Validate.notNull(request.getUploadId(), "uploadId is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListMultipartUploadsConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListMultipartUploadsConverter.java index bbb08c0f091..1d0e1baff5c 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListMultipartUploadsConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListMultipartUploadsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -22,17 +23,9 @@ public static ListMultipartUploadsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListMultipartUploadsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListObjectsConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListObjectsConverter.java index 10d784a7304..02d2f233789 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListObjectsConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListObjectsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,17 +22,9 @@ public static ListObjectsRequest interceptRequest(ListObjectsRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListObjectsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListPreauthenticatedRequestsConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListPreauthenticatedRequestsConverter.java index a3cc775535d..c5a578bdd52 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListPreauthenticatedRequestsConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/ListPreauthenticatedRequestsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,9 @@ public static ListPreauthenticatedRequestsRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, ListPreauthenticatedRequestsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/PutObjectConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/PutObjectConverter.java index d99826c83da..2c352160db0 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/PutObjectConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/PutObjectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,25 +22,11 @@ public static PutObjectRequest interceptRequest(PutObjectRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, PutObjectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getObjectName() == null) { - throw new NullPointerException("objectName is required"); - } - - if (request.getPutObjectBody() == null) { - throw new NullPointerException("putObjectBody is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getObjectName(), "objectName must not be blank"); + Validate.notNull(request.getPutObjectBody(), "putObjectBody is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/RenameObjectConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/RenameObjectConverter.java index 8c84e66a961..fd99370e286 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/RenameObjectConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/RenameObjectConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.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 RenameObjectRequest interceptRequest(RenameObjectRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, RenameObjectRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getRenameObjectDetails() == null) { - throw new NullPointerException("renameObjectDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notNull(request.getRenameObjectDetails(), "renameObjectDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/RestoreObjectsConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/RestoreObjectsConverter.java index 90c5ba532bc..b7841c352c0 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/RestoreObjectsConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/RestoreObjectsConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.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 RestoreObjectsRequest interceptRequest(RestoreObjectsRequest reque public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, RestoreObjectsRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getRestoreObjectsDetails() == null) { - throw new NullPointerException("restoreObjectsDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notNull(request.getRestoreObjectsDetails(), "restoreObjectsDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateBucketConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateBucketConverter.java index 066b4777295..c6b349e9fe5 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateBucketConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateBucketConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.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 UpdateBucketRequest interceptRequest(UpdateBucketRequest request) public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateBucketRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getUpdateBucketDetails() == null) { - throw new NullPointerException("updateBucketDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notNull(request.getUpdateBucketDetails(), "updateBucketDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateNamespaceMetadataConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateNamespaceMetadataConverter.java index 86130344f81..3ba40fbc43e 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateNamespaceMetadataConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UpdateNamespaceMetadataConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -23,17 +24,11 @@ public static UpdateNamespaceMetadataRequest interceptRequest( public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UpdateNamespaceMetadataRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getUpdateNamespaceMetadataDetails() == null) { - throw new NullPointerException("updateNamespaceMetadataDetails is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notNull( + request.getUpdateNamespaceMetadataDetails(), + "updateNamespaceMetadataDetails is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UploadPartConverter.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UploadPartConverter.java index 74a445c8218..703f24e0e4f 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UploadPartConverter.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/internal/http/UploadPartConverter.java @@ -6,6 +6,7 @@ import com.oracle.bmc.objectstorage.model.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; +import org.apache.commons.lang3.Validate; @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @lombok.extern.slf4j.Slf4j @@ -21,33 +22,13 @@ public static UploadPartRequest interceptRequest(UploadPartRequest request) { public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.http.internal.RestClient client, UploadPartRequest request) { - if (request == null) { - throw new NullPointerException("request instance is required"); - } - - if (request.getNamespaceName() == null) { - throw new NullPointerException("namespaceName is required"); - } - - if (request.getBucketName() == null) { - throw new NullPointerException("bucketName is required"); - } - - if (request.getObjectName() == null) { - throw new NullPointerException("objectName is required"); - } - - if (request.getUploadId() == null) { - throw new NullPointerException("uploadId is required"); - } - - if (request.getUploadPartNum() == null) { - throw new NullPointerException("uploadPartNum is required"); - } - - if (request.getUploadPartBody() == null) { - throw new NullPointerException("uploadPartBody is required"); - } + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getNamespaceName(), "namespaceName must not be blank"); + Validate.notBlank(request.getBucketName(), "bucketName must not be blank"); + Validate.notBlank(request.getObjectName(), "objectName must not be blank"); + Validate.notNull(request.getUploadId(), "uploadId is required"); + Validate.notNull(request.getUploadPartNum(), "uploadPartNum is required"); + Validate.notNull(request.getUploadPartBody(), "uploadPartBody is required"); com.oracle.bmc.http.internal.WrappedWebTarget target = client.getBaseTarget() diff --git a/bmc-objectstorage/pom.xml b/bmc-objectstorage/pom.xml index 677c3549b82..ad9bed5cfcf 100644 --- a/bmc-objectstorage/pom.xml +++ b/bmc-objectstorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.33 + 1.2.34 diff --git a/pom.xml b/pom.xml index d5d3645190d..47ece5e9c50 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oracle.oci.sdk oci-java-sdk - 1.2.33 + 1.2.34 pom Oracle Cloud Infrastructure SDK This project contains the SDK used for Oracle Cloud Infrastructure