diff --git a/CHANGELOG.md b/CHANGELOG.md index ffb388b1bc1..dbeeaf2de11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Added - N/A +## 1.2.35 - 2018-04-19 + +### Fixed +- Upgraded Jackson to version 2.9.5 to address vulnerability [issue#55](https://github.com/oracle/oci-java-sdk/issues/55) +- PutObjectRequest does not callback invocationCallback object [issue#58](https://github.com/oracle/oci-java-sdk/issues/58) + +### Added +- Support for tagging DbSystem and Database resources in the Database Service +- Support for filtering by `dbSystemId` in `listDbVersions` operation in Database Service + ## 1.2.34 - 2018-04-05 ### Fixed diff --git a/bmc-audit/pom.xml b/bmc-audit/pom.xml index ee44792e950..77469cd6b2a 100644 --- a/bmc-audit/pom.xml +++ b/bmc-audit/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 b31f76d0257..6910faa2f04 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 @@ -70,18 +70,18 @@ public AuditAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public AuditAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public AuditAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public AuditAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public AuditAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public AuditAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public AuditAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public AuditAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 ab13141f721..fa0bfad0396 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 @@ -74,18 +74,18 @@ public AuditClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public AuditClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -97,20 +97,20 @@ public AuditClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public AuditClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -123,7 +123,7 @@ public AuditClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -131,7 +131,42 @@ public AuditClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public AuditClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -140,10 +175,22 @@ public AuditClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); this.paginators = new AuditPaginators(this); @@ -201,6 +248,7 @@ public AuditClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/GetConfigurationRequest.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/GetConfigurationRequest.java index 94be8ece682..6d8ac1bc5ed 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/GetConfigurationRequest.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/GetConfigurationRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetConfigurationRequest o) { compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java index 515976c1a33..0edc9a85637 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/ListEventsRequest.java @@ -69,6 +69,7 @@ public Builder copy(ListEventsRequest o) { endTime(o.getEndTime()); page(o.getPage()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/UpdateConfigurationRequest.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/UpdateConfigurationRequest.java index 2cae924daad..3836314e2ca 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/UpdateConfigurationRequest.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/requests/UpdateConfigurationRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(UpdateConfigurationRequest o) { compartmentId(o.getCompartmentId()); updateConfigurationDetails(o.getUpdateConfigurationDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-bom/pom.xml b/bmc-bom/pom.xml index 59170e4c97e..9dfd9af7db0 100644 --- a/bmc-bom/pom.xml +++ b/bmc-bom/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml oci-java-sdk-bom @@ -19,63 +19,64 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-audit - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-core - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-database - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-dns - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-email - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-filestorage - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-identity - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-loadbalancer - 1.2.34 + 1.2.35 false com.oracle.oci.sdk oci-java-sdk-objectstorage - 1.2.34 + 1.2.35 false + pom diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml index a48c786e390..6d49c2ccc11 100644 --- a/bmc-common/pom.xml +++ b/bmc-common/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java index 19c4561ea0b..c0a6049ec6b 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java @@ -30,8 +30,15 @@ public class SimpleAuthenticationDetailsProvider extends CustomerAuthenticationD @Getter(onMethod = @__({@Override})) private final char[] passphraseCharacters; + /** + * Supplier of the input stream with the private key. Note that this stream may be read multiple times. + */ private final Supplier privateKeySupplier; + /** + * Get the input stream with the private key. Note that this stream may be read multiple times. + * @return input stream with private key + */ @Override public InputStream getPrivateKey() { return privateKeySupplier.get(); 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 index 1c8faea10ff..0f53fc1b359 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/common/ClientBuilderBase.java +++ b/bmc-common/src/main/java/com/oracle/bmc/common/ClientBuilderBase.java @@ -3,7 +3,17 @@ */ package com.oracle.bmc.common; +import com.google.common.collect.ImmutableMap; +import com.oracle.bmc.ClientConfiguration; import com.oracle.bmc.Service; +import com.oracle.bmc.http.ClientConfigurator; +import com.oracle.bmc.http.signing.RequestSignerFactory; +import com.oracle.bmc.http.signing.SigningStrategy; +import com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * Base client builder. @@ -11,13 +21,13 @@ */ 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 ClientConfiguration configuration; + protected ClientConfigurator clientConfigurator; + protected List additionalClientConfigurators = new ArrayList<>(); + protected RequestSignerFactory requestSignerFactory = + new DefaultRequestSignerFactory(com.oracle.bmc.http.signing.SigningStrategy.STANDARD); + protected Map signingStrategyRequestSignerFactories = + DefaultRequestSignerFactory.createDefaultRequestSignerFactories(); protected String endpoint; public ClientBuilderBase(Service service) { @@ -85,6 +95,18 @@ public B endpoint(String endpoint) { return (B) this; } + /** + * Set the request signer factories for each signing strategy. + * @param signingStrategyRequestSignerFactories request signer factories for each signing strategy + * @return this builder + */ + public B signingStrategyRequestSignerFactories( + Map signingStrategyRequestSignerFactories) { + this.signingStrategyRequestSignerFactories = + ImmutableMap.copyOf(signingStrategyRequestSignerFactories); + return (B) this; + } + /** * Set the authentication details provider. Once this is called, the builder can build the client. * @param authenticationDetailsProvider authentication details provider diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/AuthnClientFilter.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/AuthnClientFilter.java index 0f994fd2d0a..eb686170c60 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/AuthnClientFilter.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/AuthnClientFilter.java @@ -13,6 +13,7 @@ import com.oracle.bmc.http.signing.RequestSigner; +import com.oracle.bmc.http.signing.SigningStrategy; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -22,12 +23,28 @@ @Priority(Priorities.AUTHENTICATION) @RequiredArgsConstructor public class AuthnClientFilter implements ClientRequestFilter { - private final RequestSigner requestSigner; + + public static final String SIGNING_STRATEGY_PROPERTY_NAME = + "x-obmcs-internal-signing-strategy-name"; + + private final RequestSigner defaultRequestSigner; + private final Map requestSigners; @Override public void filter(@NonNull ClientRequestContext clientRequestContext) throws IOException { + RequestSigner chosenRequestSigner = this.defaultRequestSigner; + + SigningStrategy perOperationSigningStrategy = + (SigningStrategy) clientRequestContext.getProperty(SIGNING_STRATEGY_PROPERTY_NAME); + if (perOperationSigningStrategy != null + && requestSigners.containsKey(perOperationSigningStrategy)) { + chosenRequestSigner = requestSigners.get(perOperationSigningStrategy); + // removing this property from the context, now that we have processed it + clientRequestContext.setProperty(SIGNING_STRATEGY_PROPERTY_NAME, null); + } + Map authHeaders = - requestSigner.signRequest( + chosenRequestSigner.signRequest( clientRequestContext.getUri(), clientRequestContext.getMethod(), clientRequestContext.getStringHeaders(), diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java index 513f6bd0d63..e9163930850 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactory.java @@ -3,24 +3,25 @@ */ package com.oracle.bmc.http.internal; -import javax.annotation.Nonnull; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; - -import lombok.Getter; -import org.glassfish.jersey.client.ClientProperties; - import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.ser.FilterProvider; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; -import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.oracle.bmc.ClientConfiguration; import com.oracle.bmc.auth.AuthenticationDetailsProvider; import com.oracle.bmc.http.ClientConfigurator; import com.oracle.bmc.http.signing.RequestSigner; +import com.oracle.bmc.http.signing.SigningStrategy; +import lombok.Getter; +import org.glassfish.jersey.client.ClientProperties; + +import javax.annotation.Nonnull; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import java.util.Map; /** * RestClientFactory is responsible for creating a new REST client whenever a @@ -69,33 +70,48 @@ public RestClientFactory(@Nonnull ClientConfigurator clientConfigurator) { * Creates a new client that will use the given * {@link AuthenticationDetailsProvider}. * - * @param requestSigner The strategy used to sign requests. + * @param defaultRequestSigner + * The default strategy used to sign requests. + * @param requestSigners + * The strategies used to sign requests, per signing strategy. * @return A new RestClient instance. */ - public RestClient create(RequestSigner requestSigner) { - return this.create(requestSigner, null); + public RestClient create( + RequestSigner defaultRequestSigner, + Map requestSigners) { + return this.create(defaultRequestSigner, requestSigners, null); } - /** * Creates a new client that will use the given * {@link AuthenticationDetailsProvider} and {@link ClientConfiguration}. * - * @param requestSigner The strategy used to sign requests. + * @param defaultRequestSigner + * The default strategy used to sign requests. + * @param requestSigners + * The strategies used to sign requests, per signing strategy. * @param configuration * The client configuration to use, or null for default * configuration. * @return A new RestClient instance. */ - public RestClient create(RequestSigner requestSigner, ClientConfiguration configuration) { + public RestClient create( + RequestSigner defaultRequestSigner, + Map requestSigners, + ClientConfiguration configuration) { ClientConfiguration clientConfigurationToUse = configuration != null ? configuration : ClientConfiguration.builder().build(); Client client = - createClient(requestSigner, clientConfigurationToUse, this.clientConfigurator); + createClient( + defaultRequestSigner, + requestSigners, + clientConfigurationToUse, + this.clientConfigurator); return new RestClient(client, new EntityFactory()); } private static Client createClient( - RequestSigner requestSigner, + RequestSigner defaultRequestSigner, + Map requestSigners, ClientConfiguration configuration, ClientConfigurator clientConfigurator) { ClientBuilder builder = ClientBuilder.newBuilder(); @@ -113,7 +129,7 @@ private static Client createClient( ClientProperties.ASYNC_THREADPOOL_SIZE, configuration.getMaxAsyncThreads()); - client.register(new AuthnClientFilter(requestSigner)); + client.register(new AuthnClientFilter(defaultRequestSigner, requestSigners)); client.register(CLIENT_ID_FILTER); client.register(LOG_HEADERS_FILTER); diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java index b59e43a3a4d..776080c894a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java @@ -3,15 +3,14 @@ */ package com.oracle.bmc.http.signing; -import java.util.List; - import com.google.common.collect.ImmutableMap; import com.oracle.bmc.InternalSdk; import com.oracle.bmc.http.signing.internal.Constants; - import lombok.Getter; import lombok.RequiredArgsConstructor; +import java.util.List; + /** * Enum for the various signing strategies used by OCI. */ @@ -23,10 +22,18 @@ public enum SigningStrategy { * Standard signing strategy. */ STANDARD(Constants.REQUIRED_SIGNING_HEADERS, false), + + @Deprecated /** * Modified strategy specific to Object Storage. + * @deprecated use EXCLUDE_BODY instead; Object Storage has migrated to using STANDARD, with EXCLUDE_BODY as a per-operation override. We therefore do not want to maintain a service-specific signing strategy. + */ + OBJECT_STORAGE(Constants.REQUIRED_OBJECTSTORAGE_SIGNING_HEADERS, true), + + /** + * A strategy that does not sign the body. */ - OBJECT_STORAGE(Constants.REQUIRED_OBJECTSTORAGE_SIGNING_HEADERS, true); + EXCLUDE_BODY(Constants.REQUIRED_EXCLUDE_BODY_SIGNING_HEADERS, true); /** * The Map of headers (by HTTP method) to sign. diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Constants.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Constants.java index b50bd1acda7..39a7e11f8c9 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Constants.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/Constants.java @@ -39,6 +39,11 @@ public class Constants { ALL_HEADERS, ALL_HEADERS); + @Deprecated + /** + * A signing strategy that signs headers and body, except for PUT, where bodies are not signed + * @deprecated use REQUIRED_EXCLUDE_BODY_SIGNING_HEADERS instead; Object Storage has migrated to using STANDARD, with EXCLUDE_BODY as a per-operation override. We therefore do not want to maintain a service-specific signing strategy. + */ public static final ImmutableMap> REQUIRED_OBJECTSTORAGE_SIGNING_HEADERS = createHeadersToSignMap( GENERIC_HEADERS, @@ -48,6 +53,17 @@ public class Constants { ALL_HEADERS, ALL_HEADERS); + /** + * A signing strategy that signs headers only. + */ + public static final ImmutableMap> REQUIRED_EXCLUDE_BODY_SIGNING_HEADERS = + createHeadersToSignMap( + GENERIC_HEADERS, + GENERIC_HEADERS, + GENERIC_HEADERS, + GENERIC_HEADERS, + GENERIC_HEADERS, + GENERIC_HEADERS); /** * Creates a map of headers to sign for each HTTP method. * @param getHeaders headers for GET requests diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/DefaultRequestSignerFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/DefaultRequestSignerFactory.java index 273ff770517..d256f92236d 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/DefaultRequestSignerFactory.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/DefaultRequestSignerFactory.java @@ -4,9 +4,12 @@ package com.oracle.bmc.http.signing.internal; import java.security.interfaces.RSAPrivateKey; +import java.util.HashMap; +import java.util.Map; import com.google.common.base.Optional; import com.google.common.base.Supplier; +import com.google.common.collect.ImmutableMap; import com.oracle.bmc.Service; import com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider; import com.oracle.bmc.auth.AuthCachingPolicy; @@ -112,4 +115,17 @@ private static AuthCachingPolicy getAuthCachingPolicy( final BasicAuthenticationDetailsProvider authenticationDetailsProvider) { return authenticationDetailsProvider.getClass().getAnnotation(AuthCachingPolicy.class); } + + /** + * Create the default request signer factories. + * @return default request signer factories + */ + public static Map createDefaultRequestSignerFactories() { + ImmutableMap.Builder builder = + ImmutableMap.builder(); + for (SigningStrategy s : SigningStrategy.values()) { + builder.put(s, new DefaultRequestSignerFactory(s)); + } + return builder.build(); + } } diff --git a/bmc-core/pom.xml b/bmc-core/pom.xml index 7dc2bec8df6..332a978233f 100644 --- a/bmc-core/pom.xml +++ b/bmc-core/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 df313b43146..5764fb984ef 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 @@ -70,18 +70,18 @@ public BlockstorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public BlockstorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public BlockstorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public BlockstorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public BlockstorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public BlockstorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public BlockstorageAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public BlockstorageAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 0c90976e79c..1b662584acf 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 @@ -75,18 +75,18 @@ public BlockstorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public BlockstorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public BlockstorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public BlockstorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public BlockstorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public BlockstorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public BlockstorageClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public BlockstorageClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public BlockstorageClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } 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 9730df8caac..5cac37f02ac 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 @@ -70,18 +70,18 @@ public ComputeAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public ComputeAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public ComputeAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public ComputeAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public ComputeAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public ComputeAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public ComputeAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public ComputeAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 804d347db72..e91b47b82ca 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 @@ -75,18 +75,18 @@ public ComputeClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public ComputeClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public ComputeClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public ComputeClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public ComputeClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public ComputeClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public ComputeClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public ComputeClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public ComputeClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } 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 22ba7ab1f53..df9b512a1af 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 @@ -70,18 +70,18 @@ public VirtualNetworkAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public VirtualNetworkAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public VirtualNetworkAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public VirtualNetworkAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public VirtualNetworkAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public VirtualNetworkAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public VirtualNetworkAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public VirtualNetworkAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 f638f2bbdfe..65f03c8bca4 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 @@ -75,18 +75,18 @@ public VirtualNetworkClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public VirtualNetworkClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public VirtualNetworkClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public VirtualNetworkClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public VirtualNetworkClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public VirtualNetworkClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public VirtualNetworkClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public VirtualNetworkClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public VirtualNetworkClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachBootVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachBootVolumeRequest.java index 648a99641ed..920b88d3d55 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachBootVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachBootVolumeRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(AttachBootVolumeRequest o) { attachBootVolumeDetails(o.getAttachBootVolumeDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVnicRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVnicRequest.java index 2a452c25565..b7463549f33 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVnicRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVnicRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(AttachVnicRequest o) { attachVnicDetails(o.getAttachVnicDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java index 9f6ba465a71..febd5579354 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(AttachVolumeRequest o) { attachVolumeDetails(o.getAttachVolumeDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/BulkAddVirtualCircuitPublicPrefixesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/BulkAddVirtualCircuitPublicPrefixesRequest.java index bfffc91e66e..efe21320e0a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/BulkAddVirtualCircuitPublicPrefixesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/BulkAddVirtualCircuitPublicPrefixesRequest.java @@ -44,6 +44,7 @@ public Builder copy(BulkAddVirtualCircuitPublicPrefixesRequest o) { virtualCircuitId(o.getVirtualCircuitId()); bulkAddVirtualCircuitPublicPrefixesDetails( o.getBulkAddVirtualCircuitPublicPrefixesDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/BulkDeleteVirtualCircuitPublicPrefixesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/BulkDeleteVirtualCircuitPublicPrefixesRequest.java index d3f42622b6f..35494770161 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/BulkDeleteVirtualCircuitPublicPrefixesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/BulkDeleteVirtualCircuitPublicPrefixesRequest.java @@ -46,6 +46,7 @@ public Builder copy(BulkDeleteVirtualCircuitPublicPrefixesRequest o) { virtualCircuitId(o.getVirtualCircuitId()); bulkDeleteVirtualCircuitPublicPrefixesDetails( o.getBulkDeleteVirtualCircuitPublicPrefixesDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java index a718b1e9a26..d07cd1930ef 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CaptureConsoleHistoryRequest o) { captureConsoleHistoryDetails(o.getCaptureConsoleHistoryDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectLocalPeeringGatewaysRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectLocalPeeringGatewaysRequest.java index 171204ecc39..637ef3a3827 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectLocalPeeringGatewaysRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectLocalPeeringGatewaysRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(ConnectLocalPeeringGatewaysRequest o) { localPeeringGatewayId(o.getLocalPeeringGatewayId()); connectLocalPeeringGatewaysDetails(o.getConnectLocalPeeringGatewaysDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectRemotePeeringConnectionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectRemotePeeringConnectionsRequest.java index df1091424fd..ec175566e71 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectRemotePeeringConnectionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectRemotePeeringConnectionsRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(ConnectRemotePeeringConnectionsRequest o) { remotePeeringConnectionId(o.getRemotePeeringConnectionId()); connectRemotePeeringConnectionsDetails(o.getConnectRemotePeeringConnectionsDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java index 47190858479..030dd9cb01e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateCpeRequest o) { createCpeDetails(o.getCreateCpeDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectGroupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectGroupRequest.java index bcce243dce6..273e5d2d837 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectGroupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectGroupRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateCrossConnectGroupRequest o) { createCrossConnectGroupDetails(o.getCreateCrossConnectGroupDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectRequest.java index 9e2085f2994..610ef2f784f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateCrossConnectRequest o) { createCrossConnectDetails(o.getCreateCrossConnectDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java index 4dff501100b..97d5cee1804 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateDhcpOptionsRequest o) { createDhcpDetails(o.getCreateDhcpDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java index a2740504468..d034d1717b3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateDrgAttachmentRequest o) { createDrgAttachmentDetails(o.getCreateDrgAttachmentDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java index c05d88ac601..bc07ab97043 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateDrgRequest o) { createDrgDetails(o.getCreateDrgDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java index f75706c52d8..9e8087dc496 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateIPSecConnectionRequest o) { createIPSecConnectionDetails(o.getCreateIPSecConnectionDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java index cc2411dd626..a7e7e52ad84 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateImageRequest o) { createImageDetails(o.getCreateImageDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInstanceConsoleConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInstanceConsoleConnectionRequest.java index 3c6e49105c2..b139b88a967 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInstanceConsoleConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInstanceConsoleConnectionRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateInstanceConsoleConnectionRequest o) { createInstanceConsoleConnectionDetails(o.getCreateInstanceConsoleConnectionDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java index 6674932e0bf..ecda5fed1a2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateInternetGatewayRequest o) { createInternetGatewayDetails(o.getCreateInternetGatewayDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateLocalPeeringGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateLocalPeeringGatewayRequest.java index 4691c6566ee..f8ba322519b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateLocalPeeringGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateLocalPeeringGatewayRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateLocalPeeringGatewayRequest o) { createLocalPeeringGatewayDetails(o.getCreateLocalPeeringGatewayDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePrivateIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePrivateIpRequest.java index 6cdb77b072c..0e25903f2b2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePrivateIpRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePrivateIpRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreatePrivateIpRequest o) { createPrivateIpDetails(o.getCreatePrivateIpDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePublicIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePublicIpRequest.java index 08097928538..eda208840a4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePublicIpRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePublicIpRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreatePublicIpRequest o) { createPublicIpDetails(o.getCreatePublicIpDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRemotePeeringConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRemotePeeringConnectionRequest.java index 1da068098a8..5504ff88006 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRemotePeeringConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRemotePeeringConnectionRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateRemotePeeringConnectionRequest o) { createRemotePeeringConnectionDetails(o.getCreateRemotePeeringConnectionDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java index 3a6d693eff9..ca9fbeded6a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateRouteTableRequest o) { createRouteTableDetails(o.getCreateRouteTableDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java index 463d42ddc02..8f3ade35477 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateSecurityListRequest o) { createSecurityListDetails(o.getCreateSecurityListDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java index 544b4c50ca3..ed54986465c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateSubnetRequest o) { createSubnetDetails(o.getCreateSubnetDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java index f96cddfbd76..85f2e323f2e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateVcnRequest o) { createVcnDetails(o.getCreateVcnDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVirtualCircuitRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVirtualCircuitRequest.java index 24fdd45b87d..b9f15393bc0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVirtualCircuitRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVirtualCircuitRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateVirtualCircuitRequest o) { createVirtualCircuitDetails(o.getCreateVirtualCircuitDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupPolicyAssignmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupPolicyAssignmentRequest.java index 43a71ce7a96..b44f080e8f0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupPolicyAssignmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupPolicyAssignmentRequest.java @@ -38,6 +38,7 @@ public Builder invocationCallback( public Builder copy(CreateVolumeBackupPolicyAssignmentRequest o) { createVolumeBackupPolicyAssignmentDetails( o.getCreateVolumeBackupPolicyAssignmentDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java index 527d5f0acd2..41ebad5a40a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateVolumeBackupRequest o) { createVolumeBackupDetails(o.getCreateVolumeBackupDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java index a22cbe18de7..f12d18ac3fb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateVolumeRequest o) { createVolumeDetails(o.getCreateVolumeDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteBootVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteBootVolumeRequest.java index 2bffb9f7928..78ed59bba32 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteBootVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteBootVolumeRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteBootVolumeRequest o) { bootVolumeId(o.getBootVolumeId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteConsoleHistoryRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteConsoleHistoryRequest.java index ea8f3a47f57..7a239b42705 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteConsoleHistoryRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteConsoleHistoryRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteConsoleHistoryRequest o) { instanceConsoleHistoryId(o.getInstanceConsoleHistoryId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCpeRequest.java index f68a60216a5..bd49a56e1d6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCpeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCpeRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteCpeRequest o) { cpeId(o.getCpeId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCrossConnectGroupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCrossConnectGroupRequest.java index b39e4f8e20a..197cbb2afae 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCrossConnectGroupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCrossConnectGroupRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteCrossConnectGroupRequest o) { crossConnectGroupId(o.getCrossConnectGroupId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCrossConnectRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCrossConnectRequest.java index 6f97b8a73b7..3a7f8a3c55b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCrossConnectRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteCrossConnectRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteCrossConnectRequest o) { crossConnectId(o.getCrossConnectId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDhcpOptionsRequest.java index 2ec7588afb4..143f8873e81 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDhcpOptionsRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteDhcpOptionsRequest o) { dhcpId(o.getDhcpId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgAttachmentRequest.java index c41f921c627..e921f1e1759 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgAttachmentRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteDrgAttachmentRequest o) { drgAttachmentId(o.getDrgAttachmentId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgRequest.java index 77b1ee14c61..d311122315a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteDrgRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteDrgRequest o) { drgId(o.getDrgId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteIPSecConnectionRequest.java index 6984e303f67..7ac66e747c2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteIPSecConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteIPSecConnectionRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteIPSecConnectionRequest o) { ipscId(o.getIpscId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteImageRequest.java index ee9a73093e6..e363aa12085 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteImageRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteImageRequest o) { imageId(o.getImageId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInstanceConsoleConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInstanceConsoleConnectionRequest.java index 7c02171574a..0d929fbe769 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInstanceConsoleConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInstanceConsoleConnectionRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteInstanceConsoleConnectionRequest o) { instanceConsoleConnectionId(o.getInstanceConsoleConnectionId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInternetGatewayRequest.java index b418c06d81e..1bff2ec0085 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInternetGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInternetGatewayRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteInternetGatewayRequest o) { igId(o.getIgId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteLocalPeeringGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteLocalPeeringGatewayRequest.java index cf1ca785976..32a6ce7acfe 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteLocalPeeringGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteLocalPeeringGatewayRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteLocalPeeringGatewayRequest o) { localPeeringGatewayId(o.getLocalPeeringGatewayId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeletePrivateIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeletePrivateIpRequest.java index d147b969e0a..0e76208b024 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeletePrivateIpRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeletePrivateIpRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeletePrivateIpRequest o) { privateIpId(o.getPrivateIpId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeletePublicIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeletePublicIpRequest.java index 1a7b0b370cc..3906bb9ec36 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeletePublicIpRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeletePublicIpRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeletePublicIpRequest o) { publicIpId(o.getPublicIpId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRemotePeeringConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRemotePeeringConnectionRequest.java index 5453cc33c0b..646795556d6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRemotePeeringConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRemotePeeringConnectionRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteRemotePeeringConnectionRequest o) { remotePeeringConnectionId(o.getRemotePeeringConnectionId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRouteTableRequest.java index dd0b44e5424..327fda69530 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRouteTableRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteRouteTableRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteRouteTableRequest o) { rtId(o.getRtId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSecurityListRequest.java index dbb5c9ef5e6..91fa9a3495f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSecurityListRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSecurityListRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteSecurityListRequest o) { securityListId(o.getSecurityListId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSubnetRequest.java index 48388e2579c..3c648292f9f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSubnetRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteSubnetRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteSubnetRequest o) { subnetId(o.getSubnetId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVcnRequest.java index 0d89c84311a..1126e0bfad5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVcnRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVcnRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteVcnRequest o) { vcnId(o.getVcnId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVirtualCircuitRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVirtualCircuitRequest.java index fd57e6b5532..5f355d3b17a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVirtualCircuitRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVirtualCircuitRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteVirtualCircuitRequest o) { virtualCircuitId(o.getVirtualCircuitId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupPolicyAssignmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupPolicyAssignmentRequest.java index af51fd8f100..520f4217a0d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupPolicyAssignmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupPolicyAssignmentRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteVolumeBackupPolicyAssignmentRequest o) { policyAssignmentId(o.getPolicyAssignmentId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupRequest.java index a972117fa2e..fb2359f004c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeBackupRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteVolumeBackupRequest o) { volumeBackupId(o.getVolumeBackupId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeRequest.java index 7462a61256a..f3de6858aa4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteVolumeRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteVolumeRequest o) { volumeId(o.getVolumeId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachBootVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachBootVolumeRequest.java index 10cfdf001f8..908da0661ab 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachBootVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachBootVolumeRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DetachBootVolumeRequest o) { bootVolumeAttachmentId(o.getBootVolumeAttachmentId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVnicRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVnicRequest.java index 97536fcbfda..f8599c2e7f8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVnicRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVnicRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DetachVnicRequest o) { vnicAttachmentId(o.getVnicAttachmentId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVolumeRequest.java index d7ab056c964..acd7a7d2269 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachVolumeRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DetachVolumeRequest o) { volumeAttachmentId(o.getVolumeAttachmentId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ExportImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ExportImageRequest.java index 6ae76868e63..8a878bba997 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ExportImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ExportImageRequest.java @@ -63,6 +63,7 @@ public Builder copy(ExportImageRequest o) { exportImageDetails(o.getExportImageDetails()); opcRetryToken(o.getOpcRetryToken()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeAttachmentRequest.java index 6e03e34e284..d7531bca8b8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeAttachmentRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetBootVolumeAttachmentRequest o) { bootVolumeAttachmentId(o.getBootVolumeAttachmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeRequest.java index c400649d707..d8215dbd979 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetBootVolumeRequest o) { bootVolumeId(o.getBootVolumeId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryContentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryContentRequest.java index e8fa766c839..5c1bbf8eb9a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryContentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryContentRequest.java @@ -49,6 +49,7 @@ public Builder copy(GetConsoleHistoryContentRequest o) { instanceConsoleHistoryId(o.getInstanceConsoleHistoryId()); offset(o.getOffset()); length(o.getLength()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryRequest.java index cb2bf163c97..093dd256fd4 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetConsoleHistoryRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetConsoleHistoryRequest o) { instanceConsoleHistoryId(o.getInstanceConsoleHistoryId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCpeRequest.java index 104f8998e3a..2b87d132d47 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCpeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCpeRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetCpeRequest o) { cpeId(o.getCpeId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectGroupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectGroupRequest.java index 730b6944850..579136c56a7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectGroupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectGroupRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetCrossConnectGroupRequest o) { crossConnectGroupId(o.getCrossConnectGroupId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectLetterOfAuthorityRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectLetterOfAuthorityRequest.java index 0af2a1c584e..aae961c79c5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectLetterOfAuthorityRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectLetterOfAuthorityRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetCrossConnectLetterOfAuthorityRequest o) { crossConnectId(o.getCrossConnectId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectRequest.java index 72f64dbab3f..6d942b619ff 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetCrossConnectRequest o) { crossConnectId(o.getCrossConnectId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectStatusRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectStatusRequest.java index edd230ebce7..e32903ab34c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectStatusRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetCrossConnectStatusRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetCrossConnectStatusRequest o) { crossConnectId(o.getCrossConnectId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDhcpOptionsRequest.java index a66965d2aba..89278709ec6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDhcpOptionsRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetDhcpOptionsRequest o) { dhcpId(o.getDhcpId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgAttachmentRequest.java index dd378dbebfc..c82750df5bb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgAttachmentRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetDrgAttachmentRequest o) { drgAttachmentId(o.getDrgAttachmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgRequest.java index 22eb5fbbae9..572fedc4b46 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetDrgRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetDrgRequest o) { drgId(o.getDrgId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetFastConnectProviderServiceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetFastConnectProviderServiceRequest.java index f38700448db..5ef5c05f7d9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetFastConnectProviderServiceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetFastConnectProviderServiceRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetFastConnectProviderServiceRequest o) { providerServiceId(o.getProviderServiceId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceConfigRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceConfigRequest.java index 34a86665488..087b8e6990b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceConfigRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceConfigRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetIPSecConnectionDeviceConfigRequest o) { ipscId(o.getIpscId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceStatusRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceStatusRequest.java index 5a477286374..7006279867e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceStatusRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionDeviceStatusRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetIPSecConnectionDeviceStatusRequest o) { ipscId(o.getIpscId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionRequest.java index 8b586919fec..fa3d8b956fe 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetIPSecConnectionRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetIPSecConnectionRequest o) { ipscId(o.getIpscId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetImageRequest.java index faf96da1f3d..9687b45aef1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetImageRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetImageRequest o) { imageId(o.getImageId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceConsoleConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceConsoleConnectionRequest.java index 216f7a2a9aa..78b5bf247e9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceConsoleConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceConsoleConnectionRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetInstanceConsoleConnectionRequest o) { instanceConsoleConnectionId(o.getInstanceConsoleConnectionId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceRequest.java index e66c074b9e0..c1ca171525f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetInstanceRequest o) { instanceId(o.getInstanceId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInternetGatewayRequest.java index 3723795f4b1..9b261459498 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInternetGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInternetGatewayRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetInternetGatewayRequest o) { igId(o.getIgId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetLocalPeeringGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetLocalPeeringGatewayRequest.java index 6e4f86edf9e..e69d04f25bc 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetLocalPeeringGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetLocalPeeringGatewayRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetLocalPeeringGatewayRequest o) { localPeeringGatewayId(o.getLocalPeeringGatewayId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPrivateIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPrivateIpRequest.java index 6fc9227ac0e..a76f63ab010 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPrivateIpRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPrivateIpRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetPrivateIpRequest o) { privateIpId(o.getPrivateIpId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpByIpAddressRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpByIpAddressRequest.java index 3a1876a16c6..63e0115f414 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpByIpAddressRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpByIpAddressRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetPublicIpByIpAddressRequest o) { getPublicIpByIpAddressDetails(o.getGetPublicIpByIpAddressDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpByPrivateIpIdRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpByPrivateIpIdRequest.java index 797bb6044f5..702dbb58d6a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpByPrivateIpIdRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpByPrivateIpIdRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetPublicIpByPrivateIpIdRequest o) { getPublicIpByPrivateIpIdDetails(o.getGetPublicIpByPrivateIpIdDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpRequest.java index 45e70e3f2e0..0d6ac769738 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetPublicIpRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetPublicIpRequest o) { publicIpId(o.getPublicIpId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRemotePeeringConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRemotePeeringConnectionRequest.java index 6f4efe2965f..596670d8c3a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRemotePeeringConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRemotePeeringConnectionRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetRemotePeeringConnectionRequest o) { remotePeeringConnectionId(o.getRemotePeeringConnectionId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRouteTableRequest.java index 97be8a010c7..dc139954c5d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRouteTableRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetRouteTableRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetRouteTableRequest o) { rtId(o.getRtId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSecurityListRequest.java index 0a5a5fb5750..cc367fd2a36 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSecurityListRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSecurityListRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetSecurityListRequest o) { securityListId(o.getSecurityListId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSubnetRequest.java index 9f30c723b28..5ed689f2927 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSubnetRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetSubnetRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetSubnetRequest o) { subnetId(o.getSubnetId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVcnRequest.java index 10d54aea347..63388bc915f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVcnRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVcnRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVcnRequest o) { vcnId(o.getVcnId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVirtualCircuitRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVirtualCircuitRequest.java index d107cc516c5..a1a1678730c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVirtualCircuitRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVirtualCircuitRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVirtualCircuitRequest o) { virtualCircuitId(o.getVirtualCircuitId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicAttachmentRequest.java index 73c6b2d651a..7237d25e141 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicAttachmentRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVnicAttachmentRequest o) { vnicAttachmentId(o.getVnicAttachmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicRequest.java index f1381f285d1..3e6df8a2d26 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVnicRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVnicRequest o) { vnicId(o.getVnicId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeAttachmentRequest.java index 99133124a43..b0673176d11 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeAttachmentRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVolumeAttachmentRequest o) { volumeAttachmentId(o.getVolumeAttachmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyAssetAssignmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyAssetAssignmentRequest.java index 53512dcbfe9..60239c9de4f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyAssetAssignmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyAssetAssignmentRequest.java @@ -54,6 +54,7 @@ public Builder copy(GetVolumeBackupPolicyAssetAssignmentRequest o) { assetId(o.getAssetId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyAssignmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyAssignmentRequest.java index 9f7dae93544..1aad24ef38f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyAssignmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyAssignmentRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVolumeBackupPolicyAssignmentRequest o) { policyAssignmentId(o.getPolicyAssignmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyRequest.java index 3e078edafa5..c11a46ae919 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupPolicyRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVolumeBackupPolicyRequest o) { policyId(o.getPolicyId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupRequest.java index 464ebc9e556..823704c91ba 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeBackupRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVolumeBackupRequest o) { volumeBackupId(o.getVolumeBackupId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeRequest.java index e2f2c6b8ca7..99a7a6de861 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetVolumeRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetVolumeRequest o) { volumeId(o.getVolumeId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetWindowsInstanceInitialCredentialsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetWindowsInstanceInitialCredentialsRequest.java index 31ecb72f310..c4c50a9bf74 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetWindowsInstanceInitialCredentialsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetWindowsInstanceInitialCredentialsRequest.java @@ -38,6 +38,7 @@ public Builder invocationCallback( */ public Builder copy(GetWindowsInstanceInitialCredentialsRequest o) { instanceId(o.getInstanceId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java index 533bba800bd..ffa1924a725 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java @@ -63,6 +63,7 @@ public Builder copy(InstanceActionRequest o) { action(o.getAction()); opcRetryToken(o.getOpcRetryToken()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java index 1b76e9934ac..93bad963756 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(LaunchInstanceRequest o) { launchInstanceDetails(o.getLaunchInstanceDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListAllowedPeerRegionsForRemotePeeringRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListAllowedPeerRegionsForRemotePeeringRequest.java index f0144ea8f0c..4324f36e429 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListAllowedPeerRegionsForRemotePeeringRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListAllowedPeerRegionsForRemotePeeringRequest.java @@ -33,6 +33,7 @@ public Builder invocationCallback( */ public Builder copy(ListAllowedPeerRegionsForRemotePeeringRequest o) { + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumeAttachmentsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumeAttachmentsRequest.java index e7a1a81614a..8af20dcc6d9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumeAttachmentsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumeAttachmentsRequest.java @@ -74,6 +74,7 @@ public Builder copy(ListBootVolumeAttachmentsRequest o) { page(o.getPage()); instanceId(o.getInstanceId()); bootVolumeId(o.getBootVolumeId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumesRequest.java index f9e82a2049e..8682cd6972e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumesRequest.java @@ -62,6 +62,7 @@ public Builder copy(ListBootVolumesRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListConsoleHistoriesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListConsoleHistoriesRequest.java index 8eb9b7dbeb4..28f87dc3284 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListConsoleHistoriesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListConsoleHistoriesRequest.java @@ -179,6 +179,7 @@ public Builder copy(ListConsoleHistoriesRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCpesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCpesRequest.java index f87a5c6bac3..bcc2403966d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCpesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCpesRequest.java @@ -53,6 +53,7 @@ public Builder copy(ListCpesRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectGroupsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectGroupsRequest.java index 8ec16c2bab7..27daf0ca43a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectGroupsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectGroupsRequest.java @@ -171,6 +171,7 @@ public Builder copy(ListCrossConnectGroupsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectLocationsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectLocationsRequest.java index 3bed4b760d7..005a5376c4d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectLocationsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectLocationsRequest.java @@ -53,6 +53,7 @@ public Builder copy(ListCrossConnectLocationsRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectsRequest.java index 05c414cdaad..1b7eef3ea7b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossConnectsRequest.java @@ -177,6 +177,7 @@ public Builder copy(ListCrossConnectsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossconnectPortSpeedShapesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossconnectPortSpeedShapesRequest.java index ea4dcdf8da3..dc621ed3cbd 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossconnectPortSpeedShapesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListCrossconnectPortSpeedShapesRequest.java @@ -53,6 +53,7 @@ public Builder copy(ListCrossconnectPortSpeedShapesRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDhcpOptionsRequest.java index 915db6b253d..7c9ec0e7e6d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDhcpOptionsRequest.java @@ -177,6 +177,7 @@ public Builder copy(ListDhcpOptionsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgAttachmentsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgAttachmentsRequest.java index 869743cbffe..6b806038869 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgAttachmentsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgAttachmentsRequest.java @@ -65,6 +65,7 @@ public Builder copy(ListDrgAttachmentsRequest o) { drgId(o.getDrgId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgsRequest.java index 85c83db2597..e4d7a139c38 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListDrgsRequest.java @@ -53,6 +53,7 @@ public Builder copy(ListDrgsRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListFastConnectProviderServicesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListFastConnectProviderServicesRequest.java index 66792e7b611..b49f9982d5a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListFastConnectProviderServicesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListFastConnectProviderServicesRequest.java @@ -53,6 +53,7 @@ public Builder copy(ListFastConnectProviderServicesRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListFastConnectProviderVirtualCircuitBandwidthShapesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListFastConnectProviderVirtualCircuitBandwidthShapesRequest.java index 7fec7da7b35..a130a42e28d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListFastConnectProviderVirtualCircuitBandwidthShapesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListFastConnectProviderVirtualCircuitBandwidthShapesRequest.java @@ -54,6 +54,7 @@ public Builder copy(ListFastConnectProviderVirtualCircuitBandwidthShapesRequest providerServiceId(o.getProviderServiceId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListIPSecConnectionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListIPSecConnectionsRequest.java index 20325566bc2..e077954a133 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListIPSecConnectionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListIPSecConnectionsRequest.java @@ -65,6 +65,7 @@ public Builder copy(ListIPSecConnectionsRequest o) { cpeId(o.getCpeId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListImagesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListImagesRequest.java index a72a13f4297..ffe75a81fff 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListImagesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListImagesRequest.java @@ -195,6 +195,7 @@ public Builder copy(ListImagesRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstanceConsoleConnectionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstanceConsoleConnectionsRequest.java index ab79b06fac2..c732d31dcde 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstanceConsoleConnectionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstanceConsoleConnectionsRequest.java @@ -59,6 +59,7 @@ public Builder copy(ListInstanceConsoleConnectionsRequest o) { instanceId(o.getInstanceId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstancesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstancesRequest.java index 5a7ac15fcfd..b33dbdc8f2d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstancesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstancesRequest.java @@ -180,6 +180,7 @@ public Builder copy(ListInstancesRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInternetGatewaysRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInternetGatewaysRequest.java index b5048b4d8ce..a63b257a7f3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInternetGatewaysRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInternetGatewaysRequest.java @@ -177,6 +177,7 @@ public Builder copy(ListInternetGatewaysRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListLocalPeeringGatewaysRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListLocalPeeringGatewaysRequest.java index 2eeea29c46a..5a0604c6daa 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListLocalPeeringGatewaysRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListLocalPeeringGatewaysRequest.java @@ -59,6 +59,7 @@ public Builder copy(ListLocalPeeringGatewaysRequest o) { vcnId(o.getVcnId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListPrivateIpsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListPrivateIpsRequest.java index 0aec014c6d4..83a6360d5a8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListPrivateIpsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListPrivateIpsRequest.java @@ -68,6 +68,7 @@ public Builder copy(ListPrivateIpsRequest o) { ipAddress(o.getIpAddress()); subnetId(o.getSubnetId()); vnicId(o.getVnicId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListPublicIpsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListPublicIpsRequest.java index 6f5ed38efd0..ebe58b93a49 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListPublicIpsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListPublicIpsRequest.java @@ -120,6 +120,7 @@ public Builder copy(ListPublicIpsRequest o) { limit(o.getLimit()); page(o.getPage()); availabilityDomain(o.getAvailabilityDomain()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRemotePeeringConnectionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRemotePeeringConnectionsRequest.java index 7bb2a536b61..c6890925e6e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRemotePeeringConnectionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRemotePeeringConnectionsRequest.java @@ -59,6 +59,7 @@ public Builder copy(ListRemotePeeringConnectionsRequest o) { drgId(o.getDrgId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRouteTablesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRouteTablesRequest.java index 5b00b061275..cf2e5178917 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRouteTablesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListRouteTablesRequest.java @@ -177,6 +177,7 @@ public Builder copy(ListRouteTablesRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSecurityListsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSecurityListsRequest.java index 1c2dbaed907..3f3aa6e0861 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSecurityListsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSecurityListsRequest.java @@ -177,6 +177,7 @@ public Builder copy(ListSecurityListsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListShapesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListShapesRequest.java index aee01d0de0a..52814ef3507 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListShapesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListShapesRequest.java @@ -68,6 +68,7 @@ public Builder copy(ListShapesRequest o) { limit(o.getLimit()); page(o.getPage()); imageId(o.getImageId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSubnetsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSubnetsRequest.java index 7785dfe83da..6fd6aec2865 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSubnetsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListSubnetsRequest.java @@ -177,6 +177,7 @@ public Builder copy(ListSubnetsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVcnsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVcnsRequest.java index 6e7a35c64dc..6d6efd1269e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVcnsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVcnsRequest.java @@ -171,6 +171,7 @@ public Builder copy(ListVcnsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitBandwidthShapesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitBandwidthShapesRequest.java index d855148dbd8..101f3afb17b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitBandwidthShapesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitBandwidthShapesRequest.java @@ -53,6 +53,7 @@ public Builder copy(ListVirtualCircuitBandwidthShapesRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitPublicPrefixesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitPublicPrefixesRequest.java index 57b1992ff19..617581b7a56 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitPublicPrefixesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitPublicPrefixesRequest.java @@ -45,6 +45,7 @@ public Builder invocationCallback( public Builder copy(ListVirtualCircuitPublicPrefixesRequest o) { virtualCircuitId(o.getVirtualCircuitId()); verificationState(o.getVerificationState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitsRequest.java index 8205854da15..cf3396fe661 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVirtualCircuitsRequest.java @@ -171,6 +171,7 @@ public Builder copy(ListVirtualCircuitsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVnicAttachmentsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVnicAttachmentsRequest.java index 9438eef216e..d16f5e0e239 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVnicAttachmentsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVnicAttachmentsRequest.java @@ -74,6 +74,7 @@ public Builder copy(ListVnicAttachmentsRequest o) { limit(o.getLimit()); page(o.getPage()); vnicId(o.getVnicId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeAttachmentsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeAttachmentsRequest.java index 0418e43ab5c..ded797bb2a9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeAttachmentsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeAttachmentsRequest.java @@ -74,6 +74,7 @@ public Builder copy(ListVolumeAttachmentsRequest o) { page(o.getPage()); instanceId(o.getInstanceId()); volumeId(o.getVolumeId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupPoliciesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupPoliciesRequest.java index 21761cefc8d..d8c9b807751 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupPoliciesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupPoliciesRequest.java @@ -47,6 +47,7 @@ public Builder invocationCallback( public Builder copy(ListVolumeBackupPoliciesRequest o) { limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupsRequest.java index b3fb83a7dd6..fc1a8221e3c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumeBackupsRequest.java @@ -177,6 +177,7 @@ public Builder copy(ListVolumeBackupsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumesRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumesRequest.java index 03617e54f86..2daae76992a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumesRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListVolumesRequest.java @@ -180,6 +180,7 @@ public Builder copy(ListVolumesRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/TerminateInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/TerminateInstanceRequest.java index be847c07f07..ea69909d15c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/TerminateInstanceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/TerminateInstanceRequest.java @@ -54,6 +54,7 @@ public Builder copy(TerminateInstanceRequest o) { instanceId(o.getInstanceId()); ifMatch(o.getIfMatch()); preserveBootVolume(o.getPreserveBootVolume()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateBootVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateBootVolumeRequest.java index 54b7f5f9b85..bce3fac852d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateBootVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateBootVolumeRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateBootVolumeRequest o) { bootVolumeId(o.getBootVolumeId()); updateBootVolumeDetails(o.getUpdateBootVolumeDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateConsoleHistoryRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateConsoleHistoryRequest.java index a1db5fcc853..8f9782ecfcf 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateConsoleHistoryRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateConsoleHistoryRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateConsoleHistoryRequest o) { instanceConsoleHistoryId(o.getInstanceConsoleHistoryId()); updateConsoleHistoryDetails(o.getUpdateConsoleHistoryDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCpeRequest.java index f139aced065..df84421d2a2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCpeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCpeRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateCpeRequest o) { cpeId(o.getCpeId()); updateCpeDetails(o.getUpdateCpeDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCrossConnectGroupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCrossConnectGroupRequest.java index a65849ebd37..8d4982ec8c0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCrossConnectGroupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCrossConnectGroupRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateCrossConnectGroupRequest o) { crossConnectGroupId(o.getCrossConnectGroupId()); updateCrossConnectGroupDetails(o.getUpdateCrossConnectGroupDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCrossConnectRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCrossConnectRequest.java index 16112371ac1..e615b6ddba3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCrossConnectRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateCrossConnectRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateCrossConnectRequest o) { crossConnectId(o.getCrossConnectId()); updateCrossConnectDetails(o.getUpdateCrossConnectDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDhcpOptionsRequest.java index 087c3c9b189..b20a1770a96 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDhcpOptionsRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDhcpOptionsRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateDhcpOptionsRequest o) { dhcpId(o.getDhcpId()); updateDhcpDetails(o.getUpdateDhcpDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgAttachmentRequest.java index 55afcc73496..87d46d4b05b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgAttachmentRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgAttachmentRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateDrgAttachmentRequest o) { drgAttachmentId(o.getDrgAttachmentId()); updateDrgAttachmentDetails(o.getUpdateDrgAttachmentDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgRequest.java index a0b3e495545..216afd0ecde 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateDrgRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateDrgRequest o) { drgId(o.getDrgId()); updateDrgDetails(o.getUpdateDrgDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateIPSecConnectionRequest.java index 14d2c0255d7..62b6808bdb3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateIPSecConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateIPSecConnectionRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateIPSecConnectionRequest o) { ipscId(o.getIpscId()); updateIPSecConnectionDetails(o.getUpdateIPSecConnectionDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java index b091443d5a5..8e73f1757eb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java @@ -63,6 +63,7 @@ public Builder copy(UpdateImageRequest o) { updateImageDetails(o.getUpdateImageDetails()); opcRetryToken(o.getOpcRetryToken()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java index 959530c3d3a..d8b2fe9cedd 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java @@ -63,6 +63,7 @@ public Builder copy(UpdateInstanceRequest o) { updateInstanceDetails(o.getUpdateInstanceDetails()); opcRetryToken(o.getOpcRetryToken()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInternetGatewayRequest.java index e03aeb38250..fd31bd85f82 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInternetGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInternetGatewayRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateInternetGatewayRequest o) { igId(o.getIgId()); updateInternetGatewayDetails(o.getUpdateInternetGatewayDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateLocalPeeringGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateLocalPeeringGatewayRequest.java index e13e738b445..9c5d3e987d5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateLocalPeeringGatewayRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateLocalPeeringGatewayRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateLocalPeeringGatewayRequest o) { localPeeringGatewayId(o.getLocalPeeringGatewayId()); updateLocalPeeringGatewayDetails(o.getUpdateLocalPeeringGatewayDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdatePrivateIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdatePrivateIpRequest.java index f8b044d20b5..53b99a8c29b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdatePrivateIpRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdatePrivateIpRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdatePrivateIpRequest o) { privateIpId(o.getPrivateIpId()); updatePrivateIpDetails(o.getUpdatePrivateIpDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdatePublicIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdatePublicIpRequest.java index 332bfcf7648..e258320bd0f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdatePublicIpRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdatePublicIpRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdatePublicIpRequest o) { publicIpId(o.getPublicIpId()); updatePublicIpDetails(o.getUpdatePublicIpDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRemotePeeringConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRemotePeeringConnectionRequest.java index a91bb9aadfc..bf81c498e44 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRemotePeeringConnectionRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRemotePeeringConnectionRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateRemotePeeringConnectionRequest o) { remotePeeringConnectionId(o.getRemotePeeringConnectionId()); updateRemotePeeringConnectionDetails(o.getUpdateRemotePeeringConnectionDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRouteTableRequest.java index cfe464d091f..37822f2263b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRouteTableRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateRouteTableRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateRouteTableRequest o) { rtId(o.getRtId()); updateRouteTableDetails(o.getUpdateRouteTableDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSecurityListRequest.java index 31342daa8f5..dfb4b4e805c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSecurityListRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSecurityListRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateSecurityListRequest o) { securityListId(o.getSecurityListId()); updateSecurityListDetails(o.getUpdateSecurityListDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSubnetRequest.java index d9cb8b4a11e..0cd240be216 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSubnetRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateSubnetRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateSubnetRequest o) { subnetId(o.getSubnetId()); updateSubnetDetails(o.getUpdateSubnetDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVcnRequest.java index 5611fcfea99..335248a23db 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVcnRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVcnRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateVcnRequest o) { vcnId(o.getVcnId()); updateVcnDetails(o.getUpdateVcnDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVirtualCircuitRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVirtualCircuitRequest.java index e7b6ddb6308..e934de1ee23 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVirtualCircuitRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVirtualCircuitRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateVirtualCircuitRequest o) { virtualCircuitId(o.getVirtualCircuitId()); updateVirtualCircuitDetails(o.getUpdateVirtualCircuitDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVnicRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVnicRequest.java index 2cd34ad803b..8d4d5a827f8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVnicRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVnicRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateVnicRequest o) { vnicId(o.getVnicId()); updateVnicDetails(o.getUpdateVnicDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeBackupRequest.java index af872761f13..0a4781748f9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeBackupRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeBackupRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateVolumeBackupRequest o) { volumeBackupId(o.getVolumeBackupId()); updateVolumeBackupDetails(o.getUpdateVolumeBackupDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeRequest.java index 38b30027796..292a2865d9d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeRequest.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateVolumeRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateVolumeRequest o) { volumeId(o.getVolumeId()); updateVolumeDetails(o.getUpdateVolumeDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/pom.xml b/bmc-database/pom.xml index 8ded7771481..e55f2fa88b7 100644 --- a/bmc-database/pom.xml +++ b/bmc-database/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 244ea164313..9736f9f9823 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 @@ -70,18 +70,18 @@ public DatabaseAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public DatabaseAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public DatabaseAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public DatabaseAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public DatabaseAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public DatabaseAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public DatabaseAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public DatabaseAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 2ff24e451f0..968362933db 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 @@ -75,18 +75,18 @@ public DatabaseClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public DatabaseClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public DatabaseClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public DatabaseClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public DatabaseClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public DatabaseClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public DatabaseClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public DatabaseClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public DatabaseClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } 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 0473a43d14b..4b4024ffbdb 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 @@ -58,6 +58,14 @@ public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( request.getDbSystemShape())); } + if (request.getDbSystemId() != null) { + target = + target.queryParam( + "dbSystemId", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getDbSystemId())); + } + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseDetails.java index fe500e51895..1f8bd8ce724 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseDetails.java @@ -68,6 +68,25 @@ public Builder dbWorkload(DbWorkload dbWorkload) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") private String ncharacterSet; @@ -97,6 +116,8 @@ public CreateDatabaseDetails build() { dbBackupConfig, dbName, dbWorkload, + definedTags, + freeformTags, ncharacterSet, pdbName); __instance__.__explicitlySet__.addAll(__explicitlySet__); @@ -111,6 +132,8 @@ public Builder copy(CreateDatabaseDetails o) { .dbBackupConfig(o.getDbBackupConfig()) .dbName(o.getDbName()) .dbWorkload(o.getDbWorkload()) + .definedTags(o.getDefinedTags()) + .freeformTags(o.getFreeformTags()) .ncharacterSet(o.getNcharacterSet()) .pdbName(o.getPdbName()); @@ -190,6 +213,26 @@ public static DbWorkload create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("dbWorkload") DbWorkload dbWorkload; + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + /** * National character set for the database. The default is AL16UTF16. Allowed values are: * AL16UTF16 or UTF8. diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/Database.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/Database.java index afb2a4bee48..7e8986d7395 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/Database.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/Database.java @@ -87,6 +87,25 @@ public Builder dbWorkload(String dbWorkload) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("id") private String id; @@ -154,6 +173,8 @@ public Database build() { dbName, dbUniqueName, dbWorkload, + definedTags, + freeformTags, id, lifecycleDetails, lifecycleState, @@ -174,6 +195,8 @@ public Builder copy(Database o) { .dbName(o.getDbName()) .dbUniqueName(o.getDbUniqueName()) .dbWorkload(o.getDbWorkload()) + .definedTags(o.getDefinedTags()) + .freeformTags(o.getFreeformTags()) .id(o.getId()) .lifecycleDetails(o.getLifecycleDetails()) .lifecycleState(o.getLifecycleState()) @@ -233,6 +256,26 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("dbWorkload") String dbWorkload; + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + /** * The OCID of the database. **/ diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DatabaseSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DatabaseSummary.java index 3c32a29f6bd..24d5a891487 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DatabaseSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DatabaseSummary.java @@ -87,6 +87,25 @@ public Builder dbWorkload(String dbWorkload) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("id") private String id; @@ -154,6 +173,8 @@ public DatabaseSummary build() { dbName, dbUniqueName, dbWorkload, + definedTags, + freeformTags, id, lifecycleDetails, lifecycleState, @@ -174,6 +195,8 @@ public Builder copy(DatabaseSummary o) { .dbName(o.getDbName()) .dbUniqueName(o.getDbUniqueName()) .dbWorkload(o.getDbWorkload()) + .definedTags(o.getDefinedTags()) + .freeformTags(o.getFreeformTags()) .id(o.getId()) .lifecycleDetails(o.getLifecycleDetails()) .lifecycleState(o.getLifecycleState()) @@ -233,6 +256,26 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("dbWorkload") String dbWorkload; + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + /** * The OCID of the database. **/ diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystem.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystem.java index 0ecde3738ee..78a15dc5155 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystem.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystem.java @@ -108,6 +108,16 @@ public Builder databaseEdition(DatabaseEdition databaseEdition) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") private DiskRedundancy diskRedundancy; @@ -135,6 +145,15 @@ public Builder domain(String domain) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("hostname") private String hostname; @@ -302,9 +321,11 @@ public DbSystem build() { dataStoragePercentage, dataStorageSizeInGBs, databaseEdition, + definedTags, diskRedundancy, displayName, domain, + freeformTags, hostname, id, lastPatchHistoryEntryId, @@ -337,9 +358,11 @@ public Builder copy(DbSystem o) { .dataStoragePercentage(o.getDataStoragePercentage()) .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) .databaseEdition(o.getDatabaseEdition()) + .definedTags(o.getDefinedTags()) .diskRedundancy(o.getDiskRedundancy()) .displayName(o.getDisplayName()) .domain(o.getDomain()) + .freeformTags(o.getFreeformTags()) .hostname(o.getHostname()) .id(o.getId()) .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) @@ -474,6 +497,16 @@ public static DatabaseEdition create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") DatabaseEdition databaseEdition; + + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; /** * The type of redundancy configured for the DB System. * Normal is 2-way redundancy. @@ -544,6 +577,16 @@ public static DiskRedundancy create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("domain") String domain; + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + /** * The host name for the DB Node. **/ diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemSummary.java index b1f40383d3e..546196f2f4b 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemSummary.java @@ -108,6 +108,16 @@ public Builder databaseEdition(DatabaseEdition databaseEdition) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") private DiskRedundancy diskRedundancy; @@ -135,6 +145,15 @@ public Builder domain(String domain) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("hostname") private String hostname; @@ -302,9 +321,11 @@ public DbSystemSummary build() { dataStoragePercentage, dataStorageSizeInGBs, databaseEdition, + definedTags, diskRedundancy, displayName, domain, + freeformTags, hostname, id, lastPatchHistoryEntryId, @@ -337,9 +358,11 @@ public Builder copy(DbSystemSummary o) { .dataStoragePercentage(o.getDataStoragePercentage()) .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) .databaseEdition(o.getDatabaseEdition()) + .definedTags(o.getDefinedTags()) .diskRedundancy(o.getDiskRedundancy()) .displayName(o.getDisplayName()) .domain(o.getDomain()) + .freeformTags(o.getFreeformTags()) .hostname(o.getHostname()) .id(o.getId()) .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) @@ -474,6 +497,16 @@ public static DatabaseEdition create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") DatabaseEdition databaseEdition; + + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; /** * The type of redundancy configured for the DB System. * Normal is 2-way redundancy. @@ -544,6 +577,16 @@ public static DiskRedundancy create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("domain") String domain; + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + /** * The host name for the DB Node. **/ diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemDetails.java index d75f0f06fbc..b678ebf6ea2 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemDetails.java @@ -95,6 +95,16 @@ public Builder dbHome(CreateDbHomeDetails dbHome) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") private DiskRedundancy diskRedundancy; @@ -122,6 +132,15 @@ public Builder domain(String domain) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("hostname") private String hostname; @@ -199,9 +218,11 @@ public LaunchDbSystemDetails build() { dataStoragePercentage, databaseEdition, dbHome, + definedTags, diskRedundancy, displayName, domain, + freeformTags, hostname, initialDataStorageSizeInGB, licenseModel, @@ -224,9 +245,11 @@ public Builder copy(LaunchDbSystemDetails o) { .dataStoragePercentage(o.getDataStoragePercentage()) .databaseEdition(o.getDatabaseEdition()) .dbHome(o.getDbHome()) + .definedTags(o.getDefinedTags()) .diskRedundancy(o.getDiskRedundancy()) .displayName(o.getDisplayName()) .domain(o.getDomain()) + .freeformTags(o.getFreeformTags()) .hostname(o.getHostname()) .initialDataStorageSizeInGB(o.getInitialDataStorageSizeInGB()) .licenseModel(o.getLicenseModel()) @@ -349,6 +372,16 @@ public static DatabaseEdition create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("dbHome") CreateDbHomeDetails dbHome; + + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; /** * The type of redundancy configured for the DB System. * Normal is 2-way redundancy, recommended for test and development systems. @@ -411,6 +444,16 @@ public static DiskRedundancy create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("domain") String domain; + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + /** * The host name for the DB System. The host name must begin with an alphabetic character and * can contain a maximum of 30 alphanumeric characters, including hyphens (-). diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDatabaseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDatabaseDetails.java index 119b5fc2e3c..7f0ab1a8644 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDatabaseDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDatabaseDetails.java @@ -32,18 +32,41 @@ public Builder dbBackupConfig(DbBackupConfig dbBackupConfig) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public UpdateDatabaseDetails build() { - UpdateDatabaseDetails __instance__ = new UpdateDatabaseDetails(dbBackupConfig); + UpdateDatabaseDetails __instance__ = + new UpdateDatabaseDetails(dbBackupConfig, definedTags, freeformTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateDatabaseDetails o) { - Builder copiedBuilder = dbBackupConfig(o.getDbBackupConfig()); + Builder copiedBuilder = + dbBackupConfig(o.getDbBackupConfig()) + .definedTags(o.getDefinedTags()) + .freeformTags(o.getFreeformTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -60,6 +83,26 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") DbBackupConfig dbBackupConfig; + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbSystemDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbSystemDetails.java index 1792978e460..8a243878af7 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbSystemDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbSystemDetails.java @@ -42,6 +42,25 @@ public Builder dataStorageSizeInGBs(Integer dataStorageSizeInGBs) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") private java.util.List sshPublicKeys; @@ -66,7 +85,12 @@ public Builder version(PatchDetails version) { public UpdateDbSystemDetails build() { UpdateDbSystemDetails __instance__ = new UpdateDbSystemDetails( - cpuCoreCount, dataStorageSizeInGBs, sshPublicKeys, version); + cpuCoreCount, + dataStorageSizeInGBs, + definedTags, + freeformTags, + sshPublicKeys, + version); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -76,6 +100,8 @@ public Builder copy(UpdateDbSystemDetails o) { Builder copiedBuilder = cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) + .definedTags(o.getDefinedTags()) + .freeformTags(o.getFreeformTags()) .sshPublicKeys(o.getSshPublicKeys()) .version(o.getVersion()); @@ -104,6 +130,26 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") Integer dataStorageSizeInGBs; + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + /** * The public key portion of the key pair to use for SSH access to the DB System. Multiple public keys can be provided. The length of the combined keys cannot exceed 10,000 characters. **/ diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateBackupRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateBackupRequest.java index 0109052c396..b96edc3a066 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateBackupRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateBackupRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateBackupRequest o) { createBackupDetails(o.getCreateBackupDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateDataGuardAssociationRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateDataGuardAssociationRequest.java index 0ec4e52ff07..91a6c3cd29c 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateDataGuardAssociationRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateDataGuardAssociationRequest.java @@ -54,6 +54,7 @@ public Builder copy(CreateDataGuardAssociationRequest o) { databaseId(o.getDatabaseId()); createDataGuardAssociationDetails(o.getCreateDataGuardAssociationDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateDbHomeRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateDbHomeRequest.java index 068a4c5d540..d32be7a0f95 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateDbHomeRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/CreateDbHomeRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateDbHomeRequest o) { createDbHomeWithDbSystemIdDetails(o.getCreateDbHomeWithDbSystemIdDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/DbNodeActionRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/DbNodeActionRequest.java index 7d802c20e1b..fbe4873cb9a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/DbNodeActionRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/DbNodeActionRequest.java @@ -63,6 +63,7 @@ public Builder copy(DbNodeActionRequest o) { action(o.getAction()); opcRetryToken(o.getOpcRetryToken()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/DeleteBackupRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/DeleteBackupRequest.java index 8fa56479abb..8093f97f7a8 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/DeleteBackupRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/DeleteBackupRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteBackupRequest o) { backupId(o.getBackupId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/DeleteDbHomeRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/DeleteDbHomeRequest.java index a8168c38a68..0b1c1425c53 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/DeleteDbHomeRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/DeleteDbHomeRequest.java @@ -52,6 +52,7 @@ public Builder copy(DeleteDbHomeRequest o) { dbHomeId(o.getDbHomeId()); ifMatch(o.getIfMatch()); performFinalBackup(o.getPerformFinalBackup()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/FailoverDataGuardAssociationRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/FailoverDataGuardAssociationRequest.java index 6e83100ac2a..158919fb62a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/FailoverDataGuardAssociationRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/FailoverDataGuardAssociationRequest.java @@ -58,6 +58,7 @@ public Builder copy(FailoverDataGuardAssociationRequest o) { dataGuardAssociationId(o.getDataGuardAssociationId()); failoverDataGuardAssociationDetails(o.getFailoverDataGuardAssociationDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetBackupRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetBackupRequest.java index 05888ab08b0..a66b82db037 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetBackupRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetBackupRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetBackupRequest o) { backupId(o.getBackupId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDataGuardAssociationRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDataGuardAssociationRequest.java index adbb5d3356b..054dbee8a3f 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDataGuardAssociationRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDataGuardAssociationRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(GetDataGuardAssociationRequest o) { databaseId(o.getDatabaseId()); dataGuardAssociationId(o.getDataGuardAssociationId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDatabaseRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDatabaseRequest.java index dbe110c149e..f94fe7f88a5 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDatabaseRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDatabaseRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetDatabaseRequest o) { databaseId(o.getDatabaseId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomePatchHistoryEntryRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomePatchHistoryEntryRequest.java index a5b2ff630c8..1daefda75cb 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomePatchHistoryEntryRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomePatchHistoryEntryRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(GetDbHomePatchHistoryEntryRequest o) { dbHomeId(o.getDbHomeId()); patchHistoryEntryId(o.getPatchHistoryEntryId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomePatchRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomePatchRequest.java index 0508e2e9d5c..fa0199638da 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomePatchRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomePatchRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(GetDbHomePatchRequest o) { dbHomeId(o.getDbHomeId()); patchId(o.getPatchId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomeRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomeRequest.java index 86469894501..44f035a633a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomeRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbHomeRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetDbHomeRequest o) { dbHomeId(o.getDbHomeId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbNodeRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbNodeRequest.java index 0090db201a9..6e740fc2a9f 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbNodeRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbNodeRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetDbNodeRequest o) { dbNodeId(o.getDbNodeId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemPatchHistoryEntryRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemPatchHistoryEntryRequest.java index 63d56787e46..5ea4b96bdc0 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemPatchHistoryEntryRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemPatchHistoryEntryRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(GetDbSystemPatchHistoryEntryRequest o) { dbSystemId(o.getDbSystemId()); patchHistoryEntryId(o.getPatchHistoryEntryId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemPatchRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemPatchRequest.java index 0fe7aa2c790..a2f5d976bdb 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemPatchRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemPatchRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(GetDbSystemPatchRequest o) { dbSystemId(o.getDbSystemId()); patchId(o.getPatchId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemRequest.java index ea8890fc43a..1cbbd01a19e 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/GetDbSystemRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetDbSystemRequest o) { dbSystemId(o.getDbSystemId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/LaunchDbSystemRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/LaunchDbSystemRequest.java index ff3672d0563..64bb480e68a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/LaunchDbSystemRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/LaunchDbSystemRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(LaunchDbSystemRequest o) { launchDbSystemDetails(o.getLaunchDbSystemDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListBackupsRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListBackupsRequest.java index 70ac031f7c0..b55716229ee 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListBackupsRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListBackupsRequest.java @@ -55,6 +55,7 @@ public Builder copy(ListBackupsRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDataGuardAssociationsRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDataGuardAssociationsRequest.java index ea2ecdb3e98..f6de11b6459 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDataGuardAssociationsRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDataGuardAssociationsRequest.java @@ -49,6 +49,7 @@ public Builder copy(ListDataGuardAssociationsRequest o) { databaseId(o.getDatabaseId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDatabasesRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDatabasesRequest.java index fea12a98b90..4658d1a9c08 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDatabasesRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDatabasesRequest.java @@ -55,6 +55,7 @@ public Builder copy(ListDatabasesRequest o) { dbHomeId(o.getDbHomeId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomePatchHistoryEntriesRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomePatchHistoryEntriesRequest.java index 908f99857f5..f7b251ccc7f 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomePatchHistoryEntriesRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomePatchHistoryEntriesRequest.java @@ -49,6 +49,7 @@ public Builder copy(ListDbHomePatchHistoryEntriesRequest o) { dbHomeId(o.getDbHomeId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomePatchesRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomePatchesRequest.java index cdae430f0a4..345f87dd083 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomePatchesRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomePatchesRequest.java @@ -49,6 +49,7 @@ public Builder copy(ListDbHomePatchesRequest o) { dbHomeId(o.getDbHomeId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomesRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomesRequest.java index 5a5e8658e11..98a3a3545a5 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomesRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbHomesRequest.java @@ -55,6 +55,7 @@ public Builder copy(ListDbHomesRequest o) { dbSystemId(o.getDbSystemId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbNodesRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbNodesRequest.java index 94d96bc52cc..4ff04f813ef 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbNodesRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbNodesRequest.java @@ -55,6 +55,7 @@ public Builder copy(ListDbNodesRequest o) { dbSystemId(o.getDbSystemId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemPatchHistoryEntriesRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemPatchHistoryEntriesRequest.java index 3a1bcf41d0c..a6afffdd121 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemPatchHistoryEntriesRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemPatchHistoryEntriesRequest.java @@ -49,6 +49,7 @@ public Builder copy(ListDbSystemPatchHistoryEntriesRequest o) { dbSystemId(o.getDbSystemId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemPatchesRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemPatchesRequest.java index f301825929c..ae4b9761b37 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemPatchesRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemPatchesRequest.java @@ -49,6 +49,7 @@ public Builder copy(ListDbSystemPatchesRequest o) { dbSystemId(o.getDbSystemId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemShapesRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemShapesRequest.java index 0c7305139be..b36675b7513 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemShapesRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemShapesRequest.java @@ -55,6 +55,7 @@ public Builder copy(ListDbSystemShapesRequest o) { compartmentId(o.getCompartmentId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemsRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemsRequest.java index d580553c60d..deb0de4b6c8 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemsRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbSystemsRequest.java @@ -55,6 +55,7 @@ public Builder copy(ListDbSystemsRequest o) { limit(o.getLimit()); page(o.getPage()); backupId(o.getBackupId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbVersionsRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbVersionsRequest.java index bb71c4cbb0a..7272ebac71a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbVersionsRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ListDbVersionsRequest.java @@ -30,6 +30,11 @@ public class ListDbVersionsRequest extends com.oracle.bmc.requests.BmcRequest { */ private String dbSystemShape; + /** + * The DB system OCID. If provided, filters the results to the set of database versions which are supported for the DB system. + */ + private String dbSystemId; + public static class Builder { private com.oracle.bmc.util.internal.Consumer invocationCallback = null; @@ -55,6 +60,8 @@ public Builder copy(ListDbVersionsRequest o) { limit(o.getLimit()); page(o.getPage()); dbSystemShape(o.getDbSystemShape()); + dbSystemId(o.getDbSystemId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ReinstateDataGuardAssociationRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ReinstateDataGuardAssociationRequest.java index aa62fcc01a8..af6d2623209 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/ReinstateDataGuardAssociationRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/ReinstateDataGuardAssociationRequest.java @@ -58,6 +58,7 @@ public Builder copy(ReinstateDataGuardAssociationRequest o) { dataGuardAssociationId(o.getDataGuardAssociationId()); reinstateDataGuardAssociationDetails(o.getReinstateDataGuardAssociationDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/RestoreDatabaseRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/RestoreDatabaseRequest.java index 04e35354915..3ae2ed7ecd8 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/RestoreDatabaseRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/RestoreDatabaseRequest.java @@ -52,6 +52,7 @@ public Builder copy(RestoreDatabaseRequest o) { databaseId(o.getDatabaseId()); restoreDatabaseDetails(o.getRestoreDatabaseDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/SwitchoverDataGuardAssociationRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/SwitchoverDataGuardAssociationRequest.java index 26e8bf4b4cc..2d1b74da033 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/SwitchoverDataGuardAssociationRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/SwitchoverDataGuardAssociationRequest.java @@ -58,6 +58,7 @@ public Builder copy(SwitchoverDataGuardAssociationRequest o) { dataGuardAssociationId(o.getDataGuardAssociationId()); switchoverDataGuardAssociationDetails(o.getSwitchoverDataGuardAssociationDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/TerminateDbSystemRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/TerminateDbSystemRequest.java index c7081c08ef5..a2ef03c7c24 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/TerminateDbSystemRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/TerminateDbSystemRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(TerminateDbSystemRequest o) { dbSystemId(o.getDbSystemId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDatabaseRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDatabaseRequest.java index fca071ebe0c..b2ee87a60e1 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDatabaseRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDatabaseRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateDatabaseRequest o) { databaseId(o.getDatabaseId()); updateDatabaseDetails(o.getUpdateDatabaseDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDbHomeRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDbHomeRequest.java index c098d9f1840..38e938749d5 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDbHomeRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDbHomeRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateDbHomeRequest o) { dbHomeId(o.getDbHomeId()); updateDbHomeDetails(o.getUpdateDbHomeDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDbSystemRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDbSystemRequest.java index 69ff1c46acd..cf9c5521913 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDbSystemRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/UpdateDbSystemRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateDbSystemRequest o) { dbSystemId(o.getDbSystemId()); updateDbSystemDetails(o.getUpdateDbSystemDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/pom.xml b/bmc-dns/pom.xml index 6bbe01fb7a9..029a400a88d 100644 --- a/bmc-dns/pom.xml +++ b/bmc-dns/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 1f698908e8e..c5750da7767 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 @@ -70,18 +70,18 @@ public DnsAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public DnsAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public DnsAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public DnsAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public DnsAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public DnsAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public DnsAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public DnsAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 ca608bda374..b8ec85ed6ed 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 @@ -75,18 +75,18 @@ public DnsClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public DnsClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public DnsClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public DnsClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public DnsClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public DnsClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public DnsClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public DnsClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public DnsClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/CreateZoneRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/CreateZoneRequest.java index 913704f3cdf..4eb3e7cecea 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/CreateZoneRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/CreateZoneRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(CreateZoneRequest o) { createZoneDetails(o.getCreateZoneDetails()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteDomainRecordsRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteDomainRecordsRequest.java index 725a3de57dc..a60ecf619ad 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteDomainRecordsRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteDomainRecordsRequest.java @@ -71,6 +71,7 @@ public Builder copy(DeleteDomainRecordsRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteRRSetRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteRRSetRequest.java index 16d3336879d..5c5edd46052 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteRRSetRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteRRSetRequest.java @@ -77,6 +77,7 @@ public Builder copy(DeleteRRSetRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteZoneRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteZoneRequest.java index def896f3424..1970aca2475 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteZoneRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/DeleteZoneRequest.java @@ -65,6 +65,7 @@ public Builder copy(DeleteZoneRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetDomainRecordsRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetDomainRecordsRequest.java index b85902c7b12..60a79eacad1 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetDomainRecordsRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetDomainRecordsRequest.java @@ -147,6 +147,7 @@ public Builder copy(GetDomainRecordsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetRRSetRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetRRSetRequest.java index 003e4223ef4..cd245078d30 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetRRSetRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetRRSetRequest.java @@ -96,6 +96,7 @@ public Builder copy(GetRRSetRequest o) { page(o.getPage()); zoneVersion(o.getZoneVersion()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetZoneRecordsRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetZoneRecordsRequest.java index e98f270c1a4..8c66e055aa8 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetZoneRecordsRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetZoneRecordsRequest.java @@ -158,6 +158,7 @@ public Builder copy(GetZoneRecordsRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetZoneRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetZoneRequest.java index 2c33298aa4b..1b6d21afa59 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetZoneRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/GetZoneRequest.java @@ -63,6 +63,7 @@ public Builder copy(GetZoneRequest o) { ifNoneMatch(o.getIfNoneMatch()); ifModifiedSince(o.getIfModifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/ListZonesRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/ListZonesRequest.java index 8c41242bc47..d398a6627ea 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/ListZonesRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/ListZonesRequest.java @@ -224,6 +224,7 @@ public Builder copy(ListZonesRequest o) { sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchDomainRecordsRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchDomainRecordsRequest.java index d20f63b028b..271f128c64b 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchDomainRecordsRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchDomainRecordsRequest.java @@ -77,6 +77,7 @@ public Builder copy(PatchDomainRecordsRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchRRSetRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchRRSetRequest.java index f7239c59cef..d772f58d87e 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchRRSetRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchRRSetRequest.java @@ -83,6 +83,7 @@ public Builder copy(PatchRRSetRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchZoneRecordsRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchZoneRecordsRequest.java index 3a0cc05b016..cde3690c125 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchZoneRecordsRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/PatchZoneRecordsRequest.java @@ -72,6 +72,7 @@ public Builder copy(PatchZoneRecordsRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateDomainRecordsRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateDomainRecordsRequest.java index 304e81d3bb3..fdd04db1fe6 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateDomainRecordsRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateDomainRecordsRequest.java @@ -77,6 +77,7 @@ public Builder copy(UpdateDomainRecordsRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateRRSetRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateRRSetRequest.java index 41d28ed3bca..c8261842958 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateRRSetRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateRRSetRequest.java @@ -83,6 +83,7 @@ public Builder copy(UpdateRRSetRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateZoneRecordsRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateZoneRecordsRequest.java index abfd620cdd1..da1390034d1 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateZoneRecordsRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateZoneRecordsRequest.java @@ -71,6 +71,7 @@ public Builder copy(UpdateZoneRecordsRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateZoneRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateZoneRequest.java index a30e78936fa..78e01e04710 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateZoneRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/UpdateZoneRequest.java @@ -71,6 +71,7 @@ public Builder copy(UpdateZoneRequest o) { ifMatch(o.getIfMatch()); ifUnmodifiedSince(o.getIfUnmodifiedSince()); compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-email/pom.xml b/bmc-email/pom.xml index c8922e6a084..ef459c9119b 100644 --- a/bmc-email/pom.xml +++ b/bmc-email/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 4c80ad94632..b9a6d3125a5 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 @@ -70,18 +70,18 @@ public EmailAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public EmailAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public EmailAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public EmailAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public EmailAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public EmailAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public EmailAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public EmailAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 a512a09c052..d612ff64eef 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 @@ -75,18 +75,18 @@ public EmailClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public EmailClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public EmailClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public EmailClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public EmailClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public EmailClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public EmailClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public EmailClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public EmailClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/requests/CreateSenderRequest.java b/bmc-email/src/main/java/com/oracle/bmc/email/requests/CreateSenderRequest.java index 260d30f557c..6a98736e5df 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/requests/CreateSenderRequest.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/requests/CreateSenderRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(CreateSenderRequest o) { createSenderDetails(o.getCreateSenderDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/requests/CreateSuppressionRequest.java b/bmc-email/src/main/java/com/oracle/bmc/email/requests/CreateSuppressionRequest.java index 5870f7fa5aa..8f086c32893 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/requests/CreateSuppressionRequest.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/requests/CreateSuppressionRequest.java @@ -38,6 +38,7 @@ public Builder invocationCallback( */ public Builder copy(CreateSuppressionRequest o) { createSuppressionDetails(o.getCreateSuppressionDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/requests/DeleteSenderRequest.java b/bmc-email/src/main/java/com/oracle/bmc/email/requests/DeleteSenderRequest.java index 28c072f2e63..d87d0c9ae2e 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/requests/DeleteSenderRequest.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/requests/DeleteSenderRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(DeleteSenderRequest o) { senderId(o.getSenderId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/requests/DeleteSuppressionRequest.java b/bmc-email/src/main/java/com/oracle/bmc/email/requests/DeleteSuppressionRequest.java index d45fc8d6b91..3832582d55f 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/requests/DeleteSuppressionRequest.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/requests/DeleteSuppressionRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(DeleteSuppressionRequest o) { suppressionId(o.getSuppressionId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/requests/GetSenderRequest.java b/bmc-email/src/main/java/com/oracle/bmc/email/requests/GetSenderRequest.java index 70e66321430..1f3af71caaa 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/requests/GetSenderRequest.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/requests/GetSenderRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetSenderRequest o) { senderId(o.getSenderId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/requests/GetSuppressionRequest.java b/bmc-email/src/main/java/com/oracle/bmc/email/requests/GetSuppressionRequest.java index af7a5183fdf..cf754c0abce 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/requests/GetSuppressionRequest.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/requests/GetSuppressionRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetSuppressionRequest o) { suppressionId(o.getSuppressionId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/requests/ListSendersRequest.java b/bmc-email/src/main/java/com/oracle/bmc/email/requests/ListSendersRequest.java index cc83700418e..2e14e0931b3 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/requests/ListSendersRequest.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/requests/ListSendersRequest.java @@ -158,6 +158,7 @@ public Builder copy(ListSendersRequest o) { limit(o.getLimit()); sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-email/src/main/java/com/oracle/bmc/email/requests/ListSuppressionsRequest.java b/bmc-email/src/main/java/com/oracle/bmc/email/requests/ListSuppressionsRequest.java index 5ef08110c3a..1bac17e3b86 100644 --- a/bmc-email/src/main/java/com/oracle/bmc/email/requests/ListSuppressionsRequest.java +++ b/bmc-email/src/main/java/com/oracle/bmc/email/requests/ListSuppressionsRequest.java @@ -180,6 +180,7 @@ public Builder copy(ListSuppressionsRequest o) { limit(o.getLimit()); sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-examples/pom.xml b/bmc-examples/pom.xml index 84339c49e19..9db0ecec0de 100644 --- a/bmc-examples/pom.xml +++ b/bmc-examples/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-bom - 1.2.34 + 1.2.35 pom import @@ -58,6 +58,7 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage + pom diff --git a/bmc-filestorage/pom.xml b/bmc-filestorage/pom.xml index 1d526581752..95cd191e483 100644 --- a/bmc-filestorage/pom.xml +++ b/bmc-filestorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 5bb86255f88..7539a41af3b 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 @@ -70,18 +70,18 @@ public FileStorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public FileStorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public FileStorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public FileStorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public FileStorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public FileStorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public FileStorageAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public FileStorageAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 beba7bb3dbd..da63dc518cf 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 @@ -75,18 +75,18 @@ public FileStorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public FileStorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public FileStorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public FileStorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public FileStorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public FileStorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public FileStorageClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public FileStorageClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public FileStorageClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateExportRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateExportRequest.java index 7e957b7915f..d077d39b65f 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateExportRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateExportRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateExportRequest o) { createExportDetails(o.getCreateExportDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateFileSystemRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateFileSystemRequest.java index bffd6eab2e2..32c1b08acef 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateFileSystemRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateFileSystemRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateFileSystemRequest o) { createFileSystemDetails(o.getCreateFileSystemDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateMountTargetRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateMountTargetRequest.java index f07839a483f..bbd7e123a06 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateMountTargetRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateMountTargetRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateMountTargetRequest o) { createMountTargetDetails(o.getCreateMountTargetDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateSnapshotRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateSnapshotRequest.java index 41cabf2eb96..d3f360c936e 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateSnapshotRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/CreateSnapshotRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateSnapshotRequest o) { createSnapshotDetails(o.getCreateSnapshotDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteExportRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteExportRequest.java index 6f1e098d862..8777447f570 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteExportRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteExportRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(DeleteExportRequest o) { exportId(o.getExportId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteFileSystemRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteFileSystemRequest.java index d267736a6a1..03734631577 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteFileSystemRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteFileSystemRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(DeleteFileSystemRequest o) { fileSystemId(o.getFileSystemId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteMountTargetRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteMountTargetRequest.java index a88e5fd7fcb..e040cd6396d 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteMountTargetRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteMountTargetRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(DeleteMountTargetRequest o) { mountTargetId(o.getMountTargetId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteSnapshotRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteSnapshotRequest.java index c76390e58a0..4d8eff2d963 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteSnapshotRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/DeleteSnapshotRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(DeleteSnapshotRequest o) { snapshotId(o.getSnapshotId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetExportRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetExportRequest.java index dadb4935147..2fc4a331aaa 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetExportRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetExportRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetExportRequest o) { exportId(o.getExportId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetExportSetRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetExportSetRequest.java index a153e9ad669..58bc3963a93 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetExportSetRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetExportSetRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetExportSetRequest o) { exportSetId(o.getExportSetId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetFileSystemRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetFileSystemRequest.java index 62375f7c782..62d3e3d51c8 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetFileSystemRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetFileSystemRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetFileSystemRequest o) { fileSystemId(o.getFileSystemId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetMountTargetRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetMountTargetRequest.java index 85e5921bc11..9bfd1cce436 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetMountTargetRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetMountTargetRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetMountTargetRequest o) { mountTargetId(o.getMountTargetId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetSnapshotRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetSnapshotRequest.java index 32572f197a8..0b3b33a1600 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetSnapshotRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/GetSnapshotRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetSnapshotRequest o) { snapshotId(o.getSnapshotId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListExportSetsRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListExportSetsRequest.java index f0a59eb0a5b..78b7f770ec0 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListExportSetsRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListExportSetsRequest.java @@ -224,6 +224,7 @@ public Builder copy(ListExportSetsRequest o) { id(o.getId()); sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListExportsRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListExportsRequest.java index 51bb19a37e3..29109f5198c 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListExportsRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListExportsRequest.java @@ -218,6 +218,7 @@ public Builder copy(ListExportsRequest o) { id(o.getId()); sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListFileSystemsRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListFileSystemsRequest.java index a9acab7e188..7bdb5c1c242 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListFileSystemsRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListFileSystemsRequest.java @@ -224,6 +224,7 @@ public Builder copy(ListFileSystemsRequest o) { id(o.getId()); sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListMountTargetsRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListMountTargetsRequest.java index d4bb3bcd80a..1e17463a936 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListMountTargetsRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListMountTargetsRequest.java @@ -230,6 +230,7 @@ public Builder copy(ListMountTargetsRequest o) { id(o.getId()); sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListSnapshotsRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListSnapshotsRequest.java index e67d8a7eddf..af019f913d1 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListSnapshotsRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/ListSnapshotsRequest.java @@ -156,6 +156,7 @@ public Builder copy(ListSnapshotsRequest o) { lifecycleState(o.getLifecycleState()); id(o.getId()); sortOrder(o.getSortOrder()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateExportSetRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateExportSetRequest.java index 6019d304140..9a510bb0e5a 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateExportSetRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateExportSetRequest.java @@ -54,6 +54,7 @@ public Builder copy(UpdateExportSetRequest o) { exportSetId(o.getExportSetId()); updateExportSetDetails(o.getUpdateExportSetDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateFileSystemRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateFileSystemRequest.java index d38773b4c8f..292fa91620a 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateFileSystemRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateFileSystemRequest.java @@ -54,6 +54,7 @@ public Builder copy(UpdateFileSystemRequest o) { fileSystemId(o.getFileSystemId()); updateFileSystemDetails(o.getUpdateFileSystemDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateMountTargetRequest.java b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateMountTargetRequest.java index 3e2018fa4ea..0a0455bda1a 100644 --- a/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateMountTargetRequest.java +++ b/bmc-filestorage/src/main/java/com/oracle/bmc/filestorage/requests/UpdateMountTargetRequest.java @@ -54,6 +54,7 @@ public Builder copy(UpdateMountTargetRequest o) { mountTargetId(o.getMountTargetId()); updateMountTargetDetails(o.getUpdateMountTargetDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-full/pom.xml b/bmc-full/pom.xml new file mode 100644 index 00000000000..5be775aa254 --- /dev/null +++ b/bmc-full/pom.xml @@ -0,0 +1,203 @@ + + + 4.0.0 + + com.oracle.oci.sdk + oci-java-sdk + 1.2.35 + ../pom.xml + + oci-java-sdk-full + Oracle Cloud Infrastructure SDK - Full SDK + This project contains the complete SDK distribution used for Oracle Cloud Infrastructure + https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm + + + + ziponly + + + + maven-assembly-plugin + + true + true + + src/main/assembly/assembly.xml + + + + + package + + single + + + + + + + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + false + false + true + + ${java.io.tmpdir}/dependency-reduced-pom.xml + + + + com.oracle.oci.sdk:* + + + + + *:* + + **/pom.xml + **/pom.properties + + + + + + + + + + + maven-javadoc-plugin + + true + Oracle Cloud Infrastructure Java SDK - ${project.version} + Oracle Cloud Infrastructure Java SDK - ${project.version} + OCI Java SDK + + ../bmc-audit/target/generated-sources-for-docs/delombok; + ../bmc-common/target/generated-sources-for-docs/delombok; + ../bmc-core/target/generated-sources-for-docs/delombok; + ../bmc-database/target/generated-sources-for-docs/delombok; + ../bmc-dns/target/generated-sources-for-docs/delombok; + ../bmc-email/target/generated-sources-for-docs/delombok; + ../bmc-filestorage/target/generated-sources-for-docs/delombok; + ../bmc-identity/target/generated-sources-for-docs/delombok; + ../bmc-loadbalancer/target/generated-sources-for-docs/delombok; + ../bmc-objectstorage/bmc-objectstorage-extensions/target/generated-sources-for-docs/delombok; + ../bmc-objectstorage/bmc-objectstorage-generated/target/generated-sources-for-docs/delombok; + + + + Oracle Cloud Infrastructure Audit Service + com.oracle.bmc.audit* + + + Oracle Cloud Infrastructure Core Services (Compute/Virtual Network/Block Storage) + com.oracle.bmc.core* + + + Oracle Cloud Infrastructure Database Service + com.oracle.bmc.database* + + + Oracle Cloud Infrastructure DNS Service + com.oracle.bmc.dns* + + + Oracle Cloud Infrastructure Email Service + com.oracle.bmc.email* + + + Oracle Cloud Infrastructure File Storage + com.oracle.bmc.filestorage* + + + Oracle Cloud Infrastructure Identity Service + com.oracle.bmc.identity* + + + Oracle Cloud Infrastructure Load Balancer Service + com.oracle.bmc.loadbalancer* + + + Oracle Cloud Infrastructure Object Storage Service + com.oracle.bmc.objectstorage* + + + Oracle Cloud Infrastructure Common Runtime + com.oracle.bmc* + + + src/main/java/overview.html + + + + + + + + com.oracle.oci.sdk + oci-java-sdk-bom + 1.2.35 + pom + import + + + + + + com.oracle.oci.sdk + oci-java-sdk-audit + + + com.oracle.oci.sdk + oci-java-sdk-common + + + com.oracle.oci.sdk + oci-java-sdk-core + + + com.oracle.oci.sdk + oci-java-sdk-database + + + com.oracle.oci.sdk + oci-java-sdk-dns + + + com.oracle.oci.sdk + oci-java-sdk-email + + + com.oracle.oci.sdk + oci-java-sdk-filestorage + + + com.oracle.oci.sdk + oci-java-sdk-identity + + + com.oracle.oci.sdk + oci-java-sdk-loadbalancer + + + com.oracle.oci.sdk + oci-java-sdk-objectstorage + pom + + + diff --git a/bmc-full/src/main/assembly/assembly.xml b/bmc-full/src/main/assembly/assembly.xml new file mode 100644 index 00000000000..0c5314e0619 --- /dev/null +++ b/bmc-full/src/main/assembly/assembly.xml @@ -0,0 +1,67 @@ + + + partial_full + false + + zip + + + + + ${project.basedir}/.. + + + LICENSE.txt + Thirdpartyreadme.txt + + + + + ../bmc-examples/src/main/java + examples + + README + + + + + ${project.build.directory}/apidocs + apidocs + + + .. + + + CHANGELOG.md + + + + + + + + + com.oracle.oci.sdk:oci-java-sdk-full + + lib + + true + + true + runtime + + + + + + com.oracle.oci.sdk:* + + third-party/lib + false + false + runtime + + + \ No newline at end of file diff --git a/bmc-full/src/main/java/overview.html b/bmc-full/src/main/java/overview.html new file mode 100644 index 00000000000..80bb5d37bcc --- /dev/null +++ b/bmc-full/src/main/java/overview.html @@ -0,0 +1,63 @@ + + +

Quick Start Guide

+ +

User Documentation

+

More complete user documentation is available on the Oracle Cloud Infrastructure documentation portal. + +

Configuring the SDK

+

The SDK services need two types of configuration: credentials and client-side HTTP options.

+ +

Configuring Credentials

+

First, you need to create set up your credentials and config file. For instructions, see SDK and Tool Configuration in the User Guide.

+ +

Next you need to set up the client to use the credentials. The credentials are abstracted through an AuthenticationDetailsProvider interface. Clients can implement this however you choose. + There are numerous classes provided that help build an implementation for this provider, but for simplicity, assuming you have configured a credentials file under the 'DEFAULT' profile in the default location, you can do:

+ +
AuthenticationDetailsProvider provider = new ConfigFileAuthenticationDetailsProvider(null);
+ +

Configuring Client-side HTTP Options

+

Create a client-side configuration through the ClientConfiguration class. If you do not provide your own configuration, the Java SDK uses a default configuration. To provide your own configuration, use the following:

+ +
ClientConfiguration clientConfig = ClientConfiguration.builder()
+    .connectionTimeoutMillis(3000)
+    .readTimeoutMillis(60000)
+    .build();
+ +

Note that a service instance cannot be used to communicate with different regions. If you need to make requests to different regions, create multiple service instances.

+ +

Instantiating Service Clients

+

Now that you have configured a credentials provider and client configuration, a service client may be instantiated: + +

ObjectStorage client = new ObjectStorageClient(provider, clientConfig);
+ +

Setting the Endpoints

+

Service endpoints can be set in one of two ways.

+ +
    +
  • Call setEndpoint() on the service instance. This lets you to specify a full host name (for example, https://www.example.com).
  • +
  • Call setRegion() on the service instance. This selects the appropriate hostname for the service for the given region.
  • +
+ +

Ex, using the previously constructed client: +

client.setRegion(Region.US_PHOENIX_1);
+ + + diff --git a/bmc-identity/pom.xml b/bmc-identity/pom.xml index c3581ebe826..5e3e8a7878c 100644 --- a/bmc-identity/pom.xml +++ b/bmc-identity/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 90602e02c39..37caad3d3ba 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 @@ -70,18 +70,18 @@ public IdentityAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public IdentityAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public IdentityAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public IdentityAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public IdentityAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public IdentityAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public IdentityAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public IdentityAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 7e0c74ddcb3..dbaa5bb8a2f 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 @@ -75,18 +75,18 @@ public IdentityClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public IdentityClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public IdentityClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public IdentityClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public IdentityClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public IdentityClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public IdentityClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public IdentityClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public IdentityClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/AddUserToGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/AddUserToGroupRequest.java index f1db590bba2..31f4ff85b30 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/AddUserToGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/AddUserToGroupRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(AddUserToGroupRequest o) { addUserToGroupDetails(o.getAddUserToGroupDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCompartmentRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCompartmentRequest.java index e8688081911..ba31a12bf4b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCompartmentRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCompartmentRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateCompartmentRequest o) { createCompartmentDetails(o.getCreateCompartmentDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCustomerSecretKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCustomerSecretKeyRequest.java index c5257f4b253..5203a703ea9 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCustomerSecretKeyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCustomerSecretKeyRequest.java @@ -54,6 +54,7 @@ public Builder copy(CreateCustomerSecretKeyRequest o) { createCustomerSecretKeyDetails(o.getCreateCustomerSecretKeyDetails()); userId(o.getUserId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateDynamicGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateDynamicGroupRequest.java index 20fca18dc88..6d02d7015e4 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateDynamicGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateDynamicGroupRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateDynamicGroupRequest o) { createDynamicGroupDetails(o.getCreateDynamicGroupDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateGroupRequest.java index 492a86a9b2d..a35783c0955 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateGroupRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateGroupRequest o) { createGroupDetails(o.getCreateGroupDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateIdentityProviderRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateIdentityProviderRequest.java index 107ee7db6bd..62ce3c3c097 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateIdentityProviderRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateIdentityProviderRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateIdentityProviderRequest o) { createIdentityProviderDetails(o.getCreateIdentityProviderDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateIdpGroupMappingRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateIdpGroupMappingRequest.java index 87a3045574d..ba5a571f834 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateIdpGroupMappingRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateIdpGroupMappingRequest.java @@ -54,6 +54,7 @@ public Builder copy(CreateIdpGroupMappingRequest o) { createIdpGroupMappingDetails(o.getCreateIdpGroupMappingDetails()); identityProviderId(o.getIdentityProviderId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateOrResetUIPasswordRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateOrResetUIPasswordRequest.java index 5b43bfb9a32..2e5ad20c4c6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateOrResetUIPasswordRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateOrResetUIPasswordRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateOrResetUIPasswordRequest o) { userId(o.getUserId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreatePolicyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreatePolicyRequest.java index 9a88f2fe5af..9584afb77f2 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreatePolicyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreatePolicyRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreatePolicyRequest o) { createPolicyDetails(o.getCreatePolicyDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateRegionSubscriptionRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateRegionSubscriptionRequest.java index 93b420dee17..b7f45abdf11 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateRegionSubscriptionRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateRegionSubscriptionRequest.java @@ -54,6 +54,7 @@ public Builder copy(CreateRegionSubscriptionRequest o) { createRegionSubscriptionDetails(o.getCreateRegionSubscriptionDetails()); tenancyId(o.getTenancyId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSmtpCredentialRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSmtpCredentialRequest.java index 3c272c1d49c..565e30053b3 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSmtpCredentialRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSmtpCredentialRequest.java @@ -54,6 +54,7 @@ public Builder copy(CreateSmtpCredentialRequest o) { createSmtpCredentialDetails(o.getCreateSmtpCredentialDetails()); userId(o.getUserId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSwiftPasswordRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSwiftPasswordRequest.java index b4636130152..8de08386263 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSwiftPasswordRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateSwiftPasswordRequest.java @@ -54,6 +54,7 @@ public Builder copy(CreateSwiftPasswordRequest o) { createSwiftPasswordDetails(o.getCreateSwiftPasswordDetails()); userId(o.getUserId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateTagNamespaceRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateTagNamespaceRequest.java index 9ec3a5214a5..eb16214496c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateTagNamespaceRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateTagNamespaceRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateTagNamespaceRequest o) { createTagNamespaceDetails(o.getCreateTagNamespaceDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateTagRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateTagRequest.java index 34d5880558e..b675cb4407b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateTagRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateTagRequest.java @@ -55,6 +55,7 @@ public Builder copy(CreateTagRequest o) { tagNamespaceId(o.getTagNamespaceId()); createTagDetails(o.getCreateTagDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateUserRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateUserRequest.java index 31c8ef10bd6..c64991f0404 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateUserRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateUserRequest.java @@ -48,6 +48,7 @@ public Builder invocationCallback( public Builder copy(CreateUserRequest o) { createUserDetails(o.getCreateUserDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteApiKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteApiKeyRequest.java index 8225953683a..55147c6d720 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteApiKeyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteApiKeyRequest.java @@ -52,6 +52,7 @@ public Builder copy(DeleteApiKeyRequest o) { userId(o.getUserId()); fingerprint(o.getFingerprint()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteCustomerSecretKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteCustomerSecretKeyRequest.java index 47e00351872..49a61d9a4d8 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteCustomerSecretKeyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteCustomerSecretKeyRequest.java @@ -52,6 +52,7 @@ public Builder copy(DeleteCustomerSecretKeyRequest o) { userId(o.getUserId()); customerSecretKeyId(o.getCustomerSecretKeyId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteDynamicGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteDynamicGroupRequest.java index 3fc85cd6726..f2bba497510 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteDynamicGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteDynamicGroupRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteDynamicGroupRequest o) { dynamicGroupId(o.getDynamicGroupId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteGroupRequest.java index 7a03eed67df..e9b96d230f0 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteGroupRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteGroupRequest o) { groupId(o.getGroupId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteIdentityProviderRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteIdentityProviderRequest.java index 80510e2cc34..4c70622ec86 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteIdentityProviderRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteIdentityProviderRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteIdentityProviderRequest o) { identityProviderId(o.getIdentityProviderId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteIdpGroupMappingRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteIdpGroupMappingRequest.java index d8537e10308..17f7fba224e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteIdpGroupMappingRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteIdpGroupMappingRequest.java @@ -52,6 +52,7 @@ public Builder copy(DeleteIdpGroupMappingRequest o) { identityProviderId(o.getIdentityProviderId()); mappingId(o.getMappingId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeletePolicyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeletePolicyRequest.java index 37951caf93e..bae44bf1311 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeletePolicyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeletePolicyRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeletePolicyRequest o) { policyId(o.getPolicyId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSmtpCredentialRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSmtpCredentialRequest.java index 99369f01801..4d1ff5e2382 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSmtpCredentialRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSmtpCredentialRequest.java @@ -52,6 +52,7 @@ public Builder copy(DeleteSmtpCredentialRequest o) { userId(o.getUserId()); smtpCredentialId(o.getSmtpCredentialId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSwiftPasswordRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSwiftPasswordRequest.java index 962cc7cdec5..d2bfa18290c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSwiftPasswordRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteSwiftPasswordRequest.java @@ -52,6 +52,7 @@ public Builder copy(DeleteSwiftPasswordRequest o) { userId(o.getUserId()); swiftPasswordId(o.getSwiftPasswordId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteUserRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteUserRequest.java index d4609ee9ec6..4aa6e3cde03 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteUserRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteUserRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(DeleteUserRequest o) { userId(o.getUserId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetCompartmentRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetCompartmentRequest.java index 2bdbb04d7fe..0e73bedd05c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetCompartmentRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetCompartmentRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetCompartmentRequest o) { compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetDynamicGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetDynamicGroupRequest.java index 2d13adc8aeb..7c777927c9c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetDynamicGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetDynamicGroupRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetDynamicGroupRequest o) { dynamicGroupId(o.getDynamicGroupId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetGroupRequest.java index 2c71121a4fd..9c98d7cb800 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetGroupRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetGroupRequest o) { groupId(o.getGroupId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetIdentityProviderRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetIdentityProviderRequest.java index 3b61189c796..e449a0ca217 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetIdentityProviderRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetIdentityProviderRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetIdentityProviderRequest o) { identityProviderId(o.getIdentityProviderId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetIdpGroupMappingRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetIdpGroupMappingRequest.java index 6bb744de3fd..5acbea899c3 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetIdpGroupMappingRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetIdpGroupMappingRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(GetIdpGroupMappingRequest o) { identityProviderId(o.getIdentityProviderId()); mappingId(o.getMappingId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetPolicyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetPolicyRequest.java index 8e52d0ce5ca..5ead48c3c5c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetPolicyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetPolicyRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetPolicyRequest o) { policyId(o.getPolicyId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTagNamespaceRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTagNamespaceRequest.java index 4055abb3f99..75413249f27 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTagNamespaceRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTagNamespaceRequest.java @@ -38,6 +38,7 @@ public Builder invocationCallback( */ public Builder copy(GetTagNamespaceRequest o) { tagNamespaceId(o.getTagNamespaceId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTagRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTagRequest.java index 58bb44e17b5..c2ed9cf1060 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTagRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTagRequest.java @@ -45,6 +45,7 @@ public Builder invocationCallback( public Builder copy(GetTagRequest o) { tagNamespaceId(o.getTagNamespaceId()); tagName(o.getTagName()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTenancyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTenancyRequest.java index 1550efcdfa8..9c62c62920f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTenancyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetTenancyRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetTenancyRequest o) { tenancyId(o.getTenancyId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserGroupMembershipRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserGroupMembershipRequest.java index d5ac727e7ea..43fe40a472f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserGroupMembershipRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserGroupMembershipRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetUserGroupMembershipRequest o) { userGroupMembershipId(o.getUserGroupMembershipId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserRequest.java index bff333ef051..ea0f4da2bab 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/GetUserRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetUserRequest o) { userId(o.getUserId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListApiKeysRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListApiKeysRequest.java index 9874843d79a..1ffd4f30372 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListApiKeysRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListApiKeysRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(ListApiKeysRequest o) { userId(o.getUserId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListAvailabilityDomainsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListAvailabilityDomainsRequest.java index 90808879d47..4e5d2a675cf 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListAvailabilityDomainsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListAvailabilityDomainsRequest.java @@ -38,6 +38,7 @@ public Builder invocationCallback( */ public Builder copy(ListAvailabilityDomainsRequest o) { compartmentId(o.getCompartmentId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCompartmentsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCompartmentsRequest.java index d2eb1bff690..b8c66c1fb4e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCompartmentsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCompartmentsRequest.java @@ -52,6 +52,7 @@ public Builder copy(ListCompartmentsRequest o) { compartmentId(o.getCompartmentId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCustomerSecretKeysRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCustomerSecretKeysRequest.java index 00956e302ce..6f372cec373 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCustomerSecretKeysRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCustomerSecretKeysRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(ListCustomerSecretKeysRequest o) { userId(o.getUserId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListDynamicGroupsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListDynamicGroupsRequest.java index ccafb7b328d..a924bd322c0 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListDynamicGroupsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListDynamicGroupsRequest.java @@ -52,6 +52,7 @@ public Builder copy(ListDynamicGroupsRequest o) { compartmentId(o.getCompartmentId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListGroupsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListGroupsRequest.java index 30de5bcf384..9cf96765e21 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListGroupsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListGroupsRequest.java @@ -52,6 +52,7 @@ public Builder copy(ListGroupsRequest o) { compartmentId(o.getCompartmentId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdentityProvidersRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdentityProvidersRequest.java index 96928ec058d..d8d858a9b22 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdentityProvidersRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdentityProvidersRequest.java @@ -58,6 +58,7 @@ public Builder copy(ListIdentityProvidersRequest o) { compartmentId(o.getCompartmentId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdpGroupMappingsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdpGroupMappingsRequest.java index 591d649e0ff..6fc434f25fd 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdpGroupMappingsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdpGroupMappingsRequest.java @@ -51,6 +51,7 @@ public Builder copy(ListIdpGroupMappingsRequest o) { identityProviderId(o.getIdentityProviderId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListPoliciesRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListPoliciesRequest.java index c68cf9c3c1e..0639f99c7e5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListPoliciesRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListPoliciesRequest.java @@ -52,6 +52,7 @@ public Builder copy(ListPoliciesRequest o) { compartmentId(o.getCompartmentId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListRegionSubscriptionsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListRegionSubscriptionsRequest.java index 1aef2bb5070..7daa6119779 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListRegionSubscriptionsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListRegionSubscriptionsRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(ListRegionSubscriptionsRequest o) { tenancyId(o.getTenancyId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListRegionsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListRegionsRequest.java index 538e47bbaf9..ffa9abaf970 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListRegionsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListRegionsRequest.java @@ -32,6 +32,7 @@ public Builder invocationCallback( */ public Builder copy(ListRegionsRequest o) { + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSmtpCredentialsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSmtpCredentialsRequest.java index 0482ef37e5a..452e98f43b6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSmtpCredentialsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSmtpCredentialsRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(ListSmtpCredentialsRequest o) { userId(o.getUserId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSwiftPasswordsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSwiftPasswordsRequest.java index 60b0b9ab350..36c5ce23a77 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSwiftPasswordsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListSwiftPasswordsRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(ListSwiftPasswordsRequest o) { userId(o.getUserId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListTagNamespacesRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListTagNamespacesRequest.java index fd95fd6f241..efdbb19d42a 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListTagNamespacesRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListTagNamespacesRequest.java @@ -60,6 +60,7 @@ public Builder copy(ListTagNamespacesRequest o) { page(o.getPage()); limit(o.getLimit()); includeSubcompartments(o.getIncludeSubcompartments()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListTagsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListTagsRequest.java index 98ee2023429..a784eb4c3df 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListTagsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListTagsRequest.java @@ -52,6 +52,7 @@ public Builder copy(ListTagsRequest o) { tagNamespaceId(o.getTagNamespaceId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUserGroupMembershipsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUserGroupMembershipsRequest.java index 6bd5750e997..9bf8be3cba4 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUserGroupMembershipsRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUserGroupMembershipsRequest.java @@ -64,6 +64,7 @@ public Builder copy(ListUserGroupMembershipsRequest o) { groupId(o.getGroupId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java index 8e9c8e152cc..9543ed8f620 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java @@ -52,6 +52,7 @@ public Builder copy(ListUsersRequest o) { compartmentId(o.getCompartmentId()); page(o.getPage()); limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/RemoveUserFromGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/RemoveUserFromGroupRequest.java index e4e99aeb8e9..5b8acad0905 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/RemoveUserFromGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/RemoveUserFromGroupRequest.java @@ -46,6 +46,7 @@ public Builder invocationCallback( public Builder copy(RemoveUserFromGroupRequest o) { userGroupMembershipId(o.getUserGroupMembershipId()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCompartmentRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCompartmentRequest.java index 7dfca6ea34e..85edf908d66 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCompartmentRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCompartmentRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateCompartmentRequest o) { compartmentId(o.getCompartmentId()); updateCompartmentDetails(o.getUpdateCompartmentDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCustomerSecretKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCustomerSecretKeyRequest.java index 58f34b5f6a5..9f81be969c5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCustomerSecretKeyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCustomerSecretKeyRequest.java @@ -58,6 +58,7 @@ public Builder copy(UpdateCustomerSecretKeyRequest o) { customerSecretKeyId(o.getCustomerSecretKeyId()); updateCustomerSecretKeyDetails(o.getUpdateCustomerSecretKeyDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateDynamicGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateDynamicGroupRequest.java index 0ce52db3d1b..249c8c68abc 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateDynamicGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateDynamicGroupRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateDynamicGroupRequest o) { dynamicGroupId(o.getDynamicGroupId()); updateDynamicGroupDetails(o.getUpdateDynamicGroupDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateGroupRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateGroupRequest.java index 22ad262f91e..9eab1fcb299 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateGroupRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateGroupRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateGroupRequest o) { groupId(o.getGroupId()); updateGroupDetails(o.getUpdateGroupDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateIdentityProviderRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateIdentityProviderRequest.java index 060e19d4710..87b3da45a4a 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateIdentityProviderRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateIdentityProviderRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateIdentityProviderRequest o) { identityProviderId(o.getIdentityProviderId()); updateIdentityProviderDetails(o.getUpdateIdentityProviderDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateIdpGroupMappingRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateIdpGroupMappingRequest.java index 28c5842a126..de5fe50e006 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateIdpGroupMappingRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateIdpGroupMappingRequest.java @@ -58,6 +58,7 @@ public Builder copy(UpdateIdpGroupMappingRequest o) { mappingId(o.getMappingId()); updateIdpGroupMappingDetails(o.getUpdateIdpGroupMappingDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdatePolicyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdatePolicyRequest.java index 1b95c92c87a..20fe9374d7e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdatePolicyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdatePolicyRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdatePolicyRequest o) { policyId(o.getPolicyId()); updatePolicyDetails(o.getUpdatePolicyDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSmtpCredentialRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSmtpCredentialRequest.java index cdfdaf61177..5340b29383f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSmtpCredentialRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSmtpCredentialRequest.java @@ -58,6 +58,7 @@ public Builder copy(UpdateSmtpCredentialRequest o) { smtpCredentialId(o.getSmtpCredentialId()); updateSmtpCredentialDetails(o.getUpdateSmtpCredentialDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSwiftPasswordRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSwiftPasswordRequest.java index 462b825f71f..c27da1db7d2 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSwiftPasswordRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateSwiftPasswordRequest.java @@ -58,6 +58,7 @@ public Builder copy(UpdateSwiftPasswordRequest o) { swiftPasswordId(o.getSwiftPasswordId()); updateSwiftPasswordDetails(o.getUpdateSwiftPasswordDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateTagNamespaceRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateTagNamespaceRequest.java index 70b861d6d90..ea42e0b6507 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateTagNamespaceRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateTagNamespaceRequest.java @@ -44,6 +44,7 @@ public Builder invocationCallback( public Builder copy(UpdateTagNamespaceRequest o) { tagNamespaceId(o.getTagNamespaceId()); updateTagNamespaceDetails(o.getUpdateTagNamespaceDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateTagRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateTagRequest.java index 4853f9fa3ee..212a56058b5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateTagRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateTagRequest.java @@ -51,6 +51,7 @@ public Builder copy(UpdateTagRequest o) { tagNamespaceId(o.getTagNamespaceId()); tagName(o.getTagName()); updateTagDetails(o.getUpdateTagDetails()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserRequest.java index 9dd1717316f..02085063834 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateUserRequest o) { userId(o.getUserId()); updateUserDetails(o.getUpdateUserDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserStateRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserStateRequest.java index 313915c8886..5a3659dc198 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserStateRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserStateRequest.java @@ -52,6 +52,7 @@ public Builder copy(UpdateUserStateRequest o) { userId(o.getUserId()); updateStateDetails(o.getUpdateStateDetails()); ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UploadApiKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UploadApiKeyRequest.java index 1397dee533d..9bdfe41923d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UploadApiKeyRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UploadApiKeyRequest.java @@ -54,6 +54,7 @@ public Builder copy(UploadApiKeyRequest o) { userId(o.getUserId()); createApiKeyDetails(o.getCreateApiKeyDetails()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/pom.xml b/bmc-loadbalancer/pom.xml index 901f38818d0..58f8b065387 100644 --- a/bmc-loadbalancer/pom.xml +++ b/bmc-loadbalancer/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 b6ce68c3c46..d154045dda9 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 @@ -70,18 +70,18 @@ public LoadBalancerAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public LoadBalancerAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public LoadBalancerAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public LoadBalancerAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public LoadBalancerAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public LoadBalancerAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public LoadBalancerAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -136,10 +171,22 @@ public LoadBalancerAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = 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 c8f9224ddc1..82333577db9 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 @@ -75,18 +75,18 @@ public LoadBalancerClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public LoadBalancerClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -98,20 +98,20 @@ public LoadBalancerClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public LoadBalancerClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -124,7 +124,7 @@ public LoadBalancerClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -132,7 +132,42 @@ public LoadBalancerClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public LoadBalancerClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -141,10 +176,22 @@ public LoadBalancerClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); // up to 50 (core) threads, time out after 60s idle, all daemon java.util.concurrent.ThreadPoolExecutor executorService = new java.util.concurrent.ThreadPoolExecutor( @@ -217,6 +264,7 @@ public LoadBalancerClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateBackendRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateBackendRequest.java index 05f031e5c0d..2865834556d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateBackendRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateBackendRequest.java @@ -71,6 +71,7 @@ public Builder copy(CreateBackendRequest o) { backendSetName(o.getBackendSetName()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateBackendSetRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateBackendSetRequest.java index 194a73367d5..bd6c8e9b41f 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateBackendSetRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateBackendSetRequest.java @@ -62,6 +62,7 @@ public Builder copy(CreateBackendSetRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateCertificateRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateCertificateRequest.java index ffaccbf9dd9..d59445b4908 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateCertificateRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateCertificateRequest.java @@ -62,6 +62,7 @@ public Builder copy(CreateCertificateRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateListenerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateListenerRequest.java index 6b56ea39108..2bea317bd4b 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateListenerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateListenerRequest.java @@ -62,6 +62,7 @@ public Builder copy(CreateListenerRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateLoadBalancerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateLoadBalancerRequest.java index 5f15b4d4e35..8e2bae3fbb8 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateLoadBalancerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreateLoadBalancerRequest.java @@ -56,6 +56,7 @@ public Builder copy(CreateLoadBalancerRequest o) { createLoadBalancerDetails(o.getCreateLoadBalancerDetails()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreatePathRouteSetRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreatePathRouteSetRequest.java index 915ce4e00db..c534c79a39d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreatePathRouteSetRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/CreatePathRouteSetRequest.java @@ -62,6 +62,7 @@ public Builder copy(CreatePathRouteSetRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteBackendRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteBackendRequest.java index 303e8158208..4517f81a884 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteBackendRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteBackendRequest.java @@ -63,6 +63,7 @@ public Builder copy(DeleteBackendRequest o) { backendSetName(o.getBackendSetName()); backendName(o.getBackendName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteBackendSetRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteBackendSetRequest.java index 017a3f7b303..6e82c015c90 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteBackendSetRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteBackendSetRequest.java @@ -54,6 +54,7 @@ public Builder copy(DeleteBackendSetRequest o) { loadBalancerId(o.getLoadBalancerId()); backendSetName(o.getBackendSetName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteCertificateRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteCertificateRequest.java index 228168641b0..266ece65317 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteCertificateRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteCertificateRequest.java @@ -54,6 +54,7 @@ public Builder copy(DeleteCertificateRequest o) { loadBalancerId(o.getLoadBalancerId()); certificateName(o.getCertificateName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteListenerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteListenerRequest.java index 0f65ffd4cc6..c113d93aef1 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteListenerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteListenerRequest.java @@ -54,6 +54,7 @@ public Builder copy(DeleteListenerRequest o) { loadBalancerId(o.getLoadBalancerId()); listenerName(o.getListenerName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteLoadBalancerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteLoadBalancerRequest.java index 2170f6fbce5..5e03d795a1e 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteLoadBalancerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeleteLoadBalancerRequest.java @@ -45,6 +45,7 @@ public Builder invocationCallback( public Builder copy(DeleteLoadBalancerRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeletePathRouteSetRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeletePathRouteSetRequest.java index d2f9ccc8d41..4c97a40900b 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeletePathRouteSetRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/DeletePathRouteSetRequest.java @@ -54,6 +54,7 @@ public Builder copy(DeletePathRouteSetRequest o) { loadBalancerId(o.getLoadBalancerId()); pathRouteSetName(o.getPathRouteSetName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendHealthRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendHealthRequest.java index 1a8ec2d29f3..b478cb27cd6 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendHealthRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendHealthRequest.java @@ -63,6 +63,7 @@ public Builder copy(GetBackendHealthRequest o) { backendSetName(o.getBackendSetName()); backendName(o.getBackendName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendRequest.java index fcb6f2997fb..fb581a6f146 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendRequest.java @@ -63,6 +63,7 @@ public Builder copy(GetBackendRequest o) { backendSetName(o.getBackendSetName()); backendName(o.getBackendName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendSetHealthRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendSetHealthRequest.java index 588596cd455..a3d16c9588a 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendSetHealthRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendSetHealthRequest.java @@ -54,6 +54,7 @@ public Builder copy(GetBackendSetHealthRequest o) { loadBalancerId(o.getLoadBalancerId()); backendSetName(o.getBackendSetName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendSetRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendSetRequest.java index bad73d2c641..b2f29bfcdc0 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendSetRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetBackendSetRequest.java @@ -54,6 +54,7 @@ public Builder copy(GetBackendSetRequest o) { loadBalancerId(o.getLoadBalancerId()); backendSetName(o.getBackendSetName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetHealthCheckerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetHealthCheckerRequest.java index 934e4b8ac91..f7215fdbb57 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetHealthCheckerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetHealthCheckerRequest.java @@ -54,6 +54,7 @@ public Builder copy(GetHealthCheckerRequest o) { loadBalancerId(o.getLoadBalancerId()); backendSetName(o.getBackendSetName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetLoadBalancerHealthRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetLoadBalancerHealthRequest.java index 5393807fcee..00725363058 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetLoadBalancerHealthRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetLoadBalancerHealthRequest.java @@ -45,6 +45,7 @@ public Builder invocationCallback( public Builder copy(GetLoadBalancerHealthRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetLoadBalancerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetLoadBalancerRequest.java index 82c8b1e4909..ee260362f4c 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetLoadBalancerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetLoadBalancerRequest.java @@ -45,6 +45,7 @@ public Builder invocationCallback( public Builder copy(GetLoadBalancerRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetPathRouteSetRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetPathRouteSetRequest.java index 4d56183bf00..b735dc902fa 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetPathRouteSetRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetPathRouteSetRequest.java @@ -54,6 +54,7 @@ public Builder copy(GetPathRouteSetRequest o) { loadBalancerId(o.getLoadBalancerId()); pathRouteSetName(o.getPathRouteSetName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetWorkRequestRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetWorkRequestRequest.java index 4e816ccea0e..b5658b59e47 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetWorkRequestRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/GetWorkRequestRequest.java @@ -45,6 +45,7 @@ public Builder invocationCallback( public Builder copy(GetWorkRequestRequest o) { workRequestId(o.getWorkRequestId()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListBackendSetsRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListBackendSetsRequest.java index 822b7c7e4e6..b0858ef68e8 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListBackendSetsRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListBackendSetsRequest.java @@ -45,6 +45,7 @@ public Builder invocationCallback( public Builder copy(ListBackendSetsRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListBackendsRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListBackendsRequest.java index 31f1624a68f..dc6fa8abbe4 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListBackendsRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListBackendsRequest.java @@ -54,6 +54,7 @@ public Builder copy(ListBackendsRequest o) { loadBalancerId(o.getLoadBalancerId()); backendSetName(o.getBackendSetName()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListCertificatesRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListCertificatesRequest.java index f5150ac3239..7692101fa91 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListCertificatesRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListCertificatesRequest.java @@ -45,6 +45,7 @@ public Builder invocationCallback( public Builder copy(ListCertificatesRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListLoadBalancerHealthsRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListLoadBalancerHealthsRequest.java index e01554b3729..3aca5caeed0 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListLoadBalancerHealthsRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListLoadBalancerHealthsRequest.java @@ -63,6 +63,7 @@ public Builder copy(ListLoadBalancerHealthsRequest o) { opcRequestId(o.getOpcRequestId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListLoadBalancersRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListLoadBalancersRequest.java index 108b0c83a20..ab94a276b48 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListLoadBalancersRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListLoadBalancersRequest.java @@ -176,6 +176,7 @@ public Builder copy(ListLoadBalancersRequest o) { sortOrder(o.getSortOrder()); displayName(o.getDisplayName()); lifecycleState(o.getLifecycleState()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListPathRouteSetsRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListPathRouteSetsRequest.java index 2ade6455b6b..9064413e574 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListPathRouteSetsRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListPathRouteSetsRequest.java @@ -47,6 +47,7 @@ public Builder invocationCallback( public Builder copy(ListPathRouteSetsRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListPoliciesRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListPoliciesRequest.java index 728ce076d6e..7cf64e0ca46 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListPoliciesRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListPoliciesRequest.java @@ -63,6 +63,7 @@ public Builder copy(ListPoliciesRequest o) { opcRequestId(o.getOpcRequestId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListProtocolsRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListProtocolsRequest.java index 52394b88401..3e80d0e7a36 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListProtocolsRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListProtocolsRequest.java @@ -63,6 +63,7 @@ public Builder copy(ListProtocolsRequest o) { opcRequestId(o.getOpcRequestId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListShapesRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListShapesRequest.java index 4538badeacc..d0ece6f5b04 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListShapesRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListShapesRequest.java @@ -63,6 +63,7 @@ public Builder copy(ListShapesRequest o) { opcRequestId(o.getOpcRequestId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListWorkRequestsRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListWorkRequestsRequest.java index 17bcc888fb5..12173288955 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListWorkRequestsRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/ListWorkRequestsRequest.java @@ -63,6 +63,7 @@ public Builder copy(ListWorkRequestsRequest o) { opcRequestId(o.getOpcRequestId()); limit(o.getLimit()); page(o.getPage()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateBackendRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateBackendRequest.java index 3b8cf14237b..02cfc8c32b8 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateBackendRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateBackendRequest.java @@ -80,6 +80,7 @@ public Builder copy(UpdateBackendRequest o) { backendName(o.getBackendName()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateBackendSetRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateBackendSetRequest.java index b39cb51bc88..2fe79869870 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateBackendSetRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateBackendSetRequest.java @@ -71,6 +71,7 @@ public Builder copy(UpdateBackendSetRequest o) { backendSetName(o.getBackendSetName()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateHealthCheckerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateHealthCheckerRequest.java index 3ab53504b3c..5ac7279ce18 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateHealthCheckerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateHealthCheckerRequest.java @@ -71,6 +71,7 @@ public Builder copy(UpdateHealthCheckerRequest o) { backendSetName(o.getBackendSetName()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateListenerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateListenerRequest.java index 0725dadb6db..755adf0e877 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateListenerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateListenerRequest.java @@ -71,6 +71,7 @@ public Builder copy(UpdateListenerRequest o) { listenerName(o.getListenerName()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateLoadBalancerRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateLoadBalancerRequest.java index dd3f6503167..2f4726d56a9 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateLoadBalancerRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdateLoadBalancerRequest.java @@ -62,6 +62,7 @@ public Builder copy(UpdateLoadBalancerRequest o) { loadBalancerId(o.getLoadBalancerId()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdatePathRouteSetRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdatePathRouteSetRequest.java index 04b790358e0..40a89e63561 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdatePathRouteSetRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/requests/UpdatePathRouteSetRequest.java @@ -71,6 +71,7 @@ public Builder copy(UpdatePathRouteSetRequest o) { pathRouteSetName(o.getPathRouteSetName()); opcRequestId(o.getOpcRequestId()); opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-combined/pom.xml b/bmc-objectstorage/bmc-objectstorage-combined/pom.xml deleted file mode 100644 index b63640ae5ea..00000000000 --- a/bmc-objectstorage/bmc-objectstorage-combined/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - 4.0.0 - - - com.oracle.oci.sdk - oci-java-sdk-objectstorage-parent - 1.2.34 - ../pom.xml - - - - oci-java-sdk-objectstorage - pom - Oracle Cloud Infrastructure SDK - Object Storage - This project contains the SDK used for Oracle Cloud Infrastructure Object Storage Service - https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.6 - - - package-all - package - - single - - - - false - - src/main/assembly/all-jar.xml - - - - - - - - - - - com.oracle.oci.sdk - oci-java-sdk-objectstorage-generated - 1.2.34 - jar - compile - - - com.oracle.oci.sdk - oci-java-sdk-objectstorage-extensions - 1.2.34 - jar - compile - - - - diff --git a/bmc-objectstorage/bmc-objectstorage-combined/src/main/assembly/all-jar.xml b/bmc-objectstorage/bmc-objectstorage-combined/src/main/assembly/all-jar.xml deleted file mode 100644 index 3bc062fbc82..00000000000 --- a/bmc-objectstorage/bmc-objectstorage-combined/src/main/assembly/all-jar.xml +++ /dev/null @@ -1,22 +0,0 @@ - - all-jar - - jar - - - false - - - - true - false - - com.oracle.oci.sdk:oci-java-sdk-objectstorage-generated:jar:* - com.oracle.oci.sdk:oci-java-sdk-objectstorage-extensions:jar:* - - - - \ No newline at end of file diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml b/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml index e943f84853f..67819d4359d 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml +++ b/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml @@ -4,9 +4,9 @@ com.oracle.oci.sdk - oci-java-sdk-objectstorage-parent - 1.2.34 - ../pom.xml + oci-java-sdk + 1.2.35 + ../../pom.xml oci-java-sdk-objectstorage-extensions @@ -18,12 +18,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 com.oracle.oci.sdk oci-java-sdk-objectstorage-generated - 1.2.34 + 1.2.35 diff --git a/bmc-objectstorage/bmc-objectstorage-generated/pom.xml b/bmc-objectstorage/bmc-objectstorage-generated/pom.xml index 1ca2a82dc7c..3f894ef3824 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/pom.xml +++ b/bmc-objectstorage/bmc-objectstorage-generated/pom.xml @@ -4,9 +4,9 @@ com.oracle.oci.sdk - oci-java-sdk-objectstorage-parent - 1.2.34 - ../pom.xml + oci-java-sdk + 1.2.35 + ../../pom.xml oci-java-sdk-objectstorage-generated @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 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 912ee8f8aa3..8a462230675 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 @@ -59,7 +59,7 @@ public ObjectStorageAsyncClient( configuration, clientConfigurator, new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory( - com.oracle.bmc.http.signing.SigningStrategy.OBJECT_STORAGE)); + com.oracle.bmc.http.signing.SigningStrategy.STANDARD)); } /** @@ -70,18 +70,18 @@ public ObjectStorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public ObjectStorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -93,20 +93,20 @@ public ObjectStorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public ObjectStorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -119,7 +119,7 @@ public ObjectStorageAsyncClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -127,7 +127,42 @@ public ObjectStorageAsyncClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public ObjectStorageAsyncClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -138,10 +173,22 @@ public ObjectStorageAsyncClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); if (this.authenticationDetailsProvider instanceof com.oracle.bmc.auth.RegionProvider) { com.oracle.bmc.auth.RegionProvider provider = @@ -180,7 +227,7 @@ 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); + com.oracle.bmc.http.signing.SigningStrategy.STANDARD); } /** @@ -1726,6 +1773,10 @@ public java.util.concurrent.Future putObject( final com.google.common.base.Function transformer = PutObjectConverter.fromResponse(); + ib.property( + com.oracle.bmc.http.internal.AuthnClientFilter.SIGNING_STRATEGY_PROPERTY_NAME, + com.oracle.bmc.http.signing.SigningStrategy.EXCLUDE_BODY); + com.oracle.bmc.responses.AsyncHandler handlerToUse = handler; if (handler != null @@ -2149,6 +2200,10 @@ public java.util.concurrent.Future uploadPart( final com.google.common.base.Function transformer = UploadPartConverter.fromResponse(); + ib.property( + com.oracle.bmc.http.internal.AuthnClientFilter.SIGNING_STRATEGY_PROPERTY_NAME, + com.oracle.bmc.http.signing.SigningStrategy.EXCLUDE_BODY); + com.oracle.bmc.responses.AsyncHandler handlerToUse = handler; if (handler != null 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 b292f124b7c..2568e706bce 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 @@ -63,7 +63,7 @@ public ObjectStorageClient( configuration, clientConfigurator, new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory( - com.oracle.bmc.http.signing.SigningStrategy.OBJECT_STORAGE)); + com.oracle.bmc.http.signing.SigningStrategy.STANDARD)); } /** @@ -74,18 +74,18 @@ public ObjectStorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. */ public ObjectStorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, new java.util.ArrayList()); } @@ -97,20 +97,20 @@ public ObjectStorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. */ public ObjectStorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, java.util.List additionalClientConfigurators) { this( authenticationDetailsProvider, configuration, clientConfigurator, - requestSignerFactory, + defaultRequestSignerFactory, additionalClientConfigurators, null); } @@ -123,7 +123,7 @@ public ObjectStorageClient( * @param authenticationDetailsProvider The authentication details provider, required. * @param configuration The client configuration, optional. * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. - * @param requestSignerFactory The request signer factory used to create the request signer for this service. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) */ @@ -131,7 +131,42 @@ public ObjectStorageClient( com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, com.oracle.bmc.ClientConfiguration configuration, com.oracle.bmc.http.ClientConfigurator clientConfigurator, - com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.List additionalClientConfigurators, + String endpoint) { + this( + authenticationDetailsProvider, + configuration, + clientConfigurator, + defaultRequestSignerFactory, + com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory + .createDefaultRequestSignerFactories(), + additionalClientConfigurators, + endpoint); + } + + /** + * Creates a new service instance using the given authentication provider and client configuration. Additionally, + * a Consumer can be provided that will be invoked whenever a REST Client is created to allow for additional configuration/customization. + *

+ * This is an advanced constructor for clients that want to take control over how requests are signed. + * @param authenticationDetailsProvider The authentication details provider, required. + * @param configuration The client configuration, optional. + * @param clientConfigurator ClientConfigurator that will be invoked for additional configuration of a REST client, optional. + * @param defaultRequestSignerFactory The request signer factory used to create the request signer for this service. + * @param signingStrategyRequestSignerFactories The request signer factories for each signing strategy used to create the request signer + * @param additionalClientConfigurators Additional client configurators to be run after the primary configurator. + * @param endpoint Endpoint, or null to leave unset (note, may be overridden by {@code authenticationDetailsProvider}) + */ + public ObjectStorageClient( + com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider authenticationDetailsProvider, + com.oracle.bmc.ClientConfiguration configuration, + com.oracle.bmc.http.ClientConfigurator clientConfigurator, + com.oracle.bmc.http.signing.RequestSignerFactory defaultRequestSignerFactory, + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSignerFactory> + signingStrategyRequestSignerFactories, java.util.List additionalClientConfigurators, String endpoint) { this.authenticationDetailsProvider = authenticationDetailsProvider; @@ -142,10 +177,22 @@ public ObjectStorageClient( .clientConfigurator(clientConfigurator) .additionalClientConfigurators(additionalClientConfigurators) .build(); - com.oracle.bmc.http.signing.RequestSigner requestSigner = - requestSignerFactory.createRequestSigner( + com.oracle.bmc.http.signing.RequestSigner defaultRequestSigner = + defaultRequestSignerFactory.createRequestSigner( SERVICE, this.authenticationDetailsProvider); - this.client = restClientFactory.create(requestSigner, configuration); + java.util.Map< + com.oracle.bmc.http.signing.SigningStrategy, + com.oracle.bmc.http.signing.RequestSigner> + requestSigners = new java.util.HashMap<>(); + for (com.oracle.bmc.http.signing.SigningStrategy s : + com.oracle.bmc.http.signing.SigningStrategy.values()) { + requestSigners.put( + s, + signingStrategyRequestSignerFactories + .get(s) + .createRequestSigner(SERVICE, authenticationDetailsProvider)); + } + this.client = restClientFactory.create(defaultRequestSigner, requestSigners, configuration); this.paginators = new ObjectStoragePaginators(this); @@ -186,7 +233,7 @@ 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); + com.oracle.bmc.http.signing.SigningStrategy.STANDARD); } /** @@ -203,6 +250,7 @@ public ObjectStorageClient build( configuration, clientConfigurator, requestSignerFactory, + signingStrategyRequestSignerFactories, additionalClientConfigurators, endpoint); } @@ -767,6 +815,10 @@ public PutObjectResponse putObject(PutObjectRequest request) { com.google.common.base.Function transformer = PutObjectConverter.fromResponse(); + ib.property( + com.oracle.bmc.http.internal.AuthnClientFilter.SIGNING_STRATEGY_PROPERTY_NAME, + com.oracle.bmc.http.signing.SigningStrategy.EXCLUDE_BODY); + int attempts = 0; while (true) { try { @@ -898,6 +950,10 @@ public UploadPartResponse uploadPart(UploadPartRequest request) { com.google.common.base.Function transformer = UploadPartConverter.fromResponse(); + ib.property( + com.oracle.bmc.http.internal.AuthnClientFilter.SIGNING_STRATEGY_PROPERTY_NAME, + com.oracle.bmc.http.signing.SigningStrategy.EXCLUDE_BODY); + int attempts = 0; while (true) { try { diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/AbortMultipartUploadRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/AbortMultipartUploadRequest.java index 3f1963eb1cc..c0e34826bf5 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/AbortMultipartUploadRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/AbortMultipartUploadRequest.java @@ -65,6 +65,7 @@ public Builder copy(AbortMultipartUploadRequest o) { objectName(o.getObjectName()); uploadId(o.getUploadId()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CommitMultipartUploadRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CommitMultipartUploadRequest.java index 12ea0a73361..2db34fc7652 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CommitMultipartUploadRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CommitMultipartUploadRequest.java @@ -87,6 +87,7 @@ public Builder copy(CommitMultipartUploadRequest o) { ifMatch(o.getIfMatch()); ifNoneMatch(o.getIfNoneMatch()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreateBucketRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreateBucketRequest.java index bd5486b84d5..426e19b1a56 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreateBucketRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreateBucketRequest.java @@ -49,6 +49,7 @@ public Builder copy(CreateBucketRequest o) { namespaceName(o.getNamespaceName()); createBucketDetails(o.getCreateBucketDetails()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreateMultipartUploadRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreateMultipartUploadRequest.java index c5a1de0a2c9..b42ee94193b 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreateMultipartUploadRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreateMultipartUploadRequest.java @@ -73,6 +73,7 @@ public Builder copy(CreateMultipartUploadRequest o) { ifMatch(o.getIfMatch()); ifNoneMatch(o.getIfNoneMatch()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreatePreauthenticatedRequestRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreatePreauthenticatedRequestRequest.java index c44bde70a5a..5c6cf1decbf 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreatePreauthenticatedRequestRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/CreatePreauthenticatedRequestRequest.java @@ -57,6 +57,7 @@ public Builder copy(CreatePreauthenticatedRequestRequest o) { bucketName(o.getBucketName()); createPreauthenticatedRequestDetails(o.getCreatePreauthenticatedRequestDetails()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteBucketRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteBucketRequest.java index f158bdfd9fb..7182045d3a5 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteBucketRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteBucketRequest.java @@ -59,6 +59,7 @@ public Builder copy(DeleteBucketRequest o) { bucketName(o.getBucketName()); ifMatch(o.getIfMatch()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteObjectRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteObjectRequest.java index dc7c7930627..e58fa848b28 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteObjectRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeleteObjectRequest.java @@ -67,6 +67,7 @@ public Builder copy(DeleteObjectRequest o) { objectName(o.getObjectName()); ifMatch(o.getIfMatch()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeletePreauthenticatedRequestRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeletePreauthenticatedRequestRequest.java index 52d1be59cbc..b26cd5ea21e 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeletePreauthenticatedRequestRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/DeletePreauthenticatedRequestRequest.java @@ -59,6 +59,7 @@ public Builder copy(DeletePreauthenticatedRequestRequest o) { bucketName(o.getBucketName()); parId(o.getParId()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetBucketRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetBucketRequest.java index 5a70a5861db..10a94b75b23 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetBucketRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetBucketRequest.java @@ -67,6 +67,7 @@ public Builder copy(GetBucketRequest o) { ifMatch(o.getIfMatch()); ifNoneMatch(o.getIfNoneMatch()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceMetadataRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceMetadataRequest.java index 23ef8e3de23..c2e9f496246 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceMetadataRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceMetadataRequest.java @@ -43,6 +43,7 @@ public Builder invocationCallback( public Builder copy(GetNamespaceMetadataRequest o) { namespaceName(o.getNamespaceName()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceRequest.java index a1b531ea921..f468bfbf6c9 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetNamespaceRequest.java @@ -37,6 +37,7 @@ public Builder invocationCallback( */ public Builder copy(GetNamespaceRequest o) { opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetObjectRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetObjectRequest.java index 078d506a144..2edf0e697ce 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetObjectRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetObjectRequest.java @@ -83,6 +83,7 @@ public Builder copy(GetObjectRequest o) { ifNoneMatch(o.getIfNoneMatch()); opcClientRequestId(o.getOpcClientRequestId()); range(o.getRange()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetPreauthenticatedRequestRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetPreauthenticatedRequestRequest.java index 6a0252a1a3a..328aed888fe 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetPreauthenticatedRequestRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/GetPreauthenticatedRequestRequest.java @@ -59,6 +59,7 @@ public Builder copy(GetPreauthenticatedRequestRequest o) { bucketName(o.getBucketName()); parId(o.getParId()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/HeadBucketRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/HeadBucketRequest.java index 81acae7e065..2ecc2304191 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/HeadBucketRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/HeadBucketRequest.java @@ -67,6 +67,7 @@ public Builder copy(HeadBucketRequest o) { ifMatch(o.getIfMatch()); ifNoneMatch(o.getIfNoneMatch()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/HeadObjectRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/HeadObjectRequest.java index ffce829753a..9f4f62ec904 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/HeadObjectRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/HeadObjectRequest.java @@ -75,6 +75,7 @@ public Builder copy(HeadObjectRequest o) { ifMatch(o.getIfMatch()); ifNoneMatch(o.getIfNoneMatch()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListBucketsRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListBucketsRequest.java index 0cfa7a1ef08..a09cd1b5f91 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListBucketsRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListBucketsRequest.java @@ -108,6 +108,7 @@ public Builder copy(ListBucketsRequest o) { page(o.getPage()); fields(o.getFields()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListMultipartUploadPartsRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListMultipartUploadPartsRequest.java index 9aeb676ef4f..42728a2131f 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListMultipartUploadPartsRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListMultipartUploadPartsRequest.java @@ -77,6 +77,7 @@ public Builder copy(ListMultipartUploadPartsRequest o) { limit(o.getLimit()); page(o.getPage()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListMultipartUploadsRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListMultipartUploadsRequest.java index e4d8c3aee96..dba2ef1a0d9 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListMultipartUploadsRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListMultipartUploadsRequest.java @@ -63,6 +63,7 @@ public Builder copy(ListMultipartUploadsRequest o) { limit(o.getLimit()); page(o.getPage()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListObjectsRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListObjectsRequest.java index 8034ff7f956..8dd420c2530 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListObjectsRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListObjectsRequest.java @@ -96,6 +96,7 @@ public Builder copy(ListObjectsRequest o) { delimiter(o.getDelimiter()); fields(o.getFields()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListPreauthenticatedRequestsRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListPreauthenticatedRequestsRequest.java index 1c835b12a1a..6750ba7e98f 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListPreauthenticatedRequestsRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/ListPreauthenticatedRequestsRequest.java @@ -69,6 +69,7 @@ public Builder copy(ListPreauthenticatedRequestsRequest o) { limit(o.getLimit()); page(o.getPage()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/PutObjectRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/PutObjectRequest.java index 96deecddda4..d25aaf5e355 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/PutObjectRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/PutObjectRequest.java @@ -123,6 +123,7 @@ public Builder copy(PutObjectRequest o) { contentLanguage(o.getContentLanguage()); contentEncoding(o.getContentEncoding()); opcMeta(o.getOpcMeta()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/RenameObjectRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/RenameObjectRequest.java index b32899e06d4..f52b131bec4 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/RenameObjectRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/RenameObjectRequest.java @@ -57,6 +57,7 @@ public Builder copy(RenameObjectRequest o) { bucketName(o.getBucketName()); renameObjectDetails(o.getRenameObjectDetails()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/RestoreObjectsRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/RestoreObjectsRequest.java index 244d9c7681e..ff469396ff9 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/RestoreObjectsRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/RestoreObjectsRequest.java @@ -57,6 +57,7 @@ public Builder copy(RestoreObjectsRequest o) { bucketName(o.getBucketName()); restoreObjectsDetails(o.getRestoreObjectsDetails()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateBucketRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateBucketRequest.java index fefbf42e265..74b7d1dee3e 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateBucketRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateBucketRequest.java @@ -65,6 +65,7 @@ public Builder copy(UpdateBucketRequest o) { updateBucketDetails(o.getUpdateBucketDetails()); ifMatch(o.getIfMatch()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateNamespaceMetadataRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateNamespaceMetadataRequest.java index ae617d6031b..65823daf1c8 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateNamespaceMetadataRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UpdateNamespaceMetadataRequest.java @@ -49,6 +49,7 @@ public Builder copy(UpdateNamespaceMetadataRequest o) { namespaceName(o.getNamespaceName()); updateNamespaceMetadataDetails(o.getUpdateNamespaceMetadataDetails()); opcClientRequestId(o.getOpcClientRequestId()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UploadPartRequest.java b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UploadPartRequest.java index db396b33af4..dbcc5d31465 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UploadPartRequest.java +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/java/com/oracle/bmc/objectstorage/requests/UploadPartRequest.java @@ -111,6 +111,7 @@ public Builder copy(UploadPartRequest o) { ifNoneMatch(o.getIfNoneMatch()); expect(o.getExpect()); contentMD5(o.getContentMD5()); + invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-objectstorage/pom.xml b/bmc-objectstorage/pom.xml index ad9bed5cfcf..35f87693ac6 100644 --- a/bmc-objectstorage/pom.xml +++ b/bmc-objectstorage/pom.xml @@ -5,13 +5,13 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 ../pom.xml - oci-java-sdk-objectstorage-parent + oci-java-sdk-objectstorage pom - Oracle Cloud Infrastructure SDK - Object Storage Parent + Oracle Cloud Infrastructure SDK - Object Storage This project contains add-on modules for Oracle Cloud Infrastructure https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm @@ -19,16 +19,18 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.34 + 1.2.35 + + + com.oracle.oci.sdk + oci-java-sdk-objectstorage-generated + 1.2.35 + + + com.oracle.oci.sdk + oci-java-sdk-objectstorage-extensions + 1.2.35 - - bmc-objectstorage-generated - bmc-objectstorage-extensions - - - bmc-objectstorage-combined - - diff --git a/pom.xml b/pom.xml index 47ece5e9c50..00872969d03 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oracle.oci.sdk oci-java-sdk - 1.2.34 + 1.2.35 pom Oracle Cloud Infrastructure SDK This project contains the SDK used for Oracle Cloud Infrastructure @@ -23,7 +23,7 @@ UTF-8 - 2.9.3 + 2.9.5 2.24.1 19.0 4.11 @@ -488,6 +488,9 @@ bmc-filestorage bmc-identity bmc-loadbalancer + bmc-objectstorage/bmc-objectstorage-generated + bmc-objectstorage/bmc-objectstorage-extensions bmc-objectstorage + bmc-full