diff --git a/.gitignore b/.gitignore index 33d40e65726..eb2ee38319d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,176 @@ -# git -**/.gitignore -**/*.orig +#================== +# Eclipse +#================== +# Pilfered shamelessly from: https://raw.githubusercontent.com/github/gitignore/master/Global/Eclipse.gitignore +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders -# intellij -.idea/ +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +#================== +# Eclipse Patch +#================== +# Eclipse Core +.project + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +#================== +# JetBrains +#================== +# Original source: https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# => updated to ignore .idea directory entirely +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Ruby plugin and RubyMine +/.rakeTasks + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +#================== +# Intellij Patch +#================== +# Reference: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# Ignoring .idea and *.iml files (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839) *.iml +.idea + +#================== +# Java +#================== +# Pilfered shamelessly from: https://github.com/github/gitignore/blob/master/Java.gitignore +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +#================== +# Maven +#================== +# Pilfered shamelessly from: https://github.com/github/gitignore/blob/master/Maven.gitignore +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties + +# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored) +!/.mvn/wrapper/maven-wrapper.jar + +#================== +# MacOS +#================== +# Pilfered shamelessly from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon -# maven -**/target/* -**/*.versionsBackup +# Thumbnails +._* -# eclipse -**/.settings/* -**/.classpath -**/.project +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent -# mac -**/.DS_Store +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/CHANGELOG.md b/CHANGELOG.md index 86ead8cf908..77d6cc5a048 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Fixed - N/A +## 1.2.18 - 2017-11-27 + ### Changed -- N/A +- Passphrases are now passed as char[] instead of as String +- Requests are now buffered in memory by default, except by the ObjectStorageClient and ObjectStorageAsyncClient. This allows for better error messages on PUT and POST requests. If you do not want to buffer requests in memory, pass an instance of `com.oracle.bmc.http.DefaultConfigurator.NonBuffering` to the constructor of the client. ### Added -- N/A +- Support for VCN to VCN peering within region +- Support option for second NIC on X7 bare metal instances +- Support for user-managed boot volumes +- Support for creating database from backup in Database service +- Support for sort and filter in ListLoadBalancers method in Load Balancer Service + +### Deprecated +- Methods accepting passphrases as String are deprecated; use char[] instead ## 1.2.17 - 2017-11-02 diff --git a/README.md b/README.md index 70a57810085..206916bf029 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Oracle Cloud Infrastructure Java SDK -[![Build Status](https://travis-ci.org/oracle/bmcs-java-sdk.svg?branch=master)](https://travis-ci.org/oracle/bmcs-java-sdk) +[![Build Status](https://travis-ci.org/oracle/oci-java-sdk.svg?branch=master)](https://travis-ci.org/oracle/oci-java-sdk) ## About diff --git a/bmc-audit/pom.xml b/bmc-audit/pom.xml index f2d0d0e1726..c020a1eeac0 100644 --- a/bmc-audit/pom.xml +++ b/bmc-audit/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.17 + 1.2.18 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 e153016ca60..08a0d35c3e4 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.audit; +import java.util.Locale; import com.oracle.bmc.audit.internal.http.*; import com.oracle.bmc.audit.requests.*; import com.oracle.bmc.audit.responses.*; @@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); 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 e835896da93..a4785891d6f 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.audit; +import java.util.Locale; import com.oracle.bmc.audit.internal.http.*; import com.oracle.bmc.audit.requests.*; import com.oracle.bmc.audit.responses.*; @@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java index 918d98ca034..1baeee7a624 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/model/AuditEvent.java @@ -206,24 +206,28 @@ public AuditEvent build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AuditEvent o) { - return tenantId(o.getTenantId()) - .compartmentId(o.getCompartmentId()) - .eventId(o.getEventId()) - .eventSource(o.getEventSource()) - .eventType(o.getEventType()) - .eventTime(o.getEventTime()) - .principalId(o.getPrincipalId()) - .credentialId(o.getCredentialId()) - .requestAction(o.getRequestAction()) - .requestId(o.getRequestId()) - .requestAgent(o.getRequestAgent()) - .requestHeaders(o.getRequestHeaders()) - .requestOrigin(o.getRequestOrigin()) - .requestParameters(o.getRequestParameters()) - .requestResource(o.getRequestResource()) - .responseHeaders(o.getResponseHeaders()) - .responseStatus(o.getResponseStatus()) - .responseTime(o.getResponseTime()); + Builder copiedBuilder = + tenantId(o.getTenantId()) + .compartmentId(o.getCompartmentId()) + .eventId(o.getEventId()) + .eventSource(o.getEventSource()) + .eventType(o.getEventType()) + .eventTime(o.getEventTime()) + .principalId(o.getPrincipalId()) + .credentialId(o.getCredentialId()) + .requestAction(o.getRequestAction()) + .requestId(o.getRequestId()) + .requestAgent(o.getRequestAgent()) + .requestHeaders(o.getRequestHeaders()) + .requestOrigin(o.getRequestOrigin()) + .requestParameters(o.getRequestParameters()) + .requestResource(o.getRequestResource()) + .responseHeaders(o.getResponseHeaders()) + .responseStatus(o.getResponseStatus()) + .responseTime(o.getResponseTime()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/model/Configuration.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/model/Configuration.java index a1afc08ffde..b21b422c4bd 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/model/Configuration.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/model/Configuration.java @@ -31,7 +31,10 @@ public Configuration build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Configuration o) { - return retentionPeriodDays(o.getRetentionPeriodDays()); + Builder copiedBuilder = retentionPeriodDays(o.getRetentionPeriodDays()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-audit/src/main/java/com/oracle/bmc/audit/model/UpdateConfigurationDetails.java b/bmc-audit/src/main/java/com/oracle/bmc/audit/model/UpdateConfigurationDetails.java index bf6f872fd51..598eaed1551 100644 --- a/bmc-audit/src/main/java/com/oracle/bmc/audit/model/UpdateConfigurationDetails.java +++ b/bmc-audit/src/main/java/com/oracle/bmc/audit/model/UpdateConfigurationDetails.java @@ -34,7 +34,10 @@ public UpdateConfigurationDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateConfigurationDetails o) { - return retentionPeriodDays(o.getRetentionPeriodDays()); + Builder copiedBuilder = retentionPeriodDays(o.getRetentionPeriodDays()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-bom/pom.xml b/bmc-bom/pom.xml index 0dc56e6486c..0d203456b1d 100644 --- a/bmc-bom/pom.xml +++ b/bmc-bom/pom.xml @@ -7,7 +7,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml @@ -24,7 +24,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.17 + 1.2.18 false @@ -33,37 +33,37 @@ com.oracle.oci.sdk oci-java-sdk-audit - 1.2.17 + 1.2.18 false com.oracle.oci.sdk oci-java-sdk-core - 1.2.17 + 1.2.18 false com.oracle.oci.sdk oci-java-sdk-database - 1.2.17 + 1.2.18 false com.oracle.oci.sdk oci-java-sdk-identity - 1.2.17 + 1.2.18 false com.oracle.oci.sdk oci-java-sdk-loadbalancer - 1.2.17 + 1.2.18 false com.oracle.oci.sdk oci-java-sdk-objectstorage - 1.2.17 + 1.2.18 false diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml index c9173e21910..4c53745bda0 100644 --- a/bmc-common/pom.xml +++ b/bmc-common/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml diff --git a/bmc-common/src/main/java/com/oracle/bmc/Region.java b/bmc-common/src/main/java/com/oracle/bmc/Region.java index 5151aad25f3..da9255217b0 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/Region.java +++ b/bmc-common/src/main/java/com/oracle/bmc/Region.java @@ -32,10 +32,11 @@ public enum Region { private static final String DEFAULT_ENDPOINT_FORMAT; static { - InputStream propertyStream = - Region.class.getClassLoader().getResourceAsStream("com/oracle/bmc/sdk.properties"); Properties properties = new Properties(); - try { + try (InputStream propertyStream = + Region.class + .getClassLoader() + .getResourceAsStream("com/oracle/bmc/sdk.properties")) { properties.load(propertyStream); } catch (Exception e) { throw new IllegalStateException("Failed to load required properties file", e); diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java index 9eb017fb024..3d64a07aa4c 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java @@ -32,6 +32,16 @@ public interface BasicAuthenticationDetailsProvider extends AbstractAuthenticati * Returns the optional pass phrase for the (encrypted) private key. * * @return The pass phrase, or null if not applicable + * + * @deprecated Use getPassphraseCharacters instead */ + @Deprecated String getPassPhrase(); + + /** + * Returns the optional pass phrase for the (encrypted) private key, as a character array. + * + * @return The pass phrase as character array, or null if not applicable + */ + char[] getPassphraseCharacters(); } diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java index 642aa835957..8df0b3e2ffd 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java @@ -72,14 +72,16 @@ public ConfigFileAuthenticationDetailsProvider(ConfigFile configFile) { Supplier privateKeySupplier = new SimplePrivateKeySupplier(pemFilePath); - this.delegate = + SimpleAuthenticationDetailsProvider.SimpleAuthenticationDetailsProviderBuilder builder = SimpleAuthenticationDetailsProvider.builder() .fingerprint(fingerprint) - .passPhrase(passPhrase) .privateKeySupplier(privateKeySupplier) .tenantId(tenantId) - .userId(userId) - .build(); + .userId(userId); + if (passPhrase != null) { + builder = builder.passphraseCharacters(passPhrase.toCharArray()); + } + this.delegate = builder.build(); } @Override @@ -97,11 +99,17 @@ public String getUserId() { return this.delegate.getUserId(); } + @Deprecated @Override public String getPassPhrase() { return this.delegate.getPassPhrase(); } + @Override + public char[] getPassphraseCharacters() { + return this.delegate.getPassphraseCharacters(); + } + @Override public InputStream getPrivateKey() { return this.delegate.getPrivateKey(); diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/SimpleAuthenticationDetailsProvider.java index 7cf03ced51d..de8eed02da9 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 @@ -4,6 +4,7 @@ package com.oracle.bmc.auth; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import com.google.common.base.Supplier; @@ -27,7 +28,7 @@ public class SimpleAuthenticationDetailsProvider extends CustomerAuthenticationD private final String fingerprint; @Getter(onMethod = @__({@Override})) - private final String passPhrase; + private final char[] passphraseCharacters; private final Supplier privateKeySupplier; @@ -36,29 +37,41 @@ public InputStream getPrivateKey() { return privateKeySupplier.get(); } + @Deprecated + @Override + public String getPassPhrase() { + return passphraseCharacters != null ? new String(passphraseCharacters) : null; + } + @Override public String toString() { // show that there was a passphrase, but not what it was return String.format( - "SimpleAuthenticationDetailsProvider(tenantId=%s, userId=%s, fingerprint=%s, passPhrase=%s, privateKeySupplier=%s)", + "SimpleAuthenticationDetailsProvider(tenantId=%s, userId=%s, fingerprint=%s, passphraseCharacters=%s, privateKeySupplier=%s)", tenantId, userId, fingerprint, - passPhrase != null ? "" : passPhrase, + passphraseCharacters != null ? "" : passphraseCharacters, privateKeySupplier); } public static class SimpleAuthenticationDetailsProviderBuilder { + + // want to provide both passPhrase(String) and passphraseCharacters(char[]) + public SimpleAuthenticationDetailsProviderBuilder passPhrase(String passPhrase) { + return passphraseCharacters(passPhrase != null ? passPhrase.toCharArray() : null); + } + // toString overridden as the default lombok builder prints all builder properties // including the passphrase. manually overriding to just show that there was a passphrase @Override public String toString() { return String.format( - "SimpleAuthenticationDetailsProvider.SimpleAuthenticationDetailsProviderBuilder(tenantId=%s, userId=%s, fingerprint=%s, passPhrase=%s, privateKeySupplier=%s)", + "SimpleAuthenticationDetailsProvider.SimpleAuthenticationDetailsProviderBuilder(tenantId=%s, userId=%s, fingerprint=%s, passphraseCharacters=%s, privateKeySupplier=%s)", tenantId, userId, fingerprint, - passPhrase != null ? "" : passPhrase, + passphraseCharacters != null ? "" : passphraseCharacters, privateKeySupplier); } } diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java b/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java index ae8a6d40181..42ff6a4140a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java @@ -16,6 +16,7 @@ import com.oracle.bmc.util.JavaRuntimeUtils.JreVersion; import lombok.extern.slf4j.Slf4j; +import org.glassfish.jersey.client.RequestEntityProcessing; /** * DefaultConfigurator handles basic configuration of clients under different @@ -100,20 +101,50 @@ protected void setConnectorProvider(ClientBuilder builder) { LOG.info("Setting connector provider to HttpUrlConnectorProvider"); ClientConfig clientConfig = new ClientConfig(); - // 1) use fixed length streaming when possible to allow large uploads without - // buffering. - // 2) enable workaround for 'patch' requests - HttpUrlConnectorProvider provider = - new HttpUrlConnectorProvider().useFixedLengthStreaming().useSetMethodWorkaround(); + // 1) enable workaround for 'patch' requests + HttpUrlConnectorProvider provider = new HttpUrlConnectorProvider().useSetMethodWorkaround(); clientConfig.connectorProvider(provider); + builder.withConfig(clientConfig); } @Override public void customizeClient(Client client) { - // do not use buffered processing, which will allow large uploads to be - // directly written to output streams. - client.property(ClientProperties.REQUEST_ENTITY_PROCESSING, null); + // Use buffered processing to get better error messages on POST and PUT + // but the downside is that this will buffer large uploads in memory. + // Operations that should not use buffering should set null instead + client.property( + ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.BUFFERED); + } + + /** + * A {@link ClientConfigurator} for a client that does not buffer requests in memory. + * + * Note: for PUT and POST requests, this will result in less accurate error messages + */ + public static class NonBuffering extends DefaultConfigurator { + @Override + public void customizeClient(Client client) { + super.customizeClient(client); + client.property(ClientProperties.REQUEST_ENTITY_PROCESSING, null); + } + + @Override + protected void setConnectorProvider(ClientBuilder builder) { + LOG.info("Setting non-buffering connector provider to HttpUrlConnectorProvider"); + + ClientConfig clientConfig = new ClientConfig(); + // 1) use fixed length streaming when possible to allow large uploads without + // buffering. + // 2) enable workaround for 'patch' requests + HttpUrlConnectorProvider provider = + new HttpUrlConnectorProvider() + .useFixedLengthStreaming() + .useSetMethodWorkaround(); + + clientConfig.connectorProvider(provider); + builder.withConfig(clientConfig); + } } } diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/HeaderUtils.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/HeaderUtils.java index 619d092b8e7..77b2ddab13f 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/HeaderUtils.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/HeaderUtils.java @@ -5,6 +5,7 @@ import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Map.Entry; import javax.ws.rs.core.MultivaluedMap; @@ -31,9 +32,9 @@ public static Optional> get(MultivaluedMap headers, } // NOTE: this multivaluedmap should be the case-insensitive-key version, // but opting to do a simple search instead. - String lowerCaseHeaderName = name.toLowerCase(); + String lowerCaseHeaderName = name.toLowerCase(Locale.ROOT); for (Entry> entry : headers.entrySet()) { - if (entry.getKey().toLowerCase().equals(lowerCaseHeaderName)) { + if (entry.getKey().toLowerCase(Locale.ROOT).equals(lowerCaseHeaderName)) { return Optional.of(entry.getValue()); } } diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java index f0cc7cb7549..0e40521cd74 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/HttpDateUtils.java @@ -99,7 +99,7 @@ private static void init(List formats) { static Date parse(String headerName, String value) { // date and last-modified use 'HTTP-date' format, rfc2616: // https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html - String lowerCasedHeaderName = headerName.toLowerCase(); + String lowerCasedHeaderName = headerName.toLowerCase(Locale.ROOT); if ("date".equals(lowerCasedHeaderName) || "last-modified".equals(lowerCasedHeaderName)) { Date date = tryParse(value, RFC2616_DATE_FORMATS.get()); if (date == null) { diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseHelper.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseHelper.java index 72dfd865bec..3cd23b9345d 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseHelper.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseHelper.java @@ -6,6 +6,7 @@ import java.io.InputStream; import java.util.HashMap; import java.util.Map; +import java.util.Locale; import javax.ws.rs.ProcessingException; import javax.ws.rs.core.GenericType; @@ -159,7 +160,8 @@ public static T readEntity(@NonNull final Response response, Class entity T entity = response.readEntity(entityType); String contentType = response.getHeaderString("content-type"); - if (contentType != null && contentType.toLowerCase().equals("application/json")) { + if (contentType != null + && contentType.toLowerCase(Locale.ROOT).equals("application/json")) { // HACK alert, if the entry is a string, and it's mime was // application/json, jackson's provider won't deserialize it since // the default provider takes presidence. Need to explicitly remove diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java index 3e65e689503..a65ae6afb84 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/RestClientFactoryBuilder.java @@ -16,6 +16,13 @@ */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class RestClientFactoryBuilder { + public static final DefaultConfigurator DEFAULT_CONFIGURATOR = new DefaultConfigurator(); + + /** + * This is the client configurator used if a caller passes null to + * {@link RestClientFactoryBuilder#clientConfigurator(ClientConfigurator)}. + */ + private ClientConfigurator defaultConfigurator = DEFAULT_CONFIGURATOR; private ClientConfigurator clientConfigurator; /** @@ -27,7 +34,21 @@ public static RestClientFactoryBuilder builder() { } /** - * Sets the ClientConfigurator to use, or null to use the {@link DefaultConfigurator}. + * Sets the default ClientConfigurator. + * @param defaultConfigurator the {@link ClientConfigurator} used if null is passed to the clientConfigurator method + * @return The builder. + */ + public RestClientFactoryBuilder defaultConfigurator(ClientConfigurator defaultConfigurator) { + if (defaultConfigurator != null) { + defaultConfigurator = defaultConfigurator; + } else { + defaultConfigurator = DEFAULT_CONFIGURATOR; + } + return this; + } + + /** + * Sets the ClientConfigurator to use, or null to use the default client configurator. * * @param clientConfigurator The client configurator to use. * @return The builder. @@ -45,7 +66,7 @@ public RestClientFactoryBuilder clientConfigurator(ClientConfigurator clientConf */ public RestClientFactory build() { ClientConfigurator clientConfigurator = - MoreObjects.firstNonNull(this.clientConfigurator, new DefaultConfigurator()); + MoreObjects.firstNonNull(this.clientConfigurator, defaultConfigurator); return new RestClientFactory(clientConfigurator); } 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 f0ef75b6ac3..3d5b3f376a9 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 @@ -96,7 +96,7 @@ private static KeySupplier createKeySupplier( public Optional getKey(String keyId) { return new PEMFileRSAPrivateKeySupplier( authenticationDetailsProvider.getPrivateKey(), - authenticationDetailsProvider.getPassPhrase()) + authenticationDetailsProvider.getPassphraseCharacters()) .getKey(keyId); } }; @@ -105,7 +105,7 @@ public Optional getKey(String keyId) { // else parse once now and return a fixed supplier return new PEMFileRSAPrivateKeySupplier( authenticationDetailsProvider.getPrivateKey(), - authenticationDetailsProvider.getPassPhrase()); + authenticationDetailsProvider.getPassphraseCharacters()); } private static AuthCachingPolicy getAuthCachingPolicy( diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java index 93ebb4562c5..a4a68b4fbd3 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java @@ -54,11 +54,11 @@ public class PEMFileRSAPrivateKeySupplier implements KeySupplier * * @param inputStream * the path to the RSA private key - * @param password + * @param passphraseCharacters * the passphrase of the private key, optional */ public PEMFileRSAPrivateKeySupplier( - @Nonnull final InputStream inputStream, @Nullable final String password) { + @Nonnull final InputStream inputStream, @Nullable final char[] passphraseCharacters) { try { LOG.debug("Initializing private key"); @@ -70,10 +70,10 @@ public PEMFileRSAPrivateKeySupplier( if (object instanceof PEMEncryptedKeyPair) { Preconditions.checkNotNull( - password, "The provided private key requires a passphrase"); + passphraseCharacters, "The provided private key requires a passphrase"); PEMDecryptorProvider decProv = - new JcePEMDecryptorProviderBuilder().build(password.toCharArray()); + new JcePEMDecryptorProviderBuilder().build(passphraseCharacters); try { keyInfo = ((PEMEncryptedKeyPair) object) diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java index 409186db4f8..cbd54560381 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/RequestSignerImpl.java @@ -129,7 +129,7 @@ private Map signRequest( String keyId = keyIdSupplier.get(); Version version = validateVersion(versionName, algorithm); final RSAPrivateKey key = getPrivateKey(keyId); - final String lowerHttpMethod = httpMethod.toLowerCase(); + final String lowerHttpMethod = httpMethod.toLowerCase(Locale.ENGLISH); final String path = extractPath(uri); // 1) get the required headers that must be signed @@ -213,7 +213,7 @@ private Map ignoreCaseHeaders(final Map> or throw new RuntimeException( "Expecting exactly one value for header " + entry.getKey()); } - transformedMap.put(entry.getKey().toLowerCase(), entry.getValue().get(0)); + transformedMap.put(entry.getKey().toLowerCase(Locale.ROOT), entry.getValue().get(0)); } return transformedMap; } @@ -282,7 +282,7 @@ private Map calculateMissingHeaders( missingHeaders.put(Constants.CONTENT_TYPE, Constants.JSON_CONTENT_TYPE); } else if (!existingHeaders .get(Constants.CONTENT_TYPE) - .toLowerCase() + .toLowerCase(Locale.ROOT) .equals(Constants.JSON_CONTENT_TYPE)) { throw new IllegalArgumentException( "Only 'application/json' supported for content type"); diff --git a/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedFileInputStreamTest.java b/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedFileInputStreamTest.java index 42eba33943d..33cd66c5637 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedFileInputStreamTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/io/internal/WrappedFileInputStreamTest.java @@ -24,9 +24,9 @@ public void setUp() throws IOException { tmpFile = File.createTempFile("WrappedFileInputStreamTest", null); tmpFile.deleteOnExit(); - FileOutputStream fos = new FileOutputStream(tmpFile); - fos.write(MESSAGE.getBytes()); - fos.close(); + try (FileOutputStream fos = new FileOutputStream(tmpFile)) { + fos.write(MESSAGE.getBytes()); + } } @After diff --git a/bmc-common/src/test/java/com/oracle/bmc/util/StreamUtilsTest.java b/bmc-common/src/test/java/com/oracle/bmc/util/StreamUtilsTest.java index 96170e15f69..ca234b9eb02 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/util/StreamUtilsTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/util/StreamUtilsTest.java @@ -25,8 +25,9 @@ public void fileToInputStream() throws IOException { File file = File.createTempFile("StreamUtilsTest", null); file.deleteOnExit(); - InputStream stream = StreamUtils.toInputStream(file); - assertNotNull(stream); + try (InputStream stream = StreamUtils.toInputStream(file)) { + assertNotNull(stream); + } file.delete(); } diff --git a/bmc-core/pom.xml b/bmc-core/pom.xml index 8a93c1273d4..b37fcb69c5d 100644 --- a/bmc-core/pom.xml +++ b/bmc-core/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.17 + 1.2.18 diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/Blockstorage.java b/bmc-core/src/main/java/com/oracle/bmc/core/Blockstorage.java index 345ced7acb8..3468810f3cb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/Blockstorage.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/Blockstorage.java @@ -72,6 +72,18 @@ public interface Blockstorage extends AutoCloseable { */ CreateVolumeBackupResponse createVolumeBackup(CreateVolumeBackupRequest request); + /** + * Deletes the specified boot volume. The volume cannot have an active connection to an instance. + * To disconnect the boot volume from a connected instance, see + * [Disconnecting From a Boot Volume](https://docs.us-phoenix-1.oraclecloud.com/Content/Block/Tasks/deletingbootvolume.htm). + * **Warning:** All data on the boot volume will be permanently lost when the boot volume is deleted. + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + DeleteBootVolumeResponse deleteBootVolume(DeleteBootVolumeRequest request); + /** * Deletes the specified volume. The volume cannot have an active connection to an instance. * To disconnect the volume from a connected instance, see @@ -92,6 +104,14 @@ public interface Blockstorage extends AutoCloseable { */ DeleteVolumeBackupResponse deleteVolumeBackup(DeleteVolumeBackupRequest request); + /** + * Gets information for the specified boot volume. + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + GetBootVolumeResponse getBootVolume(GetBootVolumeRequest request); + /** * Gets information for the specified volume. * @param request The request object containing the details to send @@ -108,6 +128,15 @@ public interface Blockstorage extends AutoCloseable { */ GetVolumeBackupResponse getVolumeBackup(GetVolumeBackupRequest request); + /** + * Lists the boot volumes in the specified compartment and Availability Domain. + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + ListBootVolumesResponse listBootVolumes(ListBootVolumesRequest request); + /** * Lists the volume backups in the specified compartment. You can filter the results by volume. * @@ -126,6 +155,14 @@ public interface Blockstorage extends AutoCloseable { */ ListVolumesResponse listVolumes(ListVolumesRequest request); + /** + * Updates the specified boot volume's display name. + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + UpdateBootVolumeResponse updateBootVolume(UpdateBootVolumeRequest request); + /** * Updates the specified volume's display name. * Avoid entering confidential information. diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsync.java b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsync.java index 22916dac3c6..8ba646e14a8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsync.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageAsync.java @@ -87,6 +87,25 @@ java.util.concurrent.Future createVolumeBackup( CreateVolumeBackupRequest, CreateVolumeBackupResponse> handler); + /** + * Deletes the specified boot volume. The volume cannot have an active connection to an instance. + * To disconnect the boot volume from a connected instance, see + * [Disconnecting From a Boot Volume](https://docs.us-phoenix-1.oraclecloud.com/Content/Block/Tasks/deletingbootvolume.htm). + * **Warning:** All data on the boot volume will be permanently lost when the boot volume is deleted. + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future deleteBootVolume( + DeleteBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler); + /** * Deletes the specified volume. The volume cannot have an active connection to an instance. * To disconnect the volume from a connected instance, see @@ -122,6 +141,21 @@ java.util.concurrent.Future deleteVolumeBackup( DeleteVolumeBackupRequest, DeleteVolumeBackupResponse> handler); + /** + * Gets information for the specified boot volume. + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future getBootVolume( + GetBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler); + /** * Gets information for the specified volume. * @@ -151,6 +185,22 @@ java.util.concurrent.Future getVolumeBackup( com.oracle.bmc.responses.AsyncHandler handler); + /** + * Lists the boot volumes in the specified compartment and Availability Domain. + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future listBootVolumes( + ListBootVolumesRequest request, + com.oracle.bmc.responses.AsyncHandler + handler); + /** * Lists the volume backups in the specified compartment. You can filter the results by volume. * @@ -183,6 +233,21 @@ java.util.concurrent.Future listVolumes( ListVolumesRequest request, com.oracle.bmc.responses.AsyncHandler handler); + /** + * Updates the specified boot volume's display name. + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future updateBootVolume( + UpdateBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler); + /** * Updates the specified volume's display name. * Avoid entering confidential information. 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 4e5daa5264e..d6a5a129654 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.core; +import java.util.Locale; import com.oracle.bmc.core.internal.http.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; @@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); @@ -163,6 +164,28 @@ public java.util.concurrent.Future createVolumeBacku return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future deleteBootVolume( + DeleteBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler) { + LOG.trace("Called async deleteBootVolume"); + request = DeleteBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + DeleteBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = DeleteBootVolumeConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.delete(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future deleteVolume( DeleteVolumeRequest request, @@ -208,6 +231,28 @@ public java.util.concurrent.Future deleteVolumeBacku return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future getBootVolume( + GetBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler) { + LOG.trace("Called async getBootVolume"); + request = GetBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + GetBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = GetBootVolumeConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.get(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future getVolume( GetVolumeRequest request, @@ -251,6 +296,28 @@ public java.util.concurrent.Future getVolumeBackup( return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future listBootVolumes( + ListBootVolumesRequest request, + com.oracle.bmc.responses.AsyncHandler + handler) { + LOG.trace("Called async listBootVolumes"); + request = ListBootVolumesConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ListBootVolumesConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = ListBootVolumesConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.get(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future listVolumeBackups( ListVolumeBackupsRequest request, @@ -296,6 +363,28 @@ public java.util.concurrent.Future listVolumes( return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future updateBootVolume( + UpdateBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler) { + LOG.trace("Called async updateBootVolume"); + request = UpdateBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + UpdateBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = UpdateBootVolumeConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.put(ib, request.getUpdateBootVolumeDetails(), request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future updateVolume( UpdateVolumeRequest request, 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 82729227819..3e3e060bcdd 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.core; +import java.util.Locale; import com.oracle.bmc.core.internal.http.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; @@ -120,7 +121,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); @@ -164,6 +165,19 @@ public CreateVolumeBackupResponse createVolumeBackup(CreateVolumeBackupRequest r return transformer.apply(response); } + @Override + public DeleteBootVolumeResponse deleteBootVolume(DeleteBootVolumeRequest request) { + LOG.trace("Called deleteBootVolume"); + request = DeleteBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + DeleteBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = DeleteBootVolumeConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.delete(ib, request); + return transformer.apply(response); + } + @Override public DeleteVolumeResponse deleteVolume(DeleteVolumeRequest request) { LOG.trace("Called deleteVolume"); @@ -190,6 +204,19 @@ public DeleteVolumeBackupResponse deleteVolumeBackup(DeleteVolumeBackupRequest r return transformer.apply(response); } + @Override + public GetBootVolumeResponse getBootVolume(GetBootVolumeRequest request) { + LOG.trace("Called getBootVolume"); + request = GetBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + GetBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = GetBootVolumeConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.get(ib, request); + return transformer.apply(response); + } + @Override public GetVolumeResponse getVolume(GetVolumeRequest request) { LOG.trace("Called getVolume"); @@ -216,6 +243,19 @@ public GetVolumeBackupResponse getVolumeBackup(GetVolumeBackupRequest request) { return transformer.apply(response); } + @Override + public ListBootVolumesResponse listBootVolumes(ListBootVolumesRequest request) { + LOG.trace("Called listBootVolumes"); + request = ListBootVolumesConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ListBootVolumesConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = ListBootVolumesConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.get(ib, request); + return transformer.apply(response); + } + @Override public ListVolumeBackupsResponse listVolumeBackups(ListVolumeBackupsRequest request) { LOG.trace("Called listVolumeBackups"); @@ -242,6 +282,20 @@ public ListVolumesResponse listVolumes(ListVolumesRequest request) { return transformer.apply(response); } + @Override + public UpdateBootVolumeResponse updateBootVolume(UpdateBootVolumeRequest request) { + LOG.trace("Called updateBootVolume"); + request = UpdateBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + UpdateBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = UpdateBootVolumeConverter.fromResponse(); + + javax.ws.rs.core.Response response = + client.put(ib, request.getUpdateBootVolumeDetails(), request); + return transformer.apply(response); + } + @Override public UpdateVolumeResponse updateVolume(UpdateVolumeRequest request) { LOG.trace("Called updateVolume"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java index c9c9f279ba9..4fe3c65dcf1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/BlockstorageWaiters.java @@ -18,6 +18,67 @@ public class BlockstorageWaiters { private final java.util.concurrent.ExecutorService executorService; private final Blockstorage client; + /** + * Creates a new {@link Waiter} using default configuration. + * + * @param request The request to send. + * @param targetState The desired state to wait for. + * @return A new Waiter instance. + */ + public com.oracle.bmc.waiter.Waiter forBootVolume( + GetBootVolumeRequest request, + com.oracle.bmc.core.model.BootVolume.LifecycleState targetState) { + return forBootVolume( + com.oracle.bmc.waiter.Waiters.DEFAULT_POLLING_WAITER, request, targetState); + } + + /** + * Creates a new {@link Waiter} using the provided configuration. + * + * @param request The request to send. + * @param targetState The desired state to wait for. + * @param terminationStrategy The {@link TerminationStrategy} to use. + * @param delayStrategy The {@link DelayStrategy} to use. + * @return A new Waiter instance. + */ + public com.oracle.bmc.waiter.Waiter forBootVolume( + GetBootVolumeRequest request, + com.oracle.bmc.core.model.BootVolume.LifecycleState targetState, + com.oracle.bmc.waiter.TerminationStrategy terminationStrategy, + com.oracle.bmc.waiter.DelayStrategy delayStrategy) { + return forBootVolume( + com.oracle.bmc.waiter.Waiters.newWaiter(terminationStrategy, delayStrategy), + request, + targetState); + } + + // Helper method to create a new Waiter for BootVolume. + private com.oracle.bmc.waiter.Waiter forBootVolume( + com.oracle.bmc.waiter.BmcGenericWaiter waiter, + final GetBootVolumeRequest request, + final com.oracle.bmc.core.model.BootVolume.LifecycleState targetState) { + return new com.oracle.bmc.waiter.internal.SimpleWaiterImpl<>( + executorService, + waiter.toCallable( + com.google.common.base.Suppliers.ofInstance(request), + new com.google.common.base.Function< + GetBootVolumeRequest, GetBootVolumeResponse>() { + @Override + public GetBootVolumeResponse apply(GetBootVolumeRequest request) { + return client.getBootVolume(request); + } + }, + new com.google.common.base.Predicate() { + @Override + public boolean apply(GetBootVolumeResponse response) { + return response.getBootVolume().getLifecycleState() == targetState; + } + }, + targetState + == com.oracle.bmc.core.model.BootVolume.LifecycleState.Terminated), + request); + } + /** * Creates a new {@link Waiter} using default configuration. * diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/Compute.java b/bmc-core/src/main/java/com/oracle/bmc/core/Compute.java index 501f5fdf18c..f61f4cb395d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/Compute.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/Compute.java @@ -36,6 +36,15 @@ public interface Compute extends AutoCloseable { */ void setRegion(String regionId); + /** + * Attaches the specified boot volume to the specified instance. + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + AttachBootVolumeResponse attachBootVolume(AttachBootVolumeRequest request); + /** * Creates a secondary VNIC and attaches it to the specified instance. * For more information about secondary VNICs, see @@ -113,13 +122,11 @@ public interface Compute extends AutoCloseable { CreateImageResponse createImage(CreateImageRequest request); /** - * Creates a new serial console connection to the specified instance. - * Once the serial console connection has been created and is available, - * you connect to the serial console using an SSH client. - *

- * The default number of enabled serial console connections per tenancy is 10. + * Creates a new console connection to the specified instance. + * Once the console connection has been created and is available, + * you connect to the console using SSH. *

- * For more information about serial console access, see [Accessing the Serial Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). + * For more information about console access, see [Accessing the Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). * * @param request The request object containing the details to send * @return A response object containing details about the completed operation @@ -145,7 +152,7 @@ CreateInstanceConsoleConnectionResponse createInstanceConsoleConnection( DeleteImageResponse deleteImage(DeleteImageRequest request); /** - * Deletes the specified serial console connection. + * Deletes the specified instance console connection. * @param request The request object containing the details to send * @return A response object containing details about the completed operation * @throws BmcException when an error occurs. @@ -153,6 +160,18 @@ CreateInstanceConsoleConnectionResponse createInstanceConsoleConnection( DeleteInstanceConsoleConnectionResponse deleteInstanceConsoleConnection( DeleteInstanceConsoleConnectionRequest request); + /** + * Detaches a boot volume from an instance. You must specify the OCID of the boot volume attachment. + *

+ * This is an asynchronous operation. The attachment's `lifecycleState` will change to DETACHING temporarily + * until the attachment is completely removed. + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + DetachBootVolumeResponse detachBootVolume(DetachBootVolumeRequest request); + /** * Detaches and deletes the specified secondary VNIC. * This operation cannot be used on the instance's primary VNIC. @@ -201,6 +220,14 @@ DeleteInstanceConsoleConnectionResponse deleteInstanceConsoleConnection( */ ExportImageResponse exportImage(ExportImageRequest request); + /** + * Gets information about the specified boot volume attachment. + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + GetBootVolumeAttachmentResponse getBootVolumeAttachment(GetBootVolumeAttachmentRequest request); + /** * Shows the metadata for the specified console history. * See {@link #captureConsoleHistory(CaptureConsoleHistoryRequest) captureConsoleHistory} @@ -241,7 +268,7 @@ GetConsoleHistoryContentResponse getConsoleHistoryContent( GetInstanceResponse getInstance(GetInstanceRequest request); /** - * Gets the specified serial console connection's information. + * Gets the specified instance console connection's information. * @param request The request object containing the details to send * @return A response object containing details about the completed operation * @throws BmcException when an error occurs. @@ -338,6 +365,17 @@ GetWindowsInstanceInitialCredentialsResponse getWindowsInstanceInitialCredential */ LaunchInstanceResponse launchInstance(LaunchInstanceRequest request); + /** + * Lists the boot volume attachments in the specified compartment. You can filter the + * list by specifying an instance OCID, boot volume OCID, or both. + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + ListBootVolumeAttachmentsResponse listBootVolumeAttachments( + ListBootVolumeAttachmentsRequest request); + /** * Lists the console history metadata for the specified compartment or instance. * @@ -361,9 +399,9 @@ GetWindowsInstanceInitialCredentialsResponse getWindowsInstanceInitialCredential ListImagesResponse listImages(ListImagesRequest request); /** - * Lists the serial console connections for the specified compartment or instance. + * Lists the console connections for the specified compartment or instance. *

- * For more information about serial console access, see [Accessing the Serial Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). + * For more information about console access, see [Accessing the Instance Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). * * @param request The request object containing the details to send * @return A response object containing details about the completed operation @@ -420,6 +458,9 @@ ListInstanceConsoleConnectionsResponse listInstanceConsoleConnections( * Terminates the specified instance. Any attached VNICs and volumes are automatically detached * when the instance terminates. *

+ * To preserve the boot volume associated with the instance, specify `true` for `PreserveBootVolumeQueryParam`. + * To delete the boot volume when the instance is deleted, specify `false` or do not specify a value for `PreserveBootVolumeQueryParam`. + *

* This is an asynchronous operation. The instance's `lifecycleState` will change to TERMINATING temporarily * until the instance is completely removed. * diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java index b09ea0a3dfc..51f9aa96e94 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java @@ -36,6 +36,22 @@ public interface ComputeAsync extends AutoCloseable { */ void setRegion(String regionId); + /** + * Attaches the specified boot volume to the specified instance. + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future attachBootVolume( + AttachBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler); + /** * Creates a secondary VNIC and attaches it to the specified instance. * For more information about secondary VNICs, see @@ -140,13 +156,11 @@ java.util.concurrent.Future createImage( com.oracle.bmc.responses.AsyncHandler handler); /** - * Creates a new serial console connection to the specified instance. - * Once the serial console connection has been created and is available, - * you connect to the serial console using an SSH client. - *

- * The default number of enabled serial console connections per tenancy is 10. + * Creates a new console connection to the specified instance. + * Once the console connection has been created and is available, + * you connect to the console using SSH. *

- * For more information about serial console access, see [Accessing the Serial Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). + * For more information about console access, see [Accessing the Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). * * * @param request The request object containing the details to send @@ -195,7 +209,7 @@ java.util.concurrent.Future deleteImage( com.oracle.bmc.responses.AsyncHandler handler); /** - * Deletes the specified serial console connection. + * Deletes the specified instance console connection. * * @param request The request object containing the details to send * @param handler The request handler to invoke upon completion, may be null. @@ -212,6 +226,25 @@ java.util.concurrent.Future deleteImage( DeleteInstanceConsoleConnectionResponse> handler); + /** + * Detaches a boot volume from an instance. You must specify the OCID of the boot volume attachment. + *

+ * This is an asynchronous operation. The attachment's `lifecycleState` will change to DETACHING temporarily + * until the attachment is completely removed. + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future detachBootVolume( + DetachBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler); + /** * Detaches and deletes the specified secondary VNIC. * This operation cannot be used on the instance's primary VNIC. @@ -279,6 +312,22 @@ java.util.concurrent.Future exportImage( ExportImageRequest request, com.oracle.bmc.responses.AsyncHandler handler); + /** + * Gets information about the specified boot volume attachment. + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future getBootVolumeAttachment( + GetBootVolumeAttachmentRequest request, + com.oracle.bmc.responses.AsyncHandler< + GetBootVolumeAttachmentRequest, GetBootVolumeAttachmentResponse> + handler); + /** * Shows the metadata for the specified console history. * See {@link #captureConsoleHistory(CaptureConsoleHistoryRequest, Consumer, Consumer) captureConsoleHistory} @@ -346,7 +395,7 @@ java.util.concurrent.Future getInstance( com.oracle.bmc.responses.AsyncHandler handler); /** - * Gets the specified serial console connection's information. + * Gets the specified instance console connection's information. * * @param request The request object containing the details to send * @param handler The request handler to invoke upon completion, may be null. @@ -490,6 +539,24 @@ java.util.concurrent.Future launchInstance( com.oracle.bmc.responses.AsyncHandler handler); + /** + * Lists the boot volume attachments in the specified compartment. You can filter the + * list by specifying an instance OCID, boot volume OCID, or both. + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future listBootVolumeAttachments( + ListBootVolumeAttachmentsRequest request, + com.oracle.bmc.responses.AsyncHandler< + ListBootVolumeAttachmentsRequest, ListBootVolumeAttachmentsResponse> + handler); + /** * Lists the console history metadata for the specified compartment or instance. * @@ -527,9 +594,9 @@ java.util.concurrent.Future listImages( com.oracle.bmc.responses.AsyncHandler handler); /** - * Lists the serial console connections for the specified compartment or instance. + * Lists the console connections for the specified compartment or instance. *

- * For more information about serial console access, see [Accessing the Serial Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). + * For more information about console access, see [Accessing the Instance Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). * * * @param request The request object containing the details to send @@ -624,6 +691,9 @@ java.util.concurrent.Future listVolumeAttachments * Terminates the specified instance. Any attached VNICs and volumes are automatically detached * when the instance terminates. *

+ * To preserve the boot volume associated with the instance, specify `true` for `PreserveBootVolumeQueryParam`. + * To delete the boot volume when the instance is deleted, specify `false` or do not specify a value for `PreserveBootVolumeQueryParam`. + *

* This is an asynchronous operation. The instance's `lifecycleState` will change to TERMINATING temporarily * until the instance is completely removed. * 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 4e8d2483b8f..6cc2d2652d3 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.core; +import java.util.Locale; import com.oracle.bmc.core.internal.http.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; @@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); @@ -117,6 +118,28 @@ public void close() { client.close(); } + @Override + public java.util.concurrent.Future attachBootVolume( + AttachBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler) { + LOG.trace("Called async attachBootVolume"); + request = AttachBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + AttachBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = AttachBootVolumeConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.post(ib, request.getAttachBootVolumeDetails(), request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future attachVnic( AttachVnicRequest request, @@ -308,6 +331,28 @@ public java.util.concurrent.Future deleteImage( return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future detachBootVolume( + DetachBootVolumeRequest request, + com.oracle.bmc.responses.AsyncHandler + handler) { + LOG.trace("Called async detachBootVolume"); + request = DetachBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + DetachBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = DetachBootVolumeConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.delete(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future detachVnic( DetachVnicRequest request, @@ -373,6 +418,29 @@ public java.util.concurrent.Future exportImage( return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future getBootVolumeAttachment( + GetBootVolumeAttachmentRequest request, + com.oracle.bmc.responses.AsyncHandler< + GetBootVolumeAttachmentRequest, GetBootVolumeAttachmentResponse> + handler) { + LOG.trace("Called async getBootVolumeAttachment"); + request = GetBootVolumeAttachmentConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + GetBootVolumeAttachmentConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = GetBootVolumeAttachmentConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.get(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future getConsoleHistory( GetConsoleHistoryRequest request, @@ -604,6 +672,30 @@ public java.util.concurrent.Future launchInstance( return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future listBootVolumeAttachments( + ListBootVolumeAttachmentsRequest request, + com.oracle.bmc.responses.AsyncHandler< + ListBootVolumeAttachmentsRequest, ListBootVolumeAttachmentsResponse> + handler) { + LOG.trace("Called async listBootVolumeAttachments"); + request = ListBootVolumeAttachmentsConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ListBootVolumeAttachmentsConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, ListBootVolumeAttachmentsResponse> + transformer = ListBootVolumeAttachmentsConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.get(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future listConsoleHistories( ListConsoleHistoriesRequest request, 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 314941e64cc..c6f3f265b3d 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.core; +import java.util.Locale; import com.oracle.bmc.core.internal.http.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; @@ -120,7 +121,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); @@ -136,6 +137,20 @@ public void close() { client.close(); } + @Override + public AttachBootVolumeResponse attachBootVolume(AttachBootVolumeRequest request) { + LOG.trace("Called attachBootVolume"); + request = AttachBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + AttachBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = AttachBootVolumeConverter.fromResponse(); + + javax.ws.rs.core.Response response = + client.post(ib, request.getAttachBootVolumeDetails(), request); + return transformer.apply(response); + } + @Override public AttachVnicResponse attachVnic(AttachVnicRequest request) { LOG.trace("Called attachVnic"); @@ -250,6 +265,19 @@ public DeleteInstanceConsoleConnectionResponse deleteInstanceConsoleConnection( return transformer.apply(response); } + @Override + public DetachBootVolumeResponse detachBootVolume(DetachBootVolumeRequest request) { + LOG.trace("Called detachBootVolume"); + request = DetachBootVolumeConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + DetachBootVolumeConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = DetachBootVolumeConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.delete(ib, request); + return transformer.apply(response); + } + @Override public DetachVnicResponse detachVnic(DetachVnicRequest request) { LOG.trace("Called detachVnic"); @@ -290,6 +318,20 @@ public ExportImageResponse exportImage(ExportImageRequest request) { return transformer.apply(response); } + @Override + public GetBootVolumeAttachmentResponse getBootVolumeAttachment( + GetBootVolumeAttachmentRequest request) { + LOG.trace("Called getBootVolumeAttachment"); + request = GetBootVolumeAttachmentConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + GetBootVolumeAttachmentConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = GetBootVolumeAttachmentConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.get(ib, request); + return transformer.apply(response); + } + @Override public GetConsoleHistoryResponse getConsoleHistory(GetConsoleHistoryRequest request) { LOG.trace("Called getConsoleHistory"); @@ -426,6 +468,21 @@ public LaunchInstanceResponse launchInstance(LaunchInstanceRequest request) { return transformer.apply(response); } + @Override + public ListBootVolumeAttachmentsResponse listBootVolumeAttachments( + ListBootVolumeAttachmentsRequest request) { + LOG.trace("Called listBootVolumeAttachments"); + request = ListBootVolumeAttachmentsConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ListBootVolumeAttachmentsConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, ListBootVolumeAttachmentsResponse> + transformer = ListBootVolumeAttachmentsConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.get(ib, request); + return transformer.apply(response); + } + @Override public ListConsoleHistoriesResponse listConsoleHistories(ListConsoleHistoriesRequest request) { LOG.trace("Called listConsoleHistories"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java index 00e8f2a0713..798dbc03940 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeWaiters.java @@ -18,6 +18,75 @@ public class ComputeWaiters { private final java.util.concurrent.ExecutorService executorService; private final Compute client; + /** + * Creates a new {@link Waiter} using default configuration. + * + * @param request The request to send. + * @param targetState The desired state to wait for. + * @return A new Waiter instance. + */ + public com.oracle.bmc.waiter.Waiter< + GetBootVolumeAttachmentRequest, GetBootVolumeAttachmentResponse> + forBootVolumeAttachment( + GetBootVolumeAttachmentRequest request, + com.oracle.bmc.core.model.BootVolumeAttachment.LifecycleState targetState) { + return forBootVolumeAttachment( + com.oracle.bmc.waiter.Waiters.DEFAULT_POLLING_WAITER, request, targetState); + } + + /** + * Creates a new {@link Waiter} using the provided configuration. + * + * @param request The request to send. + * @param targetState The desired state to wait for. + * @param terminationStrategy The {@link TerminationStrategy} to use. + * @param delayStrategy The {@link DelayStrategy} to use. + * @return A new Waiter instance. + */ + public com.oracle.bmc.waiter.Waiter< + GetBootVolumeAttachmentRequest, GetBootVolumeAttachmentResponse> + forBootVolumeAttachment( + GetBootVolumeAttachmentRequest request, + com.oracle.bmc.core.model.BootVolumeAttachment.LifecycleState targetState, + com.oracle.bmc.waiter.TerminationStrategy terminationStrategy, + com.oracle.bmc.waiter.DelayStrategy delayStrategy) { + return forBootVolumeAttachment( + com.oracle.bmc.waiter.Waiters.newWaiter(terminationStrategy, delayStrategy), + request, + targetState); + } + + // Helper method to create a new Waiter for BootVolumeAttachment. + private com.oracle.bmc.waiter.Waiter< + GetBootVolumeAttachmentRequest, GetBootVolumeAttachmentResponse> + forBootVolumeAttachment( + com.oracle.bmc.waiter.BmcGenericWaiter waiter, + final GetBootVolumeAttachmentRequest request, + final com.oracle.bmc.core.model.BootVolumeAttachment.LifecycleState + targetState) { + return new com.oracle.bmc.waiter.internal.SimpleWaiterImpl<>( + executorService, + waiter.toCallable( + com.google.common.base.Suppliers.ofInstance(request), + new com.google.common.base.Function< + GetBootVolumeAttachmentRequest, GetBootVolumeAttachmentResponse>() { + @Override + public GetBootVolumeAttachmentResponse apply( + GetBootVolumeAttachmentRequest request) { + return client.getBootVolumeAttachment(request); + } + }, + new com.google.common.base.Predicate() { + @Override + public boolean apply(GetBootVolumeAttachmentResponse response) { + return response.getBootVolumeAttachment().getLifecycleState() + == targetState; + } + }, + false), + request); + } + /** * Creates a new {@link Waiter} using default configuration. * diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetwork.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetwork.java index 53ae1ac0185..85c9cbdf441 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetwork.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetwork.java @@ -36,6 +36,23 @@ public interface VirtualNetwork extends AutoCloseable { */ void setRegion(String regionId); + /** + * Connects this local peering gateway (LPG) to another one in the same region. + *

+ * This operation must be called by the VCN administrator who is designated as + * the *requestor* in the peering relationship. The *acceptor* must implement + * an Identity and Access Management (IAM) policy that gives the requestor permission + * to connect to LPGs in the acceptor's compartment. Without that permission, this + * operation will fail. For more information, see + * [VCN Peering](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/VCNpeering.htm). + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + ConnectLocalPeeringGatewaysResponse connectLocalPeeringGateways( + ConnectLocalPeeringGatewaysRequest request); + /** * Creates a new virtual Customer-Premises Equipment (CPE) object in the specified compartment. For * more information, see [IPSec VPNs](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPsec.htm). @@ -231,6 +248,16 @@ public interface VirtualNetwork extends AutoCloseable { */ CreateInternetGatewayResponse createInternetGateway(CreateInternetGatewayRequest request); + /** + * Creates a new local peering gateway (LPG) for the specified VCN. + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + CreateLocalPeeringGatewayResponse createLocalPeeringGateway( + CreateLocalPeeringGatewayRequest request); + /** * Creates a secondary private IP for the specified VNIC. * For more information about secondary private IPs, see @@ -489,6 +516,19 @@ public interface VirtualNetwork extends AutoCloseable { */ DeleteInternetGatewayResponse deleteInternetGateway(DeleteInternetGatewayRequest request); + /** + * Deletes the specified local peering gateway (LPG). + *

+ * This is an asynchronous operation; the local peering gateway's `lifecycleState` changes to TERMINATING temporarily + * until the local peering gateway is completely removed. + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + DeleteLocalPeeringGatewayResponse deleteLocalPeeringGateway( + DeleteLocalPeeringGatewayRequest request); + /** * Unassigns and deletes the specified private IP. You must * specify the object's OCID. The private IP address is returned to @@ -675,6 +715,14 @@ GetIPSecConnectionDeviceStatusResponse getIPSecConnectionDeviceStatus( */ GetInternetGatewayResponse getInternetGateway(GetInternetGatewayRequest request); + /** + * Gets the specified local peering gateway's information. + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + GetLocalPeeringGatewayResponse getLocalPeeringGateway(GetLocalPeeringGatewayRequest request); + /** * Gets the specified private IP. You must specify the object's OCID. * Alternatively, you can get the object by using @@ -855,6 +903,17 @@ ListFastConnectProviderServicesResponse listFastConnectProviderServices( */ ListInternetGatewaysResponse listInternetGateways(ListInternetGatewaysRequest request); + /** + * Lists the local peering gateways (LPGs) for the specified VCN and compartment + * (the LPG's compartment). + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + ListLocalPeeringGatewaysResponse listLocalPeeringGateways( + ListLocalPeeringGatewaysRequest request); + /** * Lists the {@link PrivateIp} objects based * on one of these filters: @@ -1018,6 +1077,16 @@ ListVirtualCircuitBandwidthShapesResponse listVirtualCircuitBandwidthShapes( */ UpdateInternetGatewayResponse updateInternetGateway(UpdateInternetGatewayRequest request); + /** + * Updates the specified local peering gateway (LPG). + * + * @param request The request object containing the details to send + * @return A response object containing details about the completed operation + * @throws BmcException when an error occurs. + */ + UpdateLocalPeeringGatewayResponse updateLocalPeeringGateway( + UpdateLocalPeeringGatewayRequest request); + /** * Updates the specified private IP. You must specify the object's OCID. * Use this operation if you want to: diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java index 79e7e14865c..3c40e65e41b 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java @@ -36,6 +36,30 @@ public interface VirtualNetworkAsync extends AutoCloseable { */ void setRegion(String regionId); + /** + * Connects this local peering gateway (LPG) to another one in the same region. + *

+ * This operation must be called by the VCN administrator who is designated as + * the *requestor* in the peering relationship. The *acceptor* must implement + * an Identity and Access Management (IAM) policy that gives the requestor permission + * to connect to LPGs in the acceptor's compartment. Without that permission, this + * operation will fail. For more information, see + * [VCN Peering](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/VCNpeering.htm). + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future connectLocalPeeringGateways( + ConnectLocalPeeringGatewaysRequest request, + com.oracle.bmc.responses.AsyncHandler< + ConnectLocalPeeringGatewaysRequest, ConnectLocalPeeringGatewaysResponse> + handler); + /** * Creates a new virtual Customer-Premises Equipment (CPE) object in the specified compartment. For * more information, see [IPSec VPNs](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPsec.htm). @@ -291,6 +315,23 @@ java.util.concurrent.Future createInternetGateway CreateInternetGatewayRequest, CreateInternetGatewayResponse> handler); + /** + * Creates a new local peering gateway (LPG) for the specified VCN. + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future createLocalPeeringGateway( + CreateLocalPeeringGatewayRequest request, + com.oracle.bmc.responses.AsyncHandler< + CreateLocalPeeringGatewayRequest, CreateLocalPeeringGatewayResponse> + handler); + /** * Creates a secondary private IP for the specified VNIC. * For more information about secondary private IPs, see @@ -652,6 +693,26 @@ java.util.concurrent.Future deleteInternetGateway DeleteInternetGatewayRequest, DeleteInternetGatewayResponse> handler); + /** + * Deletes the specified local peering gateway (LPG). + *

+ * This is an asynchronous operation; the local peering gateway's `lifecycleState` changes to TERMINATING temporarily + * until the local peering gateway is completely removed. + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future deleteLocalPeeringGateway( + DeleteLocalPeeringGatewayRequest request, + com.oracle.bmc.responses.AsyncHandler< + DeleteLocalPeeringGatewayRequest, DeleteLocalPeeringGatewayResponse> + handler); + /** * Unassigns and deletes the specified private IP. You must * specify the object's OCID. The private IP address is returned to @@ -973,6 +1034,22 @@ java.util.concurrent.Future getInternetGateway( GetInternetGatewayRequest, GetInternetGatewayResponse> handler); + /** + * Gets the specified local peering gateway's information. + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future getLocalPeeringGateway( + GetLocalPeeringGatewayRequest request, + com.oracle.bmc.responses.AsyncHandler< + GetLocalPeeringGatewayRequest, GetLocalPeeringGatewayResponse> + handler); + /** * Gets the specified private IP. You must specify the object's OCID. * Alternatively, you can get the object by using @@ -1284,6 +1361,24 @@ java.util.concurrent.Future listInternetGateways( ListInternetGatewaysRequest, ListInternetGatewaysResponse> handler); + /** + * Lists the local peering gateways (LPGs) for the specified VCN and compartment + * (the LPG's compartment). + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future listLocalPeeringGateways( + ListLocalPeeringGatewaysRequest request, + com.oracle.bmc.responses.AsyncHandler< + ListLocalPeeringGatewaysRequest, ListLocalPeeringGatewaysResponse> + handler); + /** * Lists the {@link PrivateIp} objects based * on one of these filters: @@ -1558,6 +1653,23 @@ java.util.concurrent.Future updateInternetGateway UpdateInternetGatewayRequest, UpdateInternetGatewayResponse> handler); + /** + * Updates the specified local peering gateway (LPG). + * + * + * @param request The request object containing the details to send + * @param handler The request handler to invoke upon completion, may be null. + * @return A Future that can be used to get the response if no AsyncHandler was + * provided. Note, if you provide an AsyncHandler and use the Future, some + * types of responses (like java.io.InputStream) may not be able to be read in + * both places as the underlying stream may only be consumed once. + */ + java.util.concurrent.Future updateLocalPeeringGateway( + UpdateLocalPeeringGatewayRequest request, + com.oracle.bmc.responses.AsyncHandler< + UpdateLocalPeeringGatewayRequest, UpdateLocalPeeringGatewayResponse> + handler); + /** * Updates the specified private IP. You must specify the object's OCID. * Use this operation if you want to: 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 fbb225f228d..dd6f48e2602 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.core; +import java.util.Locale; import com.oracle.bmc.core.internal.http.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; @@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); @@ -117,6 +118,37 @@ public void close() { client.close(); } + @Override + public java.util.concurrent.Future + connectLocalPeeringGateways( + ConnectLocalPeeringGatewaysRequest request, + com.oracle.bmc.responses.AsyncHandler< + ConnectLocalPeeringGatewaysRequest, + ConnectLocalPeeringGatewaysResponse> + handler) { + LOG.trace("Called async connectLocalPeeringGateways"); + request = ConnectLocalPeeringGatewaysConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ConnectLocalPeeringGatewaysConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, ConnectLocalPeeringGatewaysResponse> + transformer = ConnectLocalPeeringGatewaysConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.post( + ib, + request.getConnectLocalPeeringGatewaysDetails(), + request, + onSuccess, + onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future createCpe( CreateCpeRequest request, @@ -306,6 +338,35 @@ public java.util.concurrent.Future createInternet return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future createLocalPeeringGateway( + CreateLocalPeeringGatewayRequest request, + com.oracle.bmc.responses.AsyncHandler< + CreateLocalPeeringGatewayRequest, CreateLocalPeeringGatewayResponse> + handler) { + LOG.trace("Called async createLocalPeeringGateway"); + request = CreateLocalPeeringGatewayConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + CreateLocalPeeringGatewayConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, CreateLocalPeeringGatewayResponse> + transformer = CreateLocalPeeringGatewayConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.post( + ib, + request.getCreateLocalPeeringGatewayDetails(), + request, + onSuccess, + onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future createPrivateIp( CreatePrivateIpRequest request, @@ -621,6 +682,30 @@ public java.util.concurrent.Future deleteInternet return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future deleteLocalPeeringGateway( + DeleteLocalPeeringGatewayRequest request, + com.oracle.bmc.responses.AsyncHandler< + DeleteLocalPeeringGatewayRequest, DeleteLocalPeeringGatewayResponse> + handler) { + LOG.trace("Called async deleteLocalPeeringGateway"); + request = DeleteLocalPeeringGatewayConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + DeleteLocalPeeringGatewayConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, DeleteLocalPeeringGatewayResponse> + transformer = DeleteLocalPeeringGatewayConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.delete(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future deletePrivateIp( DeletePrivateIpRequest request, @@ -1032,6 +1117,29 @@ public java.util.concurrent.Future getInternetGatewa return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future getLocalPeeringGateway( + GetLocalPeeringGatewayRequest request, + com.oracle.bmc.responses.AsyncHandler< + GetLocalPeeringGatewayRequest, GetLocalPeeringGatewayResponse> + handler) { + LOG.trace("Called async getLocalPeeringGateway"); + request = GetLocalPeeringGatewayConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + GetLocalPeeringGatewayConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = GetLocalPeeringGatewayConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.get(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future getPrivateIp( GetPrivateIpRequest request, @@ -1439,6 +1547,29 @@ public java.util.concurrent.Future listInternetGat return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future listLocalPeeringGateways( + ListLocalPeeringGatewaysRequest request, + com.oracle.bmc.responses.AsyncHandler< + ListLocalPeeringGatewaysRequest, ListLocalPeeringGatewaysResponse> + handler) { + LOG.trace("Called async listLocalPeeringGateways"); + request = ListLocalPeeringGatewaysConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ListLocalPeeringGatewaysConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = ListLocalPeeringGatewaysConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.get(ib, request, onSuccess, onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future listPrivateIps( ListPrivateIpsRequest request, @@ -1786,6 +1917,35 @@ public java.util.concurrent.Future updateInternet return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); } + @Override + public java.util.concurrent.Future updateLocalPeeringGateway( + UpdateLocalPeeringGatewayRequest request, + com.oracle.bmc.responses.AsyncHandler< + UpdateLocalPeeringGatewayRequest, UpdateLocalPeeringGatewayResponse> + handler) { + LOG.trace("Called async updateLocalPeeringGateway"); + request = UpdateLocalPeeringGatewayConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + UpdateLocalPeeringGatewayConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateLocalPeeringGatewayResponse> + transformer = UpdateLocalPeeringGatewayConverter.fromResponse(); + + com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>(handler, transformer, request); + com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handler, request); + + java.util.concurrent.Future responseFuture = + client.put( + ib, + request.getUpdateLocalPeeringGatewayDetails(), + request, + onSuccess, + onError); + return new com.oracle.bmc.util.internal.TransformingFuture<>(responseFuture, transformer); + } + @Override public java.util.concurrent.Future updatePrivateIp( UpdatePrivateIpRequest request, 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 7560600626a..123557b9197 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.core; +import java.util.Locale; import com.oracle.bmc.core.internal.http.*; import com.oracle.bmc.core.requests.*; import com.oracle.bmc.core.responses.*; @@ -120,7 +121,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); @@ -136,6 +137,22 @@ public void close() { client.close(); } + @Override + public ConnectLocalPeeringGatewaysResponse connectLocalPeeringGateways( + ConnectLocalPeeringGatewaysRequest request) { + LOG.trace("Called connectLocalPeeringGateways"); + request = ConnectLocalPeeringGatewaysConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ConnectLocalPeeringGatewaysConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, ConnectLocalPeeringGatewaysResponse> + transformer = ConnectLocalPeeringGatewaysConverter.fromResponse(); + + javax.ws.rs.core.Response response = + client.post(ib, request.getConnectLocalPeeringGatewaysDetails(), request); + return transformer.apply(response); + } + @Override public CreateCpeResponse createCpe(CreateCpeRequest request) { LOG.trace("Called createCpe"); @@ -251,6 +268,22 @@ public CreateInternetGatewayResponse createInternetGateway( return transformer.apply(response); } + @Override + public CreateLocalPeeringGatewayResponse createLocalPeeringGateway( + CreateLocalPeeringGatewayRequest request) { + LOG.trace("Called createLocalPeeringGateway"); + request = CreateLocalPeeringGatewayConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + CreateLocalPeeringGatewayConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, CreateLocalPeeringGatewayResponse> + transformer = CreateLocalPeeringGatewayConverter.fromResponse(); + + javax.ws.rs.core.Response response = + client.post(ib, request.getCreateLocalPeeringGatewayDetails(), request); + return transformer.apply(response); + } + @Override public CreatePrivateIpResponse createPrivateIp(CreatePrivateIpRequest request) { LOG.trace("Called createPrivateIp"); @@ -442,6 +475,21 @@ public DeleteInternetGatewayResponse deleteInternetGateway( return transformer.apply(response); } + @Override + public DeleteLocalPeeringGatewayResponse deleteLocalPeeringGateway( + DeleteLocalPeeringGatewayRequest request) { + LOG.trace("Called deleteLocalPeeringGateway"); + request = DeleteLocalPeeringGatewayConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + DeleteLocalPeeringGatewayConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, DeleteLocalPeeringGatewayResponse> + transformer = DeleteLocalPeeringGatewayConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.delete(ib, request); + return transformer.apply(response); + } + @Override public DeletePrivateIpResponse deletePrivateIp(DeletePrivateIpRequest request) { LOG.trace("Called deletePrivateIp"); @@ -683,6 +731,20 @@ public GetInternetGatewayResponse getInternetGateway(GetInternetGatewayRequest r return transformer.apply(response); } + @Override + public GetLocalPeeringGatewayResponse getLocalPeeringGateway( + GetLocalPeeringGatewayRequest request) { + LOG.trace("Called getLocalPeeringGateway"); + request = GetLocalPeeringGatewayConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + GetLocalPeeringGatewayConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = GetLocalPeeringGatewayConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.get(ib, request); + return transformer.apply(response); + } + @Override public GetPrivateIpResponse getPrivateIp(GetPrivateIpRequest request) { LOG.trace("Called getPrivateIp"); @@ -924,6 +986,20 @@ public ListInternetGatewaysResponse listInternetGateways(ListInternetGatewaysReq return transformer.apply(response); } + @Override + public ListLocalPeeringGatewaysResponse listLocalPeeringGateways( + ListLocalPeeringGatewaysRequest request) { + LOG.trace("Called listLocalPeeringGateways"); + request = ListLocalPeeringGatewaysConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ListLocalPeeringGatewaysConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = ListLocalPeeringGatewaysConverter.fromResponse(); + + javax.ws.rs.core.Response response = client.get(ib, request); + return transformer.apply(response); + } + @Override public ListPrivateIpsResponse listPrivateIps(ListPrivateIpsRequest request) { LOG.trace("Called listPrivateIps"); @@ -1130,6 +1206,22 @@ public UpdateInternetGatewayResponse updateInternetGateway( return transformer.apply(response); } + @Override + public UpdateLocalPeeringGatewayResponse updateLocalPeeringGateway( + UpdateLocalPeeringGatewayRequest request) { + LOG.trace("Called updateLocalPeeringGateway"); + request = UpdateLocalPeeringGatewayConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + UpdateLocalPeeringGatewayConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateLocalPeeringGatewayResponse> + transformer = UpdateLocalPeeringGatewayConverter.fromResponse(); + + javax.ws.rs.core.Response response = + client.put(ib, request.getUpdateLocalPeeringGatewayDetails(), request); + return transformer.apply(response); + } + @Override public UpdatePrivateIpResponse updatePrivateIp(UpdatePrivateIpRequest request) { LOG.trace("Called updatePrivateIp"); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkWaiters.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkWaiters.java index 56ab35b6509..4e8cb9132ed 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkWaiters.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkWaiters.java @@ -471,6 +471,77 @@ public boolean apply(GetInternetGatewayResponse response) { request); } + /** + * Creates a new {@link Waiter} using default configuration. + * + * @param request The request to send. + * @param targetState The desired state to wait for. + * @return A new Waiter instance. + */ + public com.oracle.bmc.waiter.Waiter< + GetLocalPeeringGatewayRequest, GetLocalPeeringGatewayResponse> + forLocalPeeringGateway( + GetLocalPeeringGatewayRequest request, + com.oracle.bmc.core.model.LocalPeeringGateway.LifecycleState targetState) { + return forLocalPeeringGateway( + com.oracle.bmc.waiter.Waiters.DEFAULT_POLLING_WAITER, request, targetState); + } + + /** + * Creates a new {@link Waiter} using the provided configuration. + * + * @param request The request to send. + * @param targetState The desired state to wait for. + * @param terminationStrategy The {@link TerminationStrategy} to use. + * @param delayStrategy The {@link DelayStrategy} to use. + * @return A new Waiter instance. + */ + public com.oracle.bmc.waiter.Waiter< + GetLocalPeeringGatewayRequest, GetLocalPeeringGatewayResponse> + forLocalPeeringGateway( + GetLocalPeeringGatewayRequest request, + com.oracle.bmc.core.model.LocalPeeringGateway.LifecycleState targetState, + com.oracle.bmc.waiter.TerminationStrategy terminationStrategy, + com.oracle.bmc.waiter.DelayStrategy delayStrategy) { + return forLocalPeeringGateway( + com.oracle.bmc.waiter.Waiters.newWaiter(terminationStrategy, delayStrategy), + request, + targetState); + } + + // Helper method to create a new Waiter for LocalPeeringGateway. + private com.oracle.bmc.waiter.Waiter< + GetLocalPeeringGatewayRequest, GetLocalPeeringGatewayResponse> + forLocalPeeringGateway( + com.oracle.bmc.waiter.BmcGenericWaiter waiter, + final GetLocalPeeringGatewayRequest request, + final com.oracle.bmc.core.model.LocalPeeringGateway.LifecycleState + targetState) { + return new com.oracle.bmc.waiter.internal.SimpleWaiterImpl<>( + executorService, + waiter.toCallable( + com.google.common.base.Suppliers.ofInstance(request), + new com.google.common.base.Function< + GetLocalPeeringGatewayRequest, GetLocalPeeringGatewayResponse>() { + @Override + public GetLocalPeeringGatewayResponse apply( + GetLocalPeeringGatewayRequest request) { + return client.getLocalPeeringGateway(request); + } + }, + new com.google.common.base.Predicate() { + @Override + public boolean apply(GetLocalPeeringGatewayResponse response) { + return response.getLocalPeeringGateway().getLifecycleState() + == targetState; + } + }, + targetState + == com.oracle.bmc.core.model.LocalPeeringGateway.LifecycleState + .Terminated), + request); + } + /** * Creates a new {@link Waiter} using default configuration. * diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachBootVolumeConverter.java new file mode 100644 index 00000000000..8aeaf57cccb --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/AttachBootVolumeConverter.java @@ -0,0 +1,104 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class AttachBootVolumeConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static AttachBootVolumeRequest interceptRequest(AttachBootVolumeRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, AttachBootVolumeRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getAttachBootVolumeDetails() == null) { + throw new NullPointerException("attachBootVolumeDetails is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget().path("/20160918").path("bootVolumeAttachments"); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + if (request.getOpcRetryToken() != null) { + ib.header("opc-retry-token", request.getOpcRetryToken()); + } + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, AttachBootVolumeResponse> + fromResponse() { + final com.google.common.base.Function + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, AttachBootVolumeResponse>() { + @Override + public AttachBootVolumeResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for AttachBootVolumeResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + BootVolumeAttachment>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + BootVolumeAttachment.class); + + com.oracle.bmc.http.internal.WithHeaders + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + AttachBootVolumeResponse.Builder builder = + AttachBootVolumeResponse.builder(); + + builder.bootVolumeAttachment(response.getItem()); + + com.google.common.base.Optional> etagHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "etag"); + if (etagHeader.isPresent()) { + builder.etag( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "etag", etagHeader.get().get(0), String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + AttachBootVolumeResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectLocalPeeringGatewaysConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectLocalPeeringGatewaysConverter.java new file mode 100644 index 00000000000..00d4fff018e --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ConnectLocalPeeringGatewaysConverter.java @@ -0,0 +1,101 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class ConnectLocalPeeringGatewaysConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static ConnectLocalPeeringGatewaysRequest interceptRequest( + ConnectLocalPeeringGatewaysRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, + ConnectLocalPeeringGatewaysRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getLocalPeeringGatewayId() == null) { + throw new NullPointerException("localPeeringGatewayId is required"); + } + + if (request.getConnectLocalPeeringGatewaysDetails() == null) { + throw new NullPointerException("connectLocalPeeringGatewaysDetails is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("localPeeringGateways") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getLocalPeeringGatewayId())) + .path("actions") + .path("connect"); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, ConnectLocalPeeringGatewaysResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, ConnectLocalPeeringGatewaysResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, ConnectLocalPeeringGatewaysResponse>() { + @Override + public ConnectLocalPeeringGatewaysResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for ConnectLocalPeeringGatewaysResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders> + responseFn = RESPONSE_CONVERSION_FACTORY.create(); + + com.oracle.bmc.http.internal.WithHeaders response = + responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + ConnectLocalPeeringGatewaysResponse.Builder builder = + ConnectLocalPeeringGatewaysResponse.builder(); + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + ConnectLocalPeeringGatewaysResponse responseWrapper = + builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateLocalPeeringGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateLocalPeeringGatewayConverter.java new file mode 100644 index 00000000000..0162489ab24 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/CreateLocalPeeringGatewayConverter.java @@ -0,0 +1,107 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class CreateLocalPeeringGatewayConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static CreateLocalPeeringGatewayRequest interceptRequest( + CreateLocalPeeringGatewayRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, + CreateLocalPeeringGatewayRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getCreateLocalPeeringGatewayDetails() == null) { + throw new NullPointerException("createLocalPeeringGatewayDetails is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget().path("/20160918").path("localPeeringGateways"); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + if (request.getOpcRetryToken() != null) { + ib.header("opc-retry-token", request.getOpcRetryToken()); + } + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, CreateLocalPeeringGatewayResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, CreateLocalPeeringGatewayResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, CreateLocalPeeringGatewayResponse>() { + @Override + public CreateLocalPeeringGatewayResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for CreateLocalPeeringGatewayResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + LocalPeeringGateway>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + LocalPeeringGateway.class); + + com.oracle.bmc.http.internal.WithHeaders + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + CreateLocalPeeringGatewayResponse.Builder builder = + CreateLocalPeeringGatewayResponse.builder(); + + builder.localPeeringGateway(response.getItem()); + + com.google.common.base.Optional> etagHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "etag"); + if (etagHeader.isPresent()) { + builder.etag( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "etag", etagHeader.get().get(0), String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + CreateLocalPeeringGatewayResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteBootVolumeConverter.java new file mode 100644 index 00000000000..84a7473d41c --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteBootVolumeConverter.java @@ -0,0 +1,95 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class DeleteBootVolumeConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static DeleteBootVolumeRequest interceptRequest(DeleteBootVolumeRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, DeleteBootVolumeRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getBootVolumeId() == null) { + throw new NullPointerException("bootVolumeId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("bootVolumes") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getBootVolumeId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + if (request.getIfMatch() != null) { + ib.header("if-match", request.getIfMatch()); + } + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, DeleteBootVolumeResponse> + fromResponse() { + final com.google.common.base.Function + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, DeleteBootVolumeResponse>() { + @Override + public DeleteBootVolumeResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for DeleteBootVolumeResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders> + responseFn = RESPONSE_CONVERSION_FACTORY.create(); + + com.oracle.bmc.http.internal.WithHeaders response = + responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + DeleteBootVolumeResponse.Builder builder = + DeleteBootVolumeResponse.builder(); + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + DeleteBootVolumeResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteLocalPeeringGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteLocalPeeringGatewayConverter.java new file mode 100644 index 00000000000..b26b2ee7a1b --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DeleteLocalPeeringGatewayConverter.java @@ -0,0 +1,98 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class DeleteLocalPeeringGatewayConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static DeleteLocalPeeringGatewayRequest interceptRequest( + DeleteLocalPeeringGatewayRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, + DeleteLocalPeeringGatewayRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getLocalPeeringGatewayId() == null) { + throw new NullPointerException("localPeeringGatewayId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("localPeeringGateways") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getLocalPeeringGatewayId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + if (request.getIfMatch() != null) { + ib.header("if-match", request.getIfMatch()); + } + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, DeleteLocalPeeringGatewayResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, DeleteLocalPeeringGatewayResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, DeleteLocalPeeringGatewayResponse>() { + @Override + public DeleteLocalPeeringGatewayResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for DeleteLocalPeeringGatewayResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders> + responseFn = RESPONSE_CONVERSION_FACTORY.create(); + + com.oracle.bmc.http.internal.WithHeaders response = + responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + DeleteLocalPeeringGatewayResponse.Builder builder = + DeleteLocalPeeringGatewayResponse.builder(); + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + DeleteLocalPeeringGatewayResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachBootVolumeConverter.java new file mode 100644 index 00000000000..15c792cfee7 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/DetachBootVolumeConverter.java @@ -0,0 +1,95 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class DetachBootVolumeConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static DetachBootVolumeRequest interceptRequest(DetachBootVolumeRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, DetachBootVolumeRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getBootVolumeAttachmentId() == null) { + throw new NullPointerException("bootVolumeAttachmentId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("bootVolumeAttachments") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getBootVolumeAttachmentId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + if (request.getIfMatch() != null) { + ib.header("if-match", request.getIfMatch()); + } + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, DetachBootVolumeResponse> + fromResponse() { + final com.google.common.base.Function + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, DetachBootVolumeResponse>() { + @Override + public DetachBootVolumeResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for DetachBootVolumeResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders> + responseFn = RESPONSE_CONVERSION_FACTORY.create(); + + com.oracle.bmc.http.internal.WithHeaders response = + responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + DetachBootVolumeResponse.Builder builder = + DetachBootVolumeResponse.builder(); + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + DetachBootVolumeResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeAttachmentConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeAttachmentConverter.java new file mode 100644 index 00000000000..8d08b00fb19 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeAttachmentConverter.java @@ -0,0 +1,108 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class GetBootVolumeAttachmentConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static GetBootVolumeAttachmentRequest interceptRequest( + GetBootVolumeAttachmentRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, + GetBootVolumeAttachmentRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getBootVolumeAttachmentId() == null) { + throw new NullPointerException("bootVolumeAttachmentId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("bootVolumeAttachments") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getBootVolumeAttachmentId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, GetBootVolumeAttachmentResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, GetBootVolumeAttachmentResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, GetBootVolumeAttachmentResponse>() { + @Override + public GetBootVolumeAttachmentResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for GetBootVolumeAttachmentResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + BootVolumeAttachment>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + BootVolumeAttachment.class); + + com.oracle.bmc.http.internal.WithHeaders + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + GetBootVolumeAttachmentResponse.Builder builder = + GetBootVolumeAttachmentResponse.builder(); + + builder.bootVolumeAttachment(response.getItem()); + + com.google.common.base.Optional> etagHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "etag"); + if (etagHeader.isPresent()) { + builder.etag( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "etag", etagHeader.get().get(0), String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + GetBootVolumeAttachmentResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeConverter.java new file mode 100644 index 00000000000..f98c43daf3f --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetBootVolumeConverter.java @@ -0,0 +1,103 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class GetBootVolumeConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static GetBootVolumeRequest interceptRequest(GetBootVolumeRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, GetBootVolumeRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getBootVolumeId() == null) { + throw new NullPointerException("bootVolumeId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("bootVolumes") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getBootVolumeId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + return ib; + } + + public static com.google.common.base.Function + fromResponse() { + final com.google.common.base.Function + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, GetBootVolumeResponse>() { + @Override + public GetBootVolumeResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace("Transform function invoked for GetBootVolumeResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + BootVolume>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + BootVolume.class); + + com.oracle.bmc.http.internal.WithHeaders response = + responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + GetBootVolumeResponse.Builder builder = + GetBootVolumeResponse.builder(); + + builder.bootVolume(response.getItem()); + + com.google.common.base.Optional> etagHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "etag"); + if (etagHeader.isPresent()) { + builder.etag( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "etag", etagHeader.get().get(0), String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + GetBootVolumeResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetLocalPeeringGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetLocalPeeringGatewayConverter.java new file mode 100644 index 00000000000..9af39279253 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/GetLocalPeeringGatewayConverter.java @@ -0,0 +1,107 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class GetLocalPeeringGatewayConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static GetLocalPeeringGatewayRequest interceptRequest( + GetLocalPeeringGatewayRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, GetLocalPeeringGatewayRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getLocalPeeringGatewayId() == null) { + throw new NullPointerException("localPeeringGatewayId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("localPeeringGateways") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getLocalPeeringGatewayId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, GetLocalPeeringGatewayResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, GetLocalPeeringGatewayResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, GetLocalPeeringGatewayResponse>() { + @Override + public GetLocalPeeringGatewayResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for GetLocalPeeringGatewayResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + LocalPeeringGateway>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + LocalPeeringGateway.class); + + com.oracle.bmc.http.internal.WithHeaders + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + GetLocalPeeringGatewayResponse.Builder builder = + GetLocalPeeringGatewayResponse.builder(); + + builder.localPeeringGateway(response.getItem()); + + com.google.common.base.Optional> etagHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "etag"); + if (etagHeader.isPresent()) { + builder.etag( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "etag", etagHeader.get().get(0), String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + GetLocalPeeringGatewayResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumeAttachmentsConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumeAttachmentsConverter.java new file mode 100644 index 00000000000..14f00f28df9 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumeAttachmentsConverter.java @@ -0,0 +1,157 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class ListBootVolumeAttachmentsConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static ListBootVolumeAttachmentsRequest interceptRequest( + ListBootVolumeAttachmentsRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, + ListBootVolumeAttachmentsRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getAvailabilityDomain() == null) { + throw new NullPointerException("availabilityDomain is required"); + } + + if (request.getCompartmentId() == null) { + throw new NullPointerException("compartmentId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget().path("/20160918").path("bootVolumeAttachments"); + + target = + target.queryParam( + "availabilityDomain", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getAvailabilityDomain())); + + target = + target.queryParam( + "compartmentId", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getCompartmentId())); + + if (request.getLimit() != null) { + target = + target.queryParam( + "limit", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getLimit())); + } + + if (request.getPage() != null) { + target = + target.queryParam( + "page", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getPage())); + } + + if (request.getInstanceId() != null) { + target = + target.queryParam( + "instanceId", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getInstanceId())); + } + + if (request.getBootVolumeId() != null) { + target = + target.queryParam( + "bootVolumeId", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getBootVolumeId())); + } + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, ListBootVolumeAttachmentsResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, ListBootVolumeAttachmentsResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, ListBootVolumeAttachmentsResponse>() { + @Override + public ListBootVolumeAttachmentsResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for ListBootVolumeAttachmentsResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + java.util.List>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + new javax.ws.rs.core.GenericType< + java.util.List< + BootVolumeAttachment>>() {}); + + com.oracle.bmc.http.internal.WithHeaders< + java.util.List> + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + ListBootVolumeAttachmentsResponse.Builder builder = + ListBootVolumeAttachmentsResponse.builder(); + + builder.items(response.getItem()); + + com.google.common.base.Optional> + opcNextPageHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-next-page"); + if (opcNextPageHeader.isPresent()) { + builder.opcNextPage( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-next-page", + opcNextPageHeader.get().get(0), + String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + ListBootVolumeAttachmentsResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumesConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumesConverter.java new file mode 100644 index 00000000000..975aff874ea --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListBootVolumesConverter.java @@ -0,0 +1,135 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class ListBootVolumesConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static ListBootVolumesRequest interceptRequest(ListBootVolumesRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, ListBootVolumesRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getAvailabilityDomain() == null) { + throw new NullPointerException("availabilityDomain is required"); + } + + if (request.getCompartmentId() == null) { + throw new NullPointerException("compartmentId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget().path("/20160918").path("bootVolumes"); + + target = + target.queryParam( + "availabilityDomain", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getAvailabilityDomain())); + + target = + target.queryParam( + "compartmentId", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getCompartmentId())); + + if (request.getLimit() != null) { + target = + target.queryParam( + "limit", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getLimit())); + } + + if (request.getPage() != null) { + target = + target.queryParam( + "page", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getPage())); + } + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, ListBootVolumesResponse> + fromResponse() { + final com.google.common.base.Function + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, ListBootVolumesResponse>() { + @Override + public ListBootVolumesResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace("Transform function invoked for ListBootVolumesResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + java.util.List>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + new javax.ws.rs.core.GenericType< + java.util.List>() {}); + + com.oracle.bmc.http.internal.WithHeaders> + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + ListBootVolumesResponse.Builder builder = + ListBootVolumesResponse.builder(); + + builder.items(response.getItem()); + + com.google.common.base.Optional> + opcNextPageHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-next-page"); + if (opcNextPageHeader.isPresent()) { + builder.opcNextPage( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-next-page", + opcNextPageHeader.get().get(0), + String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + ListBootVolumesResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListLocalPeeringGatewaysConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListLocalPeeringGatewaysConverter.java new file mode 100644 index 00000000000..f5e4a52dc6d --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/ListLocalPeeringGatewaysConverter.java @@ -0,0 +1,141 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class ListLocalPeeringGatewaysConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static ListLocalPeeringGatewaysRequest interceptRequest( + ListLocalPeeringGatewaysRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, + ListLocalPeeringGatewaysRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getCompartmentId() == null) { + throw new NullPointerException("compartmentId is required"); + } + + if (request.getVcnId() == null) { + throw new NullPointerException("vcnId is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget().path("/20160918").path("localPeeringGateways"); + + target = + target.queryParam( + "compartmentId", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getCompartmentId())); + + if (request.getLimit() != null) { + target = + target.queryParam( + "limit", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getLimit())); + } + + if (request.getPage() != null) { + target = + target.queryParam( + "page", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getPage())); + } + + target = + target.queryParam( + "vcnId", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getVcnId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, ListLocalPeeringGatewaysResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, ListLocalPeeringGatewaysResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, ListLocalPeeringGatewaysResponse>() { + @Override + public ListLocalPeeringGatewaysResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for ListLocalPeeringGatewaysResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + java.util.List>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + new javax.ws.rs.core.GenericType< + java.util.List< + LocalPeeringGateway>>() {}); + + com.oracle.bmc.http.internal.WithHeaders< + java.util.List> + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + ListLocalPeeringGatewaysResponse.Builder builder = + ListLocalPeeringGatewaysResponse.builder(); + + builder.items(response.getItem()); + + com.google.common.base.Optional> + opcNextPageHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-next-page"); + if (opcNextPageHeader.isPresent()) { + builder.opcNextPage( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-next-page", + opcNextPageHeader.get().get(0), + String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + ListLocalPeeringGatewaysResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java index f32af4f5f34..08bd5b4e81e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/TerminateInstanceConverter.java @@ -37,6 +37,14 @@ public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( request.getInstanceId())); + if (request.getPreserveBootVolume() != null) { + target = + target.queryParam( + "preserveBootVolume", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getPreserveBootVolume())); + } + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateBootVolumeConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateBootVolumeConverter.java new file mode 100644 index 00000000000..6b3df7b45c5 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateBootVolumeConverter.java @@ -0,0 +1,113 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class UpdateBootVolumeConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static UpdateBootVolumeRequest interceptRequest(UpdateBootVolumeRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, UpdateBootVolumeRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getBootVolumeId() == null) { + throw new NullPointerException("bootVolumeId is required"); + } + + if (request.getUpdateBootVolumeDetails() == null) { + throw new NullPointerException("updateBootVolumeDetails is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("bootVolumes") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getBootVolumeId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + if (request.getIfMatch() != null) { + ib.header("if-match", request.getIfMatch()); + } + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateBootVolumeResponse> + fromResponse() { + final com.google.common.base.Function + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateBootVolumeResponse>() { + @Override + public UpdateBootVolumeResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for UpdateBootVolumeResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + BootVolume>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + BootVolume.class); + + com.oracle.bmc.http.internal.WithHeaders response = + responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + UpdateBootVolumeResponse.Builder builder = + UpdateBootVolumeResponse.builder(); + + builder.bootVolume(response.getItem()); + + com.google.common.base.Optional> etagHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "etag"); + if (etagHeader.isPresent()) { + builder.etag( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "etag", etagHeader.get().get(0), String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + UpdateBootVolumeResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateLocalPeeringGatewayConverter.java b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateLocalPeeringGatewayConverter.java new file mode 100644 index 00000000000..009fe7512ec --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/internal/http/UpdateLocalPeeringGatewayConverter.java @@ -0,0 +1,116 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.internal.http; + +import com.oracle.bmc.core.model.*; +import com.oracle.bmc.core.requests.*; +import com.oracle.bmc.core.responses.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class UpdateLocalPeeringGatewayConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static UpdateLocalPeeringGatewayRequest interceptRequest( + UpdateLocalPeeringGatewayRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, + UpdateLocalPeeringGatewayRequest request) { + if (request == null) { + throw new NullPointerException("request instance is required"); + } + + if (request.getLocalPeeringGatewayId() == null) { + throw new NullPointerException("localPeeringGatewayId is required"); + } + + if (request.getUpdateLocalPeeringGatewayDetails() == null) { + throw new NullPointerException("updateLocalPeeringGatewayDetails is required"); + } + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("localPeeringGateways") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getLocalPeeringGatewayId())); + + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); + + ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); + + if (request.getIfMatch() != null) { + ib.header("if-match", request.getIfMatch()); + } + + return ib; + } + + public static com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateLocalPeeringGatewayResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateLocalPeeringGatewayResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateLocalPeeringGatewayResponse>() { + @Override + public UpdateLocalPeeringGatewayResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for UpdateLocalPeeringGatewayResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + LocalPeeringGateway>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + LocalPeeringGateway.class); + + com.oracle.bmc.http.internal.WithHeaders + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + UpdateLocalPeeringGatewayResponse.Builder builder = + UpdateLocalPeeringGatewayResponse.builder(); + + builder.localPeeringGateway(response.getItem()); + + com.google.common.base.Optional> etagHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "etag"); + if (etagHeader.isPresent()) { + builder.etag( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "etag", etagHeader.get().get(0), String.class)); + } + + com.google.common.base.Optional> + opcRequestIdHeader = + com.oracle.bmc.http.internal.HeaderUtils.get( + headers, "opc-request-id"); + if (opcRequestIdHeader.isPresent()) { + builder.opcRequestId( + com.oracle.bmc.http.internal.HeaderUtils.toValue( + "opc-request-id", + opcRequestIdHeader.get().get(0), + String.class)); + } + + UpdateLocalPeeringGatewayResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachBootVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachBootVolumeDetails.java new file mode 100644 index 00000000000..49fef5585d8 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachBootVolumeDetails.java @@ -0,0 +1,93 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = AttachBootVolumeDetails.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class AttachBootVolumeDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("bootVolumeId") + private String bootVolumeId; + + public Builder bootVolumeId(String bootVolumeId) { + this.bootVolumeId = bootVolumeId; + this.__explicitlySet__.add("bootVolumeId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("instanceId") + private String instanceId; + + public Builder instanceId(String instanceId) { + this.instanceId = instanceId; + this.__explicitlySet__.add("instanceId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public AttachBootVolumeDetails build() { + AttachBootVolumeDetails __instance__ = + new AttachBootVolumeDetails(bootVolumeId, displayName, instanceId); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(AttachBootVolumeDetails o) { + Builder copiedBuilder = + bootVolumeId(o.getBootVolumeId()) + .displayName(o.getDisplayName()) + .instanceId(o.getInstanceId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The OCID of the boot volume. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("bootVolumeId") + String bootVolumeId; + + /** + * A user-friendly name. Does not have to be unique, and it cannot be changed. Avoid entering confidential information. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + /** + * The OCID of the instance. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("instanceId") + String instanceId; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachIScsiVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachIScsiVolumeDetails.java index 97da6049bf1..164ac5944e1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachIScsiVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachIScsiVolumeDetails.java @@ -68,10 +68,14 @@ public AttachIScsiVolumeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AttachIScsiVolumeDetails o) { - return displayName(o.getDisplayName()) - .instanceId(o.getInstanceId()) - .volumeId(o.getVolumeId()) - .useChap(o.getUseChap()); + Builder copiedBuilder = + displayName(o.getDisplayName()) + .instanceId(o.getInstanceId()) + .volumeId(o.getVolumeId()) + .useChap(o.getUseChap()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachVnicDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachVnicDetails.java index 157c6ad9871..7b0ea9501a6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachVnicDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachVnicDetails.java @@ -40,21 +40,35 @@ public Builder instanceId(String instanceId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("nicIndex") + private Integer nicIndex; + + public Builder nicIndex(Integer nicIndex) { + this.nicIndex = nicIndex; + this.__explicitlySet__.add("nicIndex"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public AttachVnicDetails build() { AttachVnicDetails __instance__ = - new AttachVnicDetails(createVnicDetails, displayName, instanceId); + new AttachVnicDetails(createVnicDetails, displayName, instanceId, nicIndex); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AttachVnicDetails o) { - return createVnicDetails(o.getCreateVnicDetails()) - .displayName(o.getDisplayName()) - .instanceId(o.getInstanceId()); + Builder copiedBuilder = + createVnicDetails(o.getCreateVnicDetails()) + .displayName(o.getDisplayName()) + .instanceId(o.getInstanceId()) + .nicIndex(o.getNicIndex()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -85,6 +99,17 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("instanceId") String instanceId; + /** + * Which physical network interface card (NIC) the VNIC will use. Defaults to 0. + * Certain bare metal instance shapes have two active physical NICs (0 and 1). If + * you add a secondary VNIC to one of these instances, you can specify which NIC + * the VNIC will use. For more information, see + * [Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm). + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("nicIndex") + Integer nicIndex; + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/BootVolume.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/BootVolume.java new file mode 100644 index 00000000000..849c1e14860 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/BootVolume.java @@ -0,0 +1,260 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +/** + * A detachable boot volume device that contains the image used to boot an Compute instance. For more information, see + * [Overview of Boot Volumes](https://docs.us-phoenix-1.oraclecloud.com/Content/Block/Concepts/bootvolumes.htm). + *

+ * To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized, + * talk to an administrator. If you're an administrator who needs to write policies to give users access, see + * [Getting Started with Policies](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/policygetstarted.htm). + * + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = BootVolume.Builder.class) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class BootVolume { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + private String availabilityDomain; + + public Builder availabilityDomain(String availabilityDomain) { + this.availabilityDomain = availabilityDomain; + this.__explicitlySet__.add("availabilityDomain"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + private String compartmentId; + + public Builder compartmentId(String compartmentId) { + this.compartmentId = compartmentId; + this.__explicitlySet__.add("compartmentId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; + + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("imageId") + private String imageId; + + public Builder imageId(String imageId) { + this.imageId = imageId; + this.__explicitlySet__.add("imageId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; + + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("sizeInGBs") + private Long sizeInGBs; + + public Builder sizeInGBs(Long sizeInGBs) { + this.sizeInGBs = sizeInGBs; + this.__explicitlySet__.add("sizeInGBs"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("sizeInMBs") + private Long sizeInMBs; + + public Builder sizeInMBs(Long sizeInMBs) { + this.sizeInMBs = sizeInMBs; + this.__explicitlySet__.add("sizeInMBs"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; + + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public BootVolume build() { + BootVolume __instance__ = + new BootVolume( + availabilityDomain, + compartmentId, + displayName, + id, + imageId, + lifecycleState, + sizeInGBs, + sizeInMBs, + timeCreated); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(BootVolume o) { + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .imageId(o.getImageId()) + .lifecycleState(o.getLifecycleState()) + .sizeInGBs(o.getSizeInGBs()) + .sizeInMBs(o.getSizeInMBs()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The Availability Domain of the boot volume. + *

+ * Example: `Uocm:PHX-AD-1` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + String availabilityDomain; + + /** + * The OCID of the compartment that contains the boot volume. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; + + /** + * A user-friendly name. Does not have to be unique, and it's changeable. + * Avoid entering confidential information. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + /** + * The boot volume's Oracle ID (OCID). + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The image OCID used to create the boot volume. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("imageId") + String imageId; + /** + * The current state of a boot volume. + **/ + @lombok.extern.slf4j.Slf4j + public enum LifecycleState { + Provisioning("PROVISIONING"), + Restoring("RESTORING"), + Available("AVAILABLE"), + Terminating("TERMINATING"), + Terminated("TERMINATED"), + Faulty("FAULTY"), + + /** + * This value is used if a service returns a value for this enum that is not recognized by this + * version of the SDK. + */ + UnknownEnumValue(null); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (LifecycleState v : LifecycleState.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + LifecycleState(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static LifecycleState create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; + /** + * The current state of a boot volume. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; + + /** + * The size of the boot volume in GBs. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("sizeInGBs") + Long sizeInGBs; + + /** + * The size of the volume in MBs. The value must be a multiple of 1024. + * This field is deprecated. Please use sizeInGBs. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("sizeInMBs") + Long sizeInMBs; + + /** + * The date and time the boot volume was created. Format defined by RFC3339. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/BootVolumeAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/BootVolumeAttachment.java new file mode 100644 index 00000000000..24a77354a91 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/BootVolumeAttachment.java @@ -0,0 +1,241 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +/** + * Represents an attachment between a boot volume and an instance. + * + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = BootVolumeAttachment.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class BootVolumeAttachment { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + private String availabilityDomain; + + public Builder availabilityDomain(String availabilityDomain) { + this.availabilityDomain = availabilityDomain; + this.__explicitlySet__.add("availabilityDomain"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("bootVolumeId") + private String bootVolumeId; + + public Builder bootVolumeId(String bootVolumeId) { + this.bootVolumeId = bootVolumeId; + this.__explicitlySet__.add("bootVolumeId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + private String compartmentId; + + public Builder compartmentId(String compartmentId) { + this.compartmentId = compartmentId; + this.__explicitlySet__.add("compartmentId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; + + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("instanceId") + private String instanceId; + + public Builder instanceId(String instanceId) { + this.instanceId = instanceId; + this.__explicitlySet__.add("instanceId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; + + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; + + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public BootVolumeAttachment build() { + BootVolumeAttachment __instance__ = + new BootVolumeAttachment( + availabilityDomain, + bootVolumeId, + compartmentId, + displayName, + id, + instanceId, + lifecycleState, + timeCreated); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(BootVolumeAttachment o) { + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .bootVolumeId(o.getBootVolumeId()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .instanceId(o.getInstanceId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The Availability Domain of an instance. + *

+ * Example: `Uocm:PHX-AD-1` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + String availabilityDomain; + + /** + * The OCID of the boot volume. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("bootVolumeId") + String bootVolumeId; + + /** + * The OCID of the compartment. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; + + /** + * A user-friendly name. Does not have to be unique, and it cannot be changed. + * Avoid entering confidential information. + *

+ * Example: `My boot volume` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + /** + * The OCID of the boot volume attachment. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The OCID of the instance the boot volume is attached to. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("instanceId") + String instanceId; + /** + * The current state of the boot volume attachment. + **/ + @lombok.extern.slf4j.Slf4j + public enum LifecycleState { + Attaching("ATTACHING"), + Attached("ATTACHED"), + Detaching("DETACHING"), + Detached("DETACHED"), + + /** + * This value is used if a service returns a value for this enum that is not recognized by this + * version of the SDK. + */ + UnknownEnumValue(null); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (LifecycleState v : LifecycleState.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + LifecycleState(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static LifecycleState create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; + /** + * The current state of the boot volume attachment. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; + + /** + * The date and time the boot volume was created, in the format defined by RFC3339. + *

+ * Example: `2016-08-25T21:10:29.600Z` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CaptureConsoleHistoryDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CaptureConsoleHistoryDetails.java index 84d88161536..ea81aec757d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CaptureConsoleHistoryDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CaptureConsoleHistoryDetails.java @@ -43,7 +43,10 @@ public CaptureConsoleHistoryDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CaptureConsoleHistoryDetails o) { - return displayName(o.getDisplayName()).instanceId(o.getInstanceId()); + Builder copiedBuilder = displayName(o.getDisplayName()).instanceId(o.getInstanceId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/ConnectLocalPeeringGatewaysDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/ConnectLocalPeeringGatewaysDetails.java new file mode 100644 index 00000000000..30a37890a26 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/ConnectLocalPeeringGatewaysDetails.java @@ -0,0 +1,62 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +/** + * Information about the other local peering gateway (LPG). + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = ConnectLocalPeeringGatewaysDetails.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class ConnectLocalPeeringGatewaysDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("peerId") + private String peerId; + + public Builder peerId(String peerId) { + this.peerId = peerId; + this.__explicitlySet__.add("peerId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public ConnectLocalPeeringGatewaysDetails build() { + ConnectLocalPeeringGatewaysDetails __instance__ = + new ConnectLocalPeeringGatewaysDetails(peerId); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(ConnectLocalPeeringGatewaysDetails o) { + Builder copiedBuilder = peerId(o.getPeerId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The OCID of the LPG you want to peer with. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("peerId") + String peerId; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/ConsoleHistory.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/ConsoleHistory.java index f55d2a8477e..e17b605ede3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/ConsoleHistory.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/ConsoleHistory.java @@ -99,13 +99,17 @@ public ConsoleHistory build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ConsoleHistory o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .instanceId(o.getInstanceId()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .instanceId(o.getInstanceId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Cpe.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Cpe.java index cd36fb474c7..7855ffe5822 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Cpe.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Cpe.java @@ -79,11 +79,15 @@ public Cpe build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Cpe o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .ipAddress(o.getIpAddress()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .ipAddress(o.getIpAddress()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java index 57992a9b108..58f7b3a56a1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java @@ -50,9 +50,13 @@ public CreateCpeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateCpeDetails o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .ipAddress(o.getIpAddress()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .ipAddress(o.getIpAddress()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCrossConnectDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCrossConnectDetails.java index 74d3c9ab98c..0acfdfcbe3d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCrossConnectDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCrossConnectDetails.java @@ -97,15 +97,19 @@ public CreateCrossConnectDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateCrossConnectDetails o) { - return compartmentId(o.getCompartmentId()) - .crossConnectGroupId(o.getCrossConnectGroupId()) - .displayName(o.getDisplayName()) - .farCrossConnectOrCrossConnectGroupId( - o.getFarCrossConnectOrCrossConnectGroupId()) - .locationName(o.getLocationName()) - .nearCrossConnectOrCrossConnectGroupId( - o.getNearCrossConnectOrCrossConnectGroupId()) - .portSpeedShapeName(o.getPortSpeedShapeName()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .crossConnectGroupId(o.getCrossConnectGroupId()) + .displayName(o.getDisplayName()) + .farCrossConnectOrCrossConnectGroupId( + o.getFarCrossConnectOrCrossConnectGroupId()) + .locationName(o.getLocationName()) + .nearCrossConnectOrCrossConnectGroupId( + o.getNearCrossConnectOrCrossConnectGroupId()) + .portSpeedShapeName(o.getPortSpeedShapeName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCrossConnectGroupDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCrossConnectGroupDetails.java index b4aa7216527..0e8beae335c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCrossConnectGroupDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCrossConnectGroupDetails.java @@ -43,7 +43,11 @@ public CreateCrossConnectGroupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateCrossConnectGroupDetails o) { - return compartmentId(o.getCompartmentId()).displayName(o.getDisplayName()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()).displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDhcpDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDhcpDetails.java index 54be2aa9a94..806974b91fb 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDhcpDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDhcpDetails.java @@ -61,10 +61,14 @@ public CreateDhcpDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDhcpDetails o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .options(o.getOptions()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .options(o.getOptions()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java index 7a298559c64..23f9285d0d1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java @@ -52,7 +52,11 @@ public CreateDrgAttachmentDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDrgAttachmentDetails o) { - return displayName(o.getDisplayName()).drgId(o.getDrgId()).vcnId(o.getVcnId()); + Builder copiedBuilder = + displayName(o.getDisplayName()).drgId(o.getDrgId()).vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgDetails.java index 460d3ea9c3d..7b0832a8a28 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgDetails.java @@ -40,7 +40,11 @@ public CreateDrgDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDrgDetails o) { - return compartmentId(o.getCompartmentId()).displayName(o.getDisplayName()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()).displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateIPSecConnectionDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateIPSecConnectionDetails.java index 544fee1e279..ae646345b40 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateIPSecConnectionDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateIPSecConnectionDetails.java @@ -71,11 +71,15 @@ public CreateIPSecConnectionDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateIPSecConnectionDetails o) { - return compartmentId(o.getCompartmentId()) - .cpeId(o.getCpeId()) - .displayName(o.getDisplayName()) - .drgId(o.getDrgId()) - .staticRoutes(o.getStaticRoutes()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .cpeId(o.getCpeId()) + .displayName(o.getDisplayName()) + .drgId(o.getDrgId()) + .staticRoutes(o.getStaticRoutes()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateImageDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateImageDetails.java index d363509f22b..b9b4f70507e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateImageDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateImageDetails.java @@ -65,10 +65,14 @@ public CreateImageDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateImageDetails o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .imageSourceDetails(o.getImageSourceDetails()) - .instanceId(o.getInstanceId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .imageSourceDetails(o.getImageSourceDetails()) + .instanceId(o.getInstanceId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInstanceConsoleConnectionDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInstanceConsoleConnectionDetails.java index 5b3ec107443..c450a966410 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInstanceConsoleConnectionDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInstanceConsoleConnectionDetails.java @@ -4,8 +4,8 @@ package com.oracle.bmc.core.model; /** - * The details for creating a serial console connection. - * The serial console connection is created in the same compartment as the instance. + * The details for creating a instance console connection. + * The instance console connection is created in the same compartment as the instance. * **/ @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @@ -48,7 +48,10 @@ public CreateInstanceConsoleConnectionDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateInstanceConsoleConnectionDetails o) { - return instanceId(o.getInstanceId()).publicKey(o.getPublicKey()); + Builder copiedBuilder = instanceId(o.getInstanceId()).publicKey(o.getPublicKey()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -60,13 +63,13 @@ public static Builder builder() { } /** - * The OCID of the instance to create the serial console connection to. + * The OCID of the instance to create the console connection to. **/ @com.fasterxml.jackson.annotation.JsonProperty("instanceId") String instanceId; /** - * The SSH public key used to authenticate the serial console connection. + * The SSH public key used to authenticate the console connection. **/ @com.fasterxml.jackson.annotation.JsonProperty("publicKey") String publicKey; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInternetGatewayDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInternetGatewayDetails.java index 756b40fc1e5..d8874e791f8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInternetGatewayDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInternetGatewayDetails.java @@ -61,10 +61,14 @@ public CreateInternetGatewayDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateInternetGatewayDetails o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .isEnabled(o.getIsEnabled()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .isEnabled(o.getIsEnabled()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateLocalPeeringGatewayDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateLocalPeeringGatewayDetails.java new file mode 100644 index 00000000000..ede3d8df40c --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateLocalPeeringGatewayDetails.java @@ -0,0 +1,94 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = CreateLocalPeeringGatewayDetails.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class CreateLocalPeeringGatewayDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + private String compartmentId; + + public Builder compartmentId(String compartmentId) { + this.compartmentId = compartmentId; + this.__explicitlySet__.add("compartmentId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("vcnId") + private String vcnId; + + public Builder vcnId(String vcnId) { + this.vcnId = vcnId; + this.__explicitlySet__.add("vcnId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public CreateLocalPeeringGatewayDetails build() { + CreateLocalPeeringGatewayDetails __instance__ = + new CreateLocalPeeringGatewayDetails(compartmentId, displayName, vcnId); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(CreateLocalPeeringGatewayDetails o) { + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The OCID of the compartment containing the local peering gateway (LPG). + **/ + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; + + /** + * A user-friendly name. Does not have to be unique, and it's changeable. Avoid + * entering confidential information. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + /** + * The OCID of the VCN the LPG belongs to. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("vcnId") + String vcnId; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreatePrivateIpDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreatePrivateIpDetails.java index 39871c7dca4..eb4cee33751 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreatePrivateIpDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreatePrivateIpDetails.java @@ -61,10 +61,14 @@ public CreatePrivateIpDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreatePrivateIpDetails o) { - return displayName(o.getDisplayName()) - .hostnameLabel(o.getHostnameLabel()) - .ipAddress(o.getIpAddress()) - .vnicId(o.getVnicId()); + Builder copiedBuilder = + displayName(o.getDisplayName()) + .hostnameLabel(o.getHostnameLabel()) + .ipAddress(o.getIpAddress()) + .vnicId(o.getVnicId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateRouteTableDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateRouteTableDetails.java index 93848d9d71c..6bd6be73e40 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateRouteTableDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateRouteTableDetails.java @@ -61,10 +61,14 @@ public CreateRouteTableDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateRouteTableDetails o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .routeRules(o.getRouteRules()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .routeRules(o.getRouteRules()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSecurityListDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSecurityListDetails.java index 68d4a654f21..bfc23af4e02 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSecurityListDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSecurityListDetails.java @@ -76,11 +76,15 @@ public CreateSecurityListDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateSecurityListDetails o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .egressSecurityRules(o.getEgressSecurityRules()) - .ingressSecurityRules(o.getIngressSecurityRules()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .egressSecurityRules(o.getEgressSecurityRules()) + .ingressSecurityRules(o.getIngressSecurityRules()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java index 285be5357c6..1bbb7ccac6d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java @@ -125,16 +125,20 @@ public CreateSubnetDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateSubnetDetails o) { - return availabilityDomain(o.getAvailabilityDomain()) - .cidrBlock(o.getCidrBlock()) - .compartmentId(o.getCompartmentId()) - .dhcpOptionsId(o.getDhcpOptionsId()) - .displayName(o.getDisplayName()) - .dnsLabel(o.getDnsLabel()) - .prohibitPublicIpOnVnic(o.getProhibitPublicIpOnVnic()) - .routeTableId(o.getRouteTableId()) - .securityListIds(o.getSecurityListIds()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .cidrBlock(o.getCidrBlock()) + .compartmentId(o.getCompartmentId()) + .dhcpOptionsId(o.getDhcpOptionsId()) + .displayName(o.getDisplayName()) + .dnsLabel(o.getDnsLabel()) + .prohibitPublicIpOnVnic(o.getProhibitPublicIpOnVnic()) + .routeTableId(o.getRouteTableId()) + .securityListIds(o.getSecurityListIds()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java index f1bc5ffd7fb..c6d1bae54af 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java @@ -59,10 +59,14 @@ public CreateVcnDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateVcnDetails o) { - return cidrBlock(o.getCidrBlock()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .dnsLabel(o.getDnsLabel()); + Builder copiedBuilder = + cidrBlock(o.getCidrBlock()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .dnsLabel(o.getDnsLabel()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVirtualCircuitDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVirtualCircuitDetails.java index 60a1d3962cd..8139127e85d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVirtualCircuitDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVirtualCircuitDetails.java @@ -126,16 +126,20 @@ public CreateVirtualCircuitDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateVirtualCircuitDetails o) { - return bandwidthShapeName(o.getBandwidthShapeName()) - .compartmentId(o.getCompartmentId()) - .crossConnectMappings(o.getCrossConnectMappings()) - .customerBgpAsn(o.getCustomerBgpAsn()) - .displayName(o.getDisplayName()) - .gatewayId(o.getGatewayId()) - .providerName(o.getProviderName()) - .providerServiceName(o.getProviderServiceName()) - .region(o.getRegion()) - .type(o.getType()); + Builder copiedBuilder = + bandwidthShapeName(o.getBandwidthShapeName()) + .compartmentId(o.getCompartmentId()) + .crossConnectMappings(o.getCrossConnectMappings()) + .customerBgpAsn(o.getCustomerBgpAsn()) + .displayName(o.getDisplayName()) + .gatewayId(o.getGatewayId()) + .providerName(o.getProviderName()) + .providerServiceName(o.getProviderServiceName()) + .region(o.getRegion()) + .type(o.getType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVnicDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVnicDetails.java index ce538147aef..decd24215d5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVnicDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVnicDetails.java @@ -92,12 +92,16 @@ public CreateVnicDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateVnicDetails o) { - return assignPublicIp(o.getAssignPublicIp()) - .displayName(o.getDisplayName()) - .hostnameLabel(o.getHostnameLabel()) - .privateIp(o.getPrivateIp()) - .skipSourceDestCheck(o.getSkipSourceDestCheck()) - .subnetId(o.getSubnetId()); + Builder copiedBuilder = + assignPublicIp(o.getAssignPublicIp()) + .displayName(o.getDisplayName()) + .hostnameLabel(o.getHostnameLabel()) + .privateIp(o.getPrivateIp()) + .skipSourceDestCheck(o.getSkipSourceDestCheck()) + .subnetId(o.getSubnetId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeBackupDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeBackupDetails.java index cb5d51c9730..823e3bd36ab 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeBackupDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeBackupDetails.java @@ -43,7 +43,10 @@ public CreateVolumeBackupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateVolumeBackupDetails o) { - return displayName(o.getDisplayName()).volumeId(o.getVolumeId()); + Builder copiedBuilder = displayName(o.getDisplayName()).volumeId(o.getVolumeId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java index 74a85e5b6a3..6a010c012a7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java @@ -95,13 +95,17 @@ public CreateVolumeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateVolumeDetails o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .sizeInGBs(o.getSizeInGBs()) - .sizeInMBs(o.getSizeInMBs()) - .sourceDetails(o.getSourceDetails()) - .volumeBackupId(o.getVolumeBackupId()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .sizeInGBs(o.getSizeInGBs()) + .sizeInMBs(o.getSizeInMBs()) + .sourceDetails(o.getSourceDetails()) + .volumeBackupId(o.getVolumeBackupId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnect.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnect.java index 6f0ccaea977..f547d2370b2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnect.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnect.java @@ -132,15 +132,19 @@ public CrossConnect build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CrossConnect o) { - return compartmentId(o.getCompartmentId()) - .crossConnectGroupId(o.getCrossConnectGroupId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .locationName(o.getLocationName()) - .portName(o.getPortName()) - .portSpeedShapeName(o.getPortSpeedShapeName()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .crossConnectGroupId(o.getCrossConnectGroupId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .locationName(o.getLocationName()) + .portName(o.getPortName()) + .portSpeedShapeName(o.getPortSpeedShapeName()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectGroup.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectGroup.java index fef0cf21354..f63c7a91f12 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectGroup.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectGroup.java @@ -87,11 +87,15 @@ public CrossConnectGroup build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CrossConnectGroup o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectLocation.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectLocation.java index 16140dcb00f..3777c1f4bb2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectLocation.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectLocation.java @@ -45,7 +45,10 @@ public CrossConnectLocation build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CrossConnectLocation o) { - return description(o.getDescription()).name(o.getName()); + Builder copiedBuilder = description(o.getDescription()).name(o.getName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectMapping.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectMapping.java index 32a0df149eb..3eac357c048 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectMapping.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectMapping.java @@ -100,11 +100,16 @@ public CrossConnectMapping build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CrossConnectMapping o) { - return bgpMd5AuthKey(o.getBgpMd5AuthKey()) - .crossConnectOrCrossConnectGroupId(o.getCrossConnectOrCrossConnectGroupId()) - .customerBgpPeeringIp(o.getCustomerBgpPeeringIp()) - .oracleBgpPeeringIp(o.getOracleBgpPeeringIp()) - .vlan(o.getVlan()); + Builder copiedBuilder = + bgpMd5AuthKey(o.getBgpMd5AuthKey()) + .crossConnectOrCrossConnectGroupId( + o.getCrossConnectOrCrossConnectGroupId()) + .customerBgpPeeringIp(o.getCustomerBgpPeeringIp()) + .oracleBgpPeeringIp(o.getOracleBgpPeeringIp()) + .vlan(o.getVlan()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectPortSpeedShape.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectPortSpeedShape.java index efa30dd9643..5e5bdcb67c5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectPortSpeedShape.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectPortSpeedShape.java @@ -47,7 +47,10 @@ public CrossConnectPortSpeedShape build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CrossConnectPortSpeedShape o) { - return name(o.getName()).portSpeedInGbps(o.getPortSpeedInGbps()); + Builder copiedBuilder = name(o.getName()).portSpeedInGbps(o.getPortSpeedInGbps()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectStatus.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectStatus.java index ebdea379c48..05d1c16e94d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectStatus.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectStatus.java @@ -65,10 +65,14 @@ public CrossConnectStatus build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CrossConnectStatus o) { - return crossConnectId(o.getCrossConnectId()) - .interfaceState(o.getInterfaceState()) - .lightLevelIndBm(o.getLightLevelIndBm()) - .lightLevelIndicator(o.getLightLevelIndicator()); + Builder copiedBuilder = + crossConnectId(o.getCrossConnectId()) + .interfaceState(o.getInterfaceState()) + .lightLevelIndBm(o.getLightLevelIndBm()) + .lightLevelIndicator(o.getLightLevelIndicator()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpDnsOption.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpDnsOption.java index 51ac7ac8cdf..1167347be40 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpDnsOption.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpDnsOption.java @@ -53,7 +53,11 @@ public DhcpDnsOption build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DhcpDnsOption o) { - return customDnsServers(o.getCustomDnsServers()).serverType(o.getServerType()); + Builder copiedBuilder = + customDnsServers(o.getCustomDnsServers()).serverType(o.getServerType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java index 4e53c78c514..1f03a0a71ad 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java @@ -111,13 +111,17 @@ public DhcpOptions build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DhcpOptions o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .options(o.getOptions()) - .timeCreated(o.getTimeCreated()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .options(o.getOptions()) + .timeCreated(o.getTimeCreated()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpSearchDomainOption.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpSearchDomainOption.java index c740b46eb91..4389fec9c3f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpSearchDomainOption.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpSearchDomainOption.java @@ -45,7 +45,10 @@ public DhcpSearchDomainOption build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DhcpSearchDomainOption o) { - return searchDomainNames(o.getSearchDomainNames()); + Builder copiedBuilder = searchDomainNames(o.getSearchDomainNames()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Drg.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Drg.java index 9fd1e14986a..4ec0efe2dcf 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Drg.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Drg.java @@ -79,11 +79,15 @@ public Drg build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Drg o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DrgAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DrgAttachment.java index 0897a950c9c..ea63af6fb2c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DrgAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DrgAttachment.java @@ -98,13 +98,17 @@ public DrgAttachment build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DrgAttachment o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .drgId(o.getDrgId()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .drgId(o.getDrgId()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/EgressSecurityRule.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/EgressSecurityRule.java index 503a50e80dc..6ac0ce3b18d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/EgressSecurityRule.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/EgressSecurityRule.java @@ -88,12 +88,16 @@ public EgressSecurityRule build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(EgressSecurityRule o) { - return destination(o.getDestination()) - .icmpOptions(o.getIcmpOptions()) - .isStateless(o.getIsStateless()) - .protocol(o.getProtocol()) - .tcpOptions(o.getTcpOptions()) - .udpOptions(o.getUdpOptions()); + Builder copiedBuilder = + destination(o.getDestination()) + .icmpOptions(o.getIcmpOptions()) + .isStateless(o.getIsStateless()) + .protocol(o.getProtocol()) + .tcpOptions(o.getTcpOptions()) + .udpOptions(o.getUdpOptions()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/ExportImageViaObjectStorageTupleDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/ExportImageViaObjectStorageTupleDetails.java index af8062cd622..8274b1c448f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/ExportImageViaObjectStorageTupleDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/ExportImageViaObjectStorageTupleDetails.java @@ -60,9 +60,13 @@ public ExportImageViaObjectStorageTupleDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ExportImageViaObjectStorageTupleDetails o) { - return bucketName(o.getBucketName()) - .namespaceName(o.getNamespaceName()) - .objectName(o.getObjectName()); + Builder copiedBuilder = + bucketName(o.getBucketName()) + .namespaceName(o.getNamespaceName()) + .objectName(o.getObjectName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/ExportImageViaObjectStorageUriDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/ExportImageViaObjectStorageUriDetails.java index 5cf4656f4d7..d2d90291553 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/ExportImageViaObjectStorageUriDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/ExportImageViaObjectStorageUriDetails.java @@ -41,7 +41,10 @@ public ExportImageViaObjectStorageUriDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ExportImageViaObjectStorageUriDetails o) { - return destinationUri(o.getDestinationUri()); + Builder copiedBuilder = destinationUri(o.getDestinationUri()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/FastConnectProviderService.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/FastConnectProviderService.java index 843aad4a602..8cc60b6b285 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/FastConnectProviderService.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/FastConnectProviderService.java @@ -57,9 +57,13 @@ public FastConnectProviderService build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(FastConnectProviderService o) { - return description(o.getDescription()) - .providerName(o.getProviderName()) - .providerServiceName(o.getProviderServiceName()); + Builder copiedBuilder = + description(o.getDescription()) + .providerName(o.getProviderName()) + .providerServiceName(o.getProviderServiceName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnection.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnection.java index 45952cbfed0..7ba71d22b4a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnection.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnection.java @@ -114,14 +114,18 @@ public IPSecConnection build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(IPSecConnection o) { - return compartmentId(o.getCompartmentId()) - .cpeId(o.getCpeId()) - .displayName(o.getDisplayName()) - .drgId(o.getDrgId()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .staticRoutes(o.getStaticRoutes()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .cpeId(o.getCpeId()) + .displayName(o.getDisplayName()) + .drgId(o.getDrgId()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .staticRoutes(o.getStaticRoutes()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceConfig.java index 2a39ffef207..ed9eccc5d6f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceConfig.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceConfig.java @@ -64,10 +64,14 @@ public IPSecConnectionDeviceConfig build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(IPSecConnectionDeviceConfig o) { - return compartmentId(o.getCompartmentId()) - .id(o.getId()) - .timeCreated(o.getTimeCreated()) - .tunnels(o.getTunnels()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .id(o.getId()) + .timeCreated(o.getTimeCreated()) + .tunnels(o.getTunnels()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceStatus.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceStatus.java index 2cf188bf6d2..7e190b25394 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceStatus.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IPSecConnectionDeviceStatus.java @@ -64,10 +64,14 @@ public IPSecConnectionDeviceStatus build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(IPSecConnectionDeviceStatus o) { - return compartmentId(o.getCompartmentId()) - .id(o.getId()) - .timeCreated(o.getTimeCreated()) - .tunnels(o.getTunnels()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .id(o.getId()) + .timeCreated(o.getTimeCreated()) + .tunnels(o.getTunnels()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IScsiVolumeAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IScsiVolumeAttachment.java index d942e642c6e..6bbcb56a373 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IScsiVolumeAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IScsiVolumeAttachment.java @@ -165,19 +165,23 @@ public IScsiVolumeAttachment build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(IScsiVolumeAttachment o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .instanceId(o.getInstanceId()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()) - .volumeId(o.getVolumeId()) - .chapSecret(o.getChapSecret()) - .chapUsername(o.getChapUsername()) - .ipv4(o.getIpv4()) - .iqn(o.getIqn()) - .port(o.getPort()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .instanceId(o.getInstanceId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()) + .volumeId(o.getVolumeId()) + .chapSecret(o.getChapSecret()) + .chapUsername(o.getChapUsername()) + .ipv4(o.getIpv4()) + .iqn(o.getIqn()) + .port(o.getPort()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IcmpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IcmpOptions.java index 61866dd7d2b..37fcdc91230 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IcmpOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IcmpOptions.java @@ -50,7 +50,10 @@ public IcmpOptions build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(IcmpOptions o) { - return code(o.getCode()).type(o.getType()); + Builder copiedBuilder = code(o.getCode()).type(o.getType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Image.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Image.java index 51aa6918ec3..25bffd19b29 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Image.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Image.java @@ -122,15 +122,19 @@ public Image build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Image o) { - return baseImageId(o.getBaseImageId()) - .compartmentId(o.getCompartmentId()) - .createImageAllowed(o.getCreateImageAllowed()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .operatingSystem(o.getOperatingSystem()) - .operatingSystemVersion(o.getOperatingSystemVersion()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + baseImageId(o.getBaseImageId()) + .compartmentId(o.getCompartmentId()) + .createImageAllowed(o.getCreateImageAllowed()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .operatingSystem(o.getOperatingSystem()) + .operatingSystemVersion(o.getOperatingSystemVersion()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/ImageSourceViaObjectStorageTupleDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/ImageSourceViaObjectStorageTupleDetails.java index 7ebf6ed82bf..062048c2e68 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/ImageSourceViaObjectStorageTupleDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/ImageSourceViaObjectStorageTupleDetails.java @@ -60,9 +60,13 @@ public ImageSourceViaObjectStorageTupleDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ImageSourceViaObjectStorageTupleDetails o) { - return bucketName(o.getBucketName()) - .namespaceName(o.getNamespaceName()) - .objectName(o.getObjectName()); + Builder copiedBuilder = + bucketName(o.getBucketName()) + .namespaceName(o.getNamespaceName()) + .objectName(o.getObjectName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/ImageSourceViaObjectStorageUriDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/ImageSourceViaObjectStorageUriDetails.java index c427427ffb4..f6a98a9e5ec 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/ImageSourceViaObjectStorageUriDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/ImageSourceViaObjectStorageUriDetails.java @@ -41,7 +41,10 @@ public ImageSourceViaObjectStorageUriDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ImageSourceViaObjectStorageUriDetails o) { - return sourceUri(o.getSourceUri()); + Builder copiedBuilder = sourceUri(o.getSourceUri()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/IngressSecurityRule.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/IngressSecurityRule.java index 82ab3d36f03..3e425294209 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/IngressSecurityRule.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/IngressSecurityRule.java @@ -83,12 +83,16 @@ public IngressSecurityRule build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(IngressSecurityRule o) { - return icmpOptions(o.getIcmpOptions()) - .isStateless(o.getIsStateless()) - .protocol(o.getProtocol()) - .source(o.getSource()) - .tcpOptions(o.getTcpOptions()) - .udpOptions(o.getUdpOptions()); + Builder copiedBuilder = + icmpOptions(o.getIcmpOptions()) + .isStateless(o.getIsStateless()) + .protocol(o.getProtocol()) + .source(o.getSource()) + .tcpOptions(o.getTcpOptions()) + .udpOptions(o.getUdpOptions()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java index d7693f8ebd5..5795dba2046 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java @@ -121,6 +121,15 @@ public Builder shape(String shape) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("sourceDetails") + private InstanceSourceDetails sourceDetails; + + public Builder sourceDetails(InstanceSourceDetails sourceDetails) { + this.sourceDetails = sourceDetails; + this.__explicitlySet__.add("sourceDetails"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") private java.util.Date timeCreated; @@ -147,6 +156,7 @@ public Instance build() { metadata, region, shape, + sourceDetails, timeCreated); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; @@ -154,18 +164,23 @@ public Instance build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Instance o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .extendedMetadata(o.getExtendedMetadata()) - .id(o.getId()) - .imageId(o.getImageId()) - .ipxeScript(o.getIpxeScript()) - .lifecycleState(o.getLifecycleState()) - .metadata(o.getMetadata()) - .region(o.getRegion()) - .shape(o.getShape()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .extendedMetadata(o.getExtendedMetadata()) + .id(o.getId()) + .imageId(o.getImageId()) + .ipxeScript(o.getIpxeScript()) + .lifecycleState(o.getLifecycleState()) + .metadata(o.getMetadata()) + .region(o.getRegion()) + .shape(o.getShape()) + .sourceDetails(o.getSourceDetails()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -219,8 +234,7 @@ public static Builder builder() { String id; /** - * The image used to boot the instance. You can enumerate all available images by calling - * {@link #listImages(ListImagesRequest) listImages}. + * Deprecated. Use `sourceDetails` instead. * **/ @com.fasterxml.jackson.annotation.JsonProperty("imageId") @@ -335,6 +349,12 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("shape") String shape; + /** + * Details for creating an instance + **/ + @com.fasterxml.jackson.annotation.JsonProperty("sourceDetails") + InstanceSourceDetails sourceDetails; + /** * The date and time the instance was created, in the format defined by RFC3339. *

diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConsoleConnection.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConsoleConnection.java index ed79923fbb9..21ddc29cb33 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConsoleConnection.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConsoleConnection.java @@ -4,11 +4,11 @@ package com.oracle.bmc.core.model; /** - * The `InstanceConsoleConnection` API provides you with serial console access to virtual machine (VM) instances, + * The `InstanceConsoleConnection` API provides you with console access to virtual machine (VM) instances, * enabling you to troubleshoot malfunctioning instances remotely. *

- * For more information about serial console access, see - * [Accessing the Serial Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). + * For more information about console access, see + * [Accessing the Console](https://docs.us-phoenix-1.oraclecloud.com/Content/Compute/References/serialconsole.htm). * **/ @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") @@ -93,12 +93,16 @@ public InstanceConsoleConnection build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(InstanceConsoleConnection o) { - return compartmentId(o.getCompartmentId()) - .connectionString(o.getConnectionString()) - .fingerprint(o.getFingerprint()) - .id(o.getId()) - .instanceId(o.getInstanceId()) - .lifecycleState(o.getLifecycleState()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .connectionString(o.getConnectionString()) + .fingerprint(o.getFingerprint()) + .id(o.getId()) + .instanceId(o.getInstanceId()) + .lifecycleState(o.getLifecycleState()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -110,36 +114,36 @@ public static Builder builder() { } /** - * The OCID of the compartment to contain the serial console connection. + * The OCID of the compartment to contain the console connection. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; /** - * The SSH connection string for the serial console connection. + * The SSH connection string for the console connection. **/ @com.fasterxml.jackson.annotation.JsonProperty("connectionString") String connectionString; /** - * The SSH public key fingerprint for the serial console connection. + * The SSH public key fingerprint for the console connection. **/ @com.fasterxml.jackson.annotation.JsonProperty("fingerprint") String fingerprint; /** - * The OCID of the serial console connection. + * The OCID of the console connection. **/ @com.fasterxml.jackson.annotation.JsonProperty("id") String id; /** - * The OCID of the instance the serial console connection connects to. + * The OCID of the instance the console connection connects to. **/ @com.fasterxml.jackson.annotation.JsonProperty("instanceId") String instanceId; /** - * The current state of the serial console connection. + * The current state of the console connection. **/ @lombok.extern.slf4j.Slf4j public enum LifecycleState { @@ -188,7 +192,7 @@ public static LifecycleState create(String key) { } }; /** - * The current state of the serial console connection. + * The current state of the console connection. **/ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceCredentials.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceCredentials.java index 1a0bd22943e..839459a764f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceCredentials.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceCredentials.java @@ -45,7 +45,10 @@ public InstanceCredentials build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(InstanceCredentials o) { - return password(o.getPassword()).username(o.getUsername()); + Builder copiedBuilder = password(o.getPassword()).username(o.getUsername()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceDetails.java new file mode 100644 index 00000000000..708aa331c1f --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceDetails.java @@ -0,0 +1,27 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@lombok.experimental.NonFinal +@lombok.AllArgsConstructor(access = lombok.AccessLevel.PROTECTED) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "sourceType", + defaultImpl = InstanceSourceDetails.class +) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = InstanceSourceViaImageDetails.class, + name = "image" + ), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = InstanceSourceViaBootVolumeDetails.class, + name = "bootVolume" + ) +}) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class InstanceSourceDetails {} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceViaBootVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceViaBootVolumeDetails.java new file mode 100644 index 00000000000..cc488e73917 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceViaBootVolumeDetails.java @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = InstanceSourceViaBootVolumeDetails.Builder.class +) +@lombok.ToString(callSuper = true) +@lombok.EqualsAndHashCode(callSuper = true) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "sourceType" +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class InstanceSourceViaBootVolumeDetails extends InstanceSourceDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("bootVolumeId") + private String bootVolumeId; + + public Builder bootVolumeId(String bootVolumeId) { + this.bootVolumeId = bootVolumeId; + this.__explicitlySet__.add("bootVolumeId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public InstanceSourceViaBootVolumeDetails build() { + InstanceSourceViaBootVolumeDetails __instance__ = + new InstanceSourceViaBootVolumeDetails(bootVolumeId); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(InstanceSourceViaBootVolumeDetails o) { + Builder copiedBuilder = bootVolumeId(o.getBootVolumeId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + public InstanceSourceViaBootVolumeDetails(String bootVolumeId) { + super(); + this.bootVolumeId = bootVolumeId; + } + + /** + * The OCID of the boot volume used to boot the instance. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("bootVolumeId") + String bootVolumeId; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceViaImageDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceViaImageDetails.java new file mode 100644 index 00000000000..abfa1d038d6 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceSourceViaImageDetails.java @@ -0,0 +1,70 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = InstanceSourceViaImageDetails.Builder.class +) +@lombok.ToString(callSuper = true) +@lombok.EqualsAndHashCode(callSuper = true) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "sourceType" +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class InstanceSourceViaImageDetails extends InstanceSourceDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("imageId") + private String imageId; + + public Builder imageId(String imageId) { + this.imageId = imageId; + this.__explicitlySet__.add("imageId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public InstanceSourceViaImageDetails build() { + InstanceSourceViaImageDetails __instance__ = new InstanceSourceViaImageDetails(imageId); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(InstanceSourceViaImageDetails o) { + Builder copiedBuilder = imageId(o.getImageId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + public InstanceSourceViaImageDetails(String imageId) { + super(); + this.imageId = imageId; + } + + /** + * The OCID of the image used to boot the instance. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("imageId") + String imageId; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InternetGateway.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InternetGateway.java index fa4ef0ae7c2..beaaa25e353 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/InternetGateway.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InternetGateway.java @@ -103,13 +103,17 @@ public InternetGateway build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(InternetGateway o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .isEnabled(o.getIsEnabled()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .isEnabled(o.getIsEnabled()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceDetails.java index ef70f5cbe81..1b43829683e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceDetails.java @@ -103,6 +103,15 @@ public Builder shape(String shape) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("sourceDetails") + private InstanceSourceDetails sourceDetails; + + public Builder sourceDetails(InstanceSourceDetails sourceDetails) { + this.sourceDetails = sourceDetails; + this.__explicitlySet__.add("sourceDetails"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") private String subnetId; @@ -128,6 +137,7 @@ public LaunchInstanceDetails build() { ipxeScript, metadata, shape, + sourceDetails, subnetId); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; @@ -135,17 +145,22 @@ public LaunchInstanceDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LaunchInstanceDetails o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .createVnicDetails(o.getCreateVnicDetails()) - .displayName(o.getDisplayName()) - .extendedMetadata(o.getExtendedMetadata()) - .hostnameLabel(o.getHostnameLabel()) - .imageId(o.getImageId()) - .ipxeScript(o.getIpxeScript()) - .metadata(o.getMetadata()) - .shape(o.getShape()) - .subnetId(o.getSubnetId()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .createVnicDetails(o.getCreateVnicDetails()) + .displayName(o.getDisplayName()) + .extendedMetadata(o.getExtendedMetadata()) + .hostnameLabel(o.getHostnameLabel()) + .imageId(o.getImageId()) + .ipxeScript(o.getIpxeScript()) + .metadata(o.getMetadata()) + .shape(o.getShape()) + .sourceDetails(o.getSourceDetails()) + .subnetId(o.getSubnetId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -201,7 +216,7 @@ public static Builder builder() { java.util.Map extendedMetadata; /** - * Deprecated. Instead use `hostnameLabel` in + * Deprecated. Instead Use `hostnameLabel` in * {@link CreateVnicDetails}. * If you provide both, the values must match. * @@ -210,7 +225,9 @@ public static Builder builder() { String hostnameLabel; /** - * The OCID of the image used to boot the instance. + * Deprecated. Use `sourceDetails` with {@link #instanceSourceViaImageDetails(InstanceSourceViaImageDetailsRequest) instanceSourceViaImageDetails} + * source type instead. If you specify values for both, the values must match. + * **/ @com.fasterxml.jackson.annotation.JsonProperty("imageId") String imageId; @@ -319,6 +336,12 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("shape") String shape; + /** + * Details for creating an instance. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("sourceDetails") + InstanceSourceDetails sourceDetails; + /** * Deprecated. Instead use `subnetId` in * {@link CreateVnicDetails}. diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/LetterOfAuthority.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LetterOfAuthority.java index ce061c626a2..fff97611f72 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/LetterOfAuthority.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/LetterOfAuthority.java @@ -90,12 +90,16 @@ public LetterOfAuthority build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LetterOfAuthority o) { - return circuitType(o.getCircuitType()) - .crossConnectId(o.getCrossConnectId()) - .facilityLocation(o.getFacilityLocation()) - .portName(o.getPortName()) - .timeExpires(o.getTimeExpires()) - .timeIssued(o.getTimeIssued()); + Builder copiedBuilder = + circuitType(o.getCircuitType()) + .crossConnectId(o.getCrossConnectId()) + .facilityLocation(o.getFacilityLocation()) + .portName(o.getPortName()) + .timeExpires(o.getTimeExpires()) + .timeIssued(o.getTimeIssued()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/LocalPeeringGateway.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LocalPeeringGateway.java new file mode 100644 index 00000000000..d6e52b108dc --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/LocalPeeringGateway.java @@ -0,0 +1,341 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +/** + * A local peering gateway (LPG) is an object on a VCN that lets that VCN peer + * with another VCN in the same region. *Peering* means that the two VCNs can + * communicate using private IP addresses, but without the traffic traversing the + * internet or routing through your on-premises network. For more information, + * see [VCN Peering](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/VCNpeering.htm). + *

+ * To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized, + * talk to an administrator. If you're an administrator who needs to write policies to give users access, see + * [Getting Started with Policies](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/policygetstarted.htm). + * + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = LocalPeeringGateway.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class LocalPeeringGateway { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + private String compartmentId; + + public Builder compartmentId(String compartmentId) { + this.compartmentId = compartmentId; + this.__explicitlySet__.add("compartmentId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; + + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("isCrossTenancyPeering") + private Boolean isCrossTenancyPeering; + + public Builder isCrossTenancyPeering(Boolean isCrossTenancyPeering) { + this.isCrossTenancyPeering = isCrossTenancyPeering; + this.__explicitlySet__.add("isCrossTenancyPeering"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; + + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("peerAdvertisedCidr") + private String peerAdvertisedCidr; + + public Builder peerAdvertisedCidr(String peerAdvertisedCidr) { + this.peerAdvertisedCidr = peerAdvertisedCidr; + this.__explicitlySet__.add("peerAdvertisedCidr"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("peeringStatus") + private PeeringStatus peeringStatus; + + public Builder peeringStatus(PeeringStatus peeringStatus) { + this.peeringStatus = peeringStatus; + this.__explicitlySet__.add("peeringStatus"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("peeringStatusDetails") + private String peeringStatusDetails; + + public Builder peeringStatusDetails(String peeringStatusDetails) { + this.peeringStatusDetails = peeringStatusDetails; + this.__explicitlySet__.add("peeringStatusDetails"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; + + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("vcnId") + private String vcnId; + + public Builder vcnId(String vcnId) { + this.vcnId = vcnId; + this.__explicitlySet__.add("vcnId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public LocalPeeringGateway build() { + LocalPeeringGateway __instance__ = + new LocalPeeringGateway( + compartmentId, + displayName, + id, + isCrossTenancyPeering, + lifecycleState, + peerAdvertisedCidr, + peeringStatus, + peeringStatusDetails, + timeCreated, + vcnId); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(LocalPeeringGateway o) { + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .isCrossTenancyPeering(o.getIsCrossTenancyPeering()) + .lifecycleState(o.getLifecycleState()) + .peerAdvertisedCidr(o.getPeerAdvertisedCidr()) + .peeringStatus(o.getPeeringStatus()) + .peeringStatusDetails(o.getPeeringStatusDetails()) + .timeCreated(o.getTimeCreated()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The OCID of the compartment containing the LPG. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; + + /** + * A user-friendly name. Does not have to be unique, and it's changeable. Avoid + * entering confidential information. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + /** + * The LPG's Oracle ID (OCID). + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * Whether the VCN at the other end of the peering is in a different tenancy. + *

+ * Example: `false` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("isCrossTenancyPeering") + Boolean isCrossTenancyPeering; + /** + * The LPG's current lifecycle state. + **/ + @lombok.extern.slf4j.Slf4j + public enum LifecycleState { + Provisioning("PROVISIONING"), + Available("AVAILABLE"), + Terminating("TERMINATING"), + Terminated("TERMINATED"), + + /** + * This value is used if a service returns a value for this enum that is not recognized by this + * version of the SDK. + */ + UnknownEnumValue(null); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (LifecycleState v : LifecycleState.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + LifecycleState(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static LifecycleState create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; + /** + * The LPG's current lifecycle state. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; + + /** + * The range of IP addresses available on the VCN at the other + * end of the peering from this LPG. The value is `null` if the LPG is not peered. + * You can use this as the destination CIDR for a route rule to route a subnet's + * traffic to this LPG. + *

+ * Example: `192.168.0.0/16` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("peerAdvertisedCidr") + String peerAdvertisedCidr; + /** + * Whether the LPG is peered with another LPG. `NEW` means the LPG has not yet been + * peered. `PENDING` means the peering is being established. `REVOKED` means the + * LPG at the other end of the peering has been deleted. + * + **/ + @lombok.extern.slf4j.Slf4j + public enum PeeringStatus { + Invalid("INVALID"), + New("NEW"), + Peered("PEERED"), + Pending("PENDING"), + Revoked("REVOKED"), + + /** + * This value is used if a service returns a value for this enum that is not recognized by this + * version of the SDK. + */ + UnknownEnumValue(null); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (PeeringStatus v : PeeringStatus.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + PeeringStatus(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static PeeringStatus create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'PeeringStatus', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; + /** + * Whether the LPG is peered with another LPG. `NEW` means the LPG has not yet been + * peered. `PENDING` means the peering is being established. `REVOKED` means the + * LPG at the other end of the peering has been deleted. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("peeringStatus") + PeeringStatus peeringStatus; + + /** + * Additional information regarding the peering status, if applicable. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("peeringStatusDetails") + String peeringStatusDetails; + + /** + * The date and time the LPG was created, in the format defined by RFC3339. + *

+ * Example: `2016-08-25T21:10:29.600Z` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; + + /** + * The OCID of the VCN the LPG belongs to. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("vcnId") + String vcnId; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/PortRange.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/PortRange.java index 4e3334c1568..38a357222ce 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/PortRange.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/PortRange.java @@ -40,7 +40,10 @@ public PortRange build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PortRange o) { - return max(o.getMax()).min(o.getMin()); + Builder copiedBuilder = max(o.getMax()).min(o.getMin()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/PrivateIp.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/PrivateIp.java index c1d437387ff..ff281d0873e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/PrivateIp.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/PrivateIp.java @@ -153,16 +153,20 @@ public PrivateIp build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PrivateIp o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .hostnameLabel(o.getHostnameLabel()) - .id(o.getId()) - .ipAddress(o.getIpAddress()) - .isPrimary(o.getIsPrimary()) - .subnetId(o.getSubnetId()) - .timeCreated(o.getTimeCreated()) - .vnicId(o.getVnicId()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .hostnameLabel(o.getHostnameLabel()) + .id(o.getId()) + .ipAddress(o.getIpAddress()) + .isPrimary(o.getIsPrimary()) + .subnetId(o.getSubnetId()) + .timeCreated(o.getTimeCreated()) + .vnicId(o.getVnicId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteRule.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteRule.java index 3fc7598fa6b..662c69dcb05 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteRule.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteRule.java @@ -45,7 +45,11 @@ public RouteRule build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(RouteRule o) { - return cidrBlock(o.getCidrBlock()).networkEntityId(o.getNetworkEntityId()); + Builder copiedBuilder = + cidrBlock(o.getCidrBlock()).networkEntityId(o.getNetworkEntityId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteTable.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteTable.java index 7e69068851b..5376ee47b51 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteTable.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/RouteTable.java @@ -103,13 +103,17 @@ public RouteTable build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(RouteTable o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .routeRules(o.getRouteRules()) - .timeCreated(o.getTimeCreated()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .routeRules(o.getRouteRules()) + .timeCreated(o.getTimeCreated()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java index ce1ffb6ef72..6d838c915e8 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java @@ -120,14 +120,18 @@ public SecurityList build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(SecurityList o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .egressSecurityRules(o.getEgressSecurityRules()) - .id(o.getId()) - .ingressSecurityRules(o.getIngressSecurityRules()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()) - .vcnId(o.getVcnId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .egressSecurityRules(o.getEgressSecurityRules()) + .id(o.getId()) + .ingressSecurityRules(o.getIngressSecurityRules()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()) + .vcnId(o.getVcnId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Shape.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Shape.java index 784a90e568c..9c47e15a797 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Shape.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Shape.java @@ -36,7 +36,10 @@ public Shape build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Shape o) { - return shape(o.getShape()); + Builder copiedBuilder = shape(o.getShape()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java index 9d9af5c120b..eb0329233f0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java @@ -195,22 +195,26 @@ public Subnet build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Subnet o) { - return availabilityDomain(o.getAvailabilityDomain()) - .cidrBlock(o.getCidrBlock()) - .compartmentId(o.getCompartmentId()) - .dhcpOptionsId(o.getDhcpOptionsId()) - .displayName(o.getDisplayName()) - .dnsLabel(o.getDnsLabel()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .prohibitPublicIpOnVnic(o.getProhibitPublicIpOnVnic()) - .routeTableId(o.getRouteTableId()) - .securityListIds(o.getSecurityListIds()) - .subnetDomainName(o.getSubnetDomainName()) - .timeCreated(o.getTimeCreated()) - .vcnId(o.getVcnId()) - .virtualRouterIp(o.getVirtualRouterIp()) - .virtualRouterMac(o.getVirtualRouterMac()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .cidrBlock(o.getCidrBlock()) + .compartmentId(o.getCompartmentId()) + .dhcpOptionsId(o.getDhcpOptionsId()) + .displayName(o.getDisplayName()) + .dnsLabel(o.getDnsLabel()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .prohibitPublicIpOnVnic(o.getProhibitPublicIpOnVnic()) + .routeTableId(o.getRouteTableId()) + .securityListIds(o.getSecurityListIds()) + .subnetDomainName(o.getSubnetDomainName()) + .timeCreated(o.getTimeCreated()) + .vcnId(o.getVcnId()) + .virtualRouterIp(o.getVirtualRouterIp()) + .virtualRouterMac(o.getVirtualRouterMac()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/TcpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/TcpOptions.java index db6466c6c92..94bf10b77d0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/TcpOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/TcpOptions.java @@ -45,8 +45,12 @@ public TcpOptions build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(TcpOptions o) { - return destinationPortRange(o.getDestinationPortRange()) - .sourcePortRange(o.getSourcePortRange()); + Builder copiedBuilder = + destinationPortRange(o.getDestinationPortRange()) + .sourcePortRange(o.getSourcePortRange()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelConfig.java index 77d4447bd12..c08ef934772 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelConfig.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelConfig.java @@ -52,9 +52,13 @@ public TunnelConfig build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(TunnelConfig o) { - return ipAddress(o.getIpAddress()) - .sharedSecret(o.getSharedSecret()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + ipAddress(o.getIpAddress()) + .sharedSecret(o.getSharedSecret()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelStatus.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelStatus.java index ce9b1bd033e..4291f81482a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelStatus.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/TunnelStatus.java @@ -63,10 +63,14 @@ public TunnelStatus build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(TunnelStatus o) { - return ipAddress(o.getIpAddress()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()) - .timeStateModified(o.getTimeStateModified()); + Builder copiedBuilder = + ipAddress(o.getIpAddress()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()) + .timeStateModified(o.getTimeStateModified()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UdpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UdpOptions.java index beaf0fac5c1..0d2fe5fde92 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UdpOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UdpOptions.java @@ -45,8 +45,12 @@ public UdpOptions build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UdpOptions o) { - return destinationPortRange(o.getDestinationPortRange()) - .sourcePortRange(o.getSourcePortRange()); + Builder copiedBuilder = + destinationPortRange(o.getDestinationPortRange()) + .sourcePortRange(o.getSourcePortRange()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateBootVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateBootVolumeDetails.java new file mode 100644 index 00000000000..bf23aab2b96 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateBootVolumeDetails.java @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = UpdateBootVolumeDetails.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class UpdateBootVolumeDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public UpdateBootVolumeDetails build() { + UpdateBootVolumeDetails __instance__ = new UpdateBootVolumeDetails(displayName); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(UpdateBootVolumeDetails o) { + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * A user-friendly name. Does not have to be unique, and it's changeable. + * Avoid entering confidential information. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateConsoleHistoryDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateConsoleHistoryDetails.java index d94fcd0714a..14a083e76a5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateConsoleHistoryDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateConsoleHistoryDetails.java @@ -33,7 +33,10 @@ public UpdateConsoleHistoryDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateConsoleHistoryDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCpeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCpeDetails.java index df6048f8c82..7791c924156 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCpeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCpeDetails.java @@ -31,7 +31,10 @@ public UpdateCpeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateCpeDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCrossConnectDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCrossConnectDetails.java index 7b1767caddd..75830bb7022 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCrossConnectDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCrossConnectDetails.java @@ -47,7 +47,10 @@ public UpdateCrossConnectDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateCrossConnectDetails o) { - return displayName(o.getDisplayName()).isActive(o.getIsActive()); + Builder copiedBuilder = displayName(o.getDisplayName()).isActive(o.getIsActive()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCrossConnectGroupDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCrossConnectGroupDetails.java index d64e1efb036..ff08d6ce66d 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCrossConnectGroupDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateCrossConnectGroupDetails.java @@ -34,7 +34,10 @@ public UpdateCrossConnectGroupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateCrossConnectGroupDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDhcpDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDhcpDetails.java index 371e1b238c4..ae244a33c43 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDhcpDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDhcpDetails.java @@ -42,7 +42,10 @@ public UpdateDhcpDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateDhcpDetails o) { - return displayName(o.getDisplayName()).options(o.getOptions()); + Builder copiedBuilder = displayName(o.getDisplayName()).options(o.getOptions()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgAttachmentDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgAttachmentDetails.java index 54e8ce3239c..84f7ff29a9f 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgAttachmentDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgAttachmentDetails.java @@ -33,7 +33,10 @@ public UpdateDrgAttachmentDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateDrgAttachmentDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgDetails.java index 14323bf548f..abb3bd20840 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateDrgDetails.java @@ -31,7 +31,10 @@ public UpdateDrgDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateDrgDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateIPSecConnectionDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateIPSecConnectionDetails.java index 95c86277e4a..c23ce0517fc 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateIPSecConnectionDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateIPSecConnectionDetails.java @@ -34,7 +34,10 @@ public UpdateIPSecConnectionDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateIPSecConnectionDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateImageDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateImageDetails.java index 159fc68863c..f9783e7b5f5 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateImageDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateImageDetails.java @@ -33,7 +33,10 @@ public UpdateImageDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateImageDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java index 6fe6c27b486..65d1769a7c0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java @@ -33,7 +33,10 @@ public UpdateInstanceDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateInstanceDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInternetGatewayDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInternetGatewayDetails.java index a2e87701207..5c8123264d1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInternetGatewayDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInternetGatewayDetails.java @@ -43,7 +43,10 @@ public UpdateInternetGatewayDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateInternetGatewayDetails o) { - return displayName(o.getDisplayName()).isEnabled(o.getIsEnabled()); + Builder copiedBuilder = displayName(o.getDisplayName()).isEnabled(o.getIsEnabled()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateLocalPeeringGatewayDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateLocalPeeringGatewayDetails.java new file mode 100644 index 00000000000..45af2bd0adf --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateLocalPeeringGatewayDetails.java @@ -0,0 +1,61 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = UpdateLocalPeeringGatewayDetails.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class UpdateLocalPeeringGatewayDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public UpdateLocalPeeringGatewayDetails build() { + UpdateLocalPeeringGatewayDetails __instance__ = + new UpdateLocalPeeringGatewayDetails(displayName); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(UpdateLocalPeeringGatewayDetails o) { + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * A user-friendly name. Does not have to be unique, and it's changeable. Avoid + * entering confidential information. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdatePrivateIpDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdatePrivateIpDetails.java index c62a3ae7c26..882af1dffd6 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdatePrivateIpDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdatePrivateIpDetails.java @@ -52,9 +52,13 @@ public UpdatePrivateIpDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdatePrivateIpDetails o) { - return displayName(o.getDisplayName()) - .hostnameLabel(o.getHostnameLabel()) - .vnicId(o.getVnicId()); + Builder copiedBuilder = + displayName(o.getDisplayName()) + .hostnameLabel(o.getHostnameLabel()) + .vnicId(o.getVnicId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateRouteTableDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateRouteTableDetails.java index 914bb16ea18..59300e36cd7 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateRouteTableDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateRouteTableDetails.java @@ -43,7 +43,10 @@ public UpdateRouteTableDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateRouteTableDetails o) { - return displayName(o.getDisplayName()).routeRules(o.getRouteRules()); + Builder copiedBuilder = displayName(o.getDisplayName()).routeRules(o.getRouteRules()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSecurityListDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSecurityListDetails.java index e0812e2abe2..e1c561ba0b9 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSecurityListDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSecurityListDetails.java @@ -54,9 +54,13 @@ public UpdateSecurityListDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateSecurityListDetails o) { - return displayName(o.getDisplayName()) - .egressSecurityRules(o.getEgressSecurityRules()) - .ingressSecurityRules(o.getIngressSecurityRules()); + Builder copiedBuilder = + displayName(o.getDisplayName()) + .egressSecurityRules(o.getEgressSecurityRules()) + .ingressSecurityRules(o.getIngressSecurityRules()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSubnetDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSubnetDetails.java index 0ed1cee4a6e..5db1fb7c8c3 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSubnetDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateSubnetDetails.java @@ -33,7 +33,10 @@ public UpdateSubnetDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateSubnetDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVcnDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVcnDetails.java index ada21894e62..6698809e357 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVcnDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVcnDetails.java @@ -31,7 +31,10 @@ public UpdateVcnDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateVcnDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVirtualCircuitDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVirtualCircuitDetails.java index 3299ba7f936..050d778924c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVirtualCircuitDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVirtualCircuitDetails.java @@ -96,13 +96,17 @@ public UpdateVirtualCircuitDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateVirtualCircuitDetails o) { - return bandwidthShapeName(o.getBandwidthShapeName()) - .crossConnectMappings(o.getCrossConnectMappings()) - .customerBgpAsn(o.getCustomerBgpAsn()) - .displayName(o.getDisplayName()) - .gatewayId(o.getGatewayId()) - .providerState(o.getProviderState()) - .referenceComment(o.getReferenceComment()); + Builder copiedBuilder = + bandwidthShapeName(o.getBandwidthShapeName()) + .crossConnectMappings(o.getCrossConnectMappings()) + .customerBgpAsn(o.getCustomerBgpAsn()) + .displayName(o.getDisplayName()) + .gatewayId(o.getGatewayId()) + .providerState(o.getProviderState()) + .referenceComment(o.getReferenceComment()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVnicDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVnicDetails.java index 403521cd143..f96f539a304 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVnicDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVnicDetails.java @@ -52,9 +52,13 @@ public UpdateVnicDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateVnicDetails o) { - return displayName(o.getDisplayName()) - .hostnameLabel(o.getHostnameLabel()) - .skipSourceDestCheck(o.getSkipSourceDestCheck()); + Builder copiedBuilder = + displayName(o.getDisplayName()) + .hostnameLabel(o.getHostnameLabel()) + .skipSourceDestCheck(o.getSkipSourceDestCheck()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeBackupDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeBackupDetails.java index 103aa171358..6921b9cd3a2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeBackupDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeBackupDetails.java @@ -33,7 +33,10 @@ public UpdateVolumeBackupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateVolumeBackupDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeDetails.java index d2e3e54f51e..62f5d9b005e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVolumeDetails.java @@ -33,7 +33,10 @@ public UpdateVolumeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateVolumeDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java index 05a08a696ff..eb11673e2ab 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java @@ -142,17 +142,21 @@ public Vcn build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Vcn o) { - return cidrBlock(o.getCidrBlock()) - .compartmentId(o.getCompartmentId()) - .defaultDhcpOptionsId(o.getDefaultDhcpOptionsId()) - .defaultRouteTableId(o.getDefaultRouteTableId()) - .defaultSecurityListId(o.getDefaultSecurityListId()) - .displayName(o.getDisplayName()) - .dnsLabel(o.getDnsLabel()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()) - .vcnDomainName(o.getVcnDomainName()); + Builder copiedBuilder = + cidrBlock(o.getCidrBlock()) + .compartmentId(o.getCompartmentId()) + .defaultDhcpOptionsId(o.getDefaultDhcpOptionsId()) + .defaultRouteTableId(o.getDefaultRouteTableId()) + .defaultSecurityListId(o.getDefaultSecurityListId()) + .displayName(o.getDisplayName()) + .dnsLabel(o.getDnsLabel()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()) + .vcnDomainName(o.getVcnDomainName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuit.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuit.java index 8771d762b8e..9824d5bd8b0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuit.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuit.java @@ -218,23 +218,27 @@ public VirtualCircuit build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(VirtualCircuit o) { - return bandwidthShapeName(o.getBandwidthShapeName()) - .bgpSessionState(o.getBgpSessionState()) - .compartmentId(o.getCompartmentId()) - .crossConnectMappings(o.getCrossConnectMappings()) - .customerBgpAsn(o.getCustomerBgpAsn()) - .displayName(o.getDisplayName()) - .gatewayId(o.getGatewayId()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .oracleBgpAsn(o.getOracleBgpAsn()) - .providerName(o.getProviderName()) - .providerServiceName(o.getProviderServiceName()) - .providerState(o.getProviderState()) - .referenceComment(o.getReferenceComment()) - .region(o.getRegion()) - .timeCreated(o.getTimeCreated()) - .type(o.getType()); + Builder copiedBuilder = + bandwidthShapeName(o.getBandwidthShapeName()) + .bgpSessionState(o.getBgpSessionState()) + .compartmentId(o.getCompartmentId()) + .crossConnectMappings(o.getCrossConnectMappings()) + .customerBgpAsn(o.getCustomerBgpAsn()) + .displayName(o.getDisplayName()) + .gatewayId(o.getGatewayId()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .oracleBgpAsn(o.getOracleBgpAsn()) + .providerName(o.getProviderName()) + .providerServiceName(o.getProviderServiceName()) + .providerState(o.getProviderState()) + .referenceComment(o.getReferenceComment()) + .region(o.getRegion()) + .timeCreated(o.getTimeCreated()) + .type(o.getType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuitBandwidthShape.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuitBandwidthShape.java index 72f11b586ab..db11c2f5696 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuitBandwidthShape.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuitBandwidthShape.java @@ -47,7 +47,10 @@ public VirtualCircuitBandwidthShape build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(VirtualCircuitBandwidthShape o) { - return bandwidthInMbps(o.getBandwidthInMbps()).name(o.getName()); + Builder copiedBuilder = bandwidthInMbps(o.getBandwidthInMbps()).name(o.getName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java index b939b67187c..47e3d57457e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java @@ -171,19 +171,23 @@ public Vnic build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Vnic o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .hostnameLabel(o.getHostnameLabel()) - .id(o.getId()) - .isPrimary(o.getIsPrimary()) - .lifecycleState(o.getLifecycleState()) - .macAddress(o.getMacAddress()) - .privateIp(o.getPrivateIp()) - .publicIp(o.getPublicIp()) - .skipSourceDestCheck(o.getSkipSourceDestCheck()) - .subnetId(o.getSubnetId()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .hostnameLabel(o.getHostnameLabel()) + .id(o.getId()) + .isPrimary(o.getIsPrimary()) + .lifecycleState(o.getLifecycleState()) + .macAddress(o.getMacAddress()) + .privateIp(o.getPrivateIp()) + .publicIp(o.getPublicIp()) + .skipSourceDestCheck(o.getSkipSourceDestCheck()) + .subnetId(o.getSubnetId()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java index 278842d1114..34cc8e945ad 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java @@ -70,6 +70,15 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("nicIndex") + private Integer nicIndex; + + public Builder nicIndex(Integer nicIndex) { + this.nicIndex = nicIndex; + this.__explicitlySet__.add("nicIndex"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") private String subnetId; @@ -118,6 +127,7 @@ public VnicAttachment build() { id, instanceId, lifecycleState, + nicIndex, subnetId, timeCreated, vlanTag, @@ -128,16 +138,21 @@ public VnicAttachment build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(VnicAttachment o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .instanceId(o.getInstanceId()) - .lifecycleState(o.getLifecycleState()) - .subnetId(o.getSubnetId()) - .timeCreated(o.getTimeCreated()) - .vlanTag(o.getVlanTag()) - .vnicId(o.getVnicId()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .instanceId(o.getInstanceId()) + .lifecycleState(o.getLifecycleState()) + .nicIndex(o.getNicIndex()) + .subnetId(o.getSubnetId()) + .timeCreated(o.getTimeCreated()) + .vlanTag(o.getVlanTag()) + .vnicId(o.getVnicId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -238,6 +253,17 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; + /** + * Which physical network interface card (NIC) the VNIC uses. + * Certain bare metal instance shapes have two active physical NICs (0 and 1). If + * you add a secondary VNIC to one of these instances, you can specify which NIC + * the VNIC will use. For more information, see + * [Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm). + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("nicIndex") + Integer nicIndex; + /** * The OCID of the VNIC's subnet. **/ diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java index 6d52e5e774c..a2aa732eca2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java @@ -133,16 +133,20 @@ public Volume build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Volume o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .isHydrated(o.getIsHydrated()) - .lifecycleState(o.getLifecycleState()) - .sizeInGBs(o.getSizeInGBs()) - .sizeInMBs(o.getSizeInMBs()) - .sourceDetails(o.getSourceDetails()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .isHydrated(o.getIsHydrated()) + .lifecycleState(o.getLifecycleState()) + .sizeInGBs(o.getSizeInGBs()) + .sizeInMBs(o.getSizeInMBs()) + .sourceDetails(o.getSourceDetails()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java index 0c1c99aa6b1..edd4e26fba0 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java @@ -143,17 +143,21 @@ public VolumeBackup build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(VolumeBackup o) { - return compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .sizeInGBs(o.getSizeInGBs()) - .sizeInMBs(o.getSizeInMBs()) - .timeCreated(o.getTimeCreated()) - .timeRequestReceived(o.getTimeRequestReceived()) - .uniqueSizeInGBs(o.getUniqueSizeInGBs()) - .uniqueSizeInMbs(o.getUniqueSizeInMbs()) - .volumeId(o.getVolumeId()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .sizeInGBs(o.getSizeInGBs()) + .sizeInMBs(o.getSizeInMBs()) + .timeCreated(o.getTimeCreated()) + .timeRequestReceived(o.getTimeRequestReceived()) + .uniqueSizeInGBs(o.getUniqueSizeInGBs()) + .uniqueSizeInMbs(o.getUniqueSizeInMbs()) + .volumeId(o.getVolumeId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeSourceFromVolumeBackupDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeSourceFromVolumeBackupDetails.java index ae897c51571..f430e521b70 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeSourceFromVolumeBackupDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeSourceFromVolumeBackupDetails.java @@ -44,7 +44,10 @@ public VolumeSourceFromVolumeBackupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(VolumeSourceFromVolumeBackupDetails o) { - return id(o.getId()); + Builder copiedBuilder = id(o.getId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeSourceFromVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeSourceFromVolumeDetails.java index 7bb4d785ab9..7a405ecc858 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeSourceFromVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeSourceFromVolumeDetails.java @@ -43,7 +43,10 @@ public VolumeSourceFromVolumeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(VolumeSourceFromVolumeDetails o) { - return id(o.getId()); + Builder copiedBuilder = id(o.getId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 new file mode 100644 index 00000000000..18426664a90 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachBootVolumeRequest.java @@ -0,0 +1,70 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class AttachBootVolumeRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * Attach boot volume request + */ + private AttachBootVolumeDetails attachBootVolumeDetails; + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after 24 + * hours, but can be invalidated before then due to conflicting operations (for example, if a resource + * has been deleted and purged from the system, then a retry of the original creation request + * may be rejected). + * + */ + private String opcRetryToken; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(AttachBootVolumeRequest o) { + attachBootVolumeDetails(o.getAttachBootVolumeDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + + /** + * Build the instance of AttachBootVolumeRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of AttachBootVolumeRequest + */ + public AttachBootVolumeRequest build() { + AttachBootVolumeRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..66223b9f445 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ConnectLocalPeeringGatewaysRequest.java @@ -0,0 +1,65 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class ConnectLocalPeeringGatewaysRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the local peering gateway. + */ + private String localPeeringGatewayId; + + /** + * Details regarding the local peering gateway to connect. + */ + private ConnectLocalPeeringGatewaysDetails connectLocalPeeringGatewaysDetails; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ConnectLocalPeeringGatewaysRequest o) { + localPeeringGatewayId(o.getLocalPeeringGatewayId()); + connectLocalPeeringGatewaysDetails(o.getConnectLocalPeeringGatewaysDetails()); + return this; + } + + /** + * Build the instance of ConnectLocalPeeringGatewaysRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of ConnectLocalPeeringGatewaysRequest + */ + public ConnectLocalPeeringGatewaysRequest build() { + ConnectLocalPeeringGatewaysRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..360d1671fa6 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateLocalPeeringGatewayRequest.java @@ -0,0 +1,70 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class CreateLocalPeeringGatewayRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * Details for creating a new local peering gateway. + */ + private CreateLocalPeeringGatewayDetails createLocalPeeringGatewayDetails; + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after 24 + * hours, but can be invalidated before then due to conflicting operations (for example, if a resource + * has been deleted and purged from the system, then a retry of the original creation request + * may be rejected). + * + */ + private String opcRetryToken; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateLocalPeeringGatewayRequest o) { + createLocalPeeringGatewayDetails(o.getCreateLocalPeeringGatewayDetails()); + opcRetryToken(o.getOpcRetryToken()); + return this; + } + + /** + * Build the instance of CreateLocalPeeringGatewayRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of CreateLocalPeeringGatewayRequest + */ + public CreateLocalPeeringGatewayRequest build() { + CreateLocalPeeringGatewayRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..98ebc4e77b9 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteBootVolumeRequest.java @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class DeleteBootVolumeRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the boot volume. + */ + private String bootVolumeId; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + * parameter to the value of the etag from a previous GET or POST response for that resource. The resource + * will be updated or deleted only if the etag you provide matches the resource's current etag value. + * + */ + private String ifMatch; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteBootVolumeRequest o) { + bootVolumeId(o.getBootVolumeId()); + ifMatch(o.getIfMatch()); + return this; + } + + /** + * Build the instance of DeleteBootVolumeRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of DeleteBootVolumeRequest + */ + public DeleteBootVolumeRequest build() { + DeleteBootVolumeRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..3cf6a41c5df --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteLocalPeeringGatewayRequest.java @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class DeleteLocalPeeringGatewayRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the local peering gateway. + */ + private String localPeeringGatewayId; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + * parameter to the value of the etag from a previous GET or POST response for that resource. The resource + * will be updated or deleted only if the etag you provide matches the resource's current etag value. + * + */ + private String ifMatch; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteLocalPeeringGatewayRequest o) { + localPeeringGatewayId(o.getLocalPeeringGatewayId()); + ifMatch(o.getIfMatch()); + return this; + } + + /** + * Build the instance of DeleteLocalPeeringGatewayRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of DeleteLocalPeeringGatewayRequest + */ + public DeleteLocalPeeringGatewayRequest build() { + DeleteLocalPeeringGatewayRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..6f9302a2ca4 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DetachBootVolumeRequest.java @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class DetachBootVolumeRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the boot volume attachment. + */ + private String bootVolumeAttachmentId; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + * parameter to the value of the etag from a previous GET or POST response for that resource. The resource + * will be updated or deleted only if the etag you provide matches the resource's current etag value. + * + */ + private String ifMatch; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DetachBootVolumeRequest o) { + bootVolumeAttachmentId(o.getBootVolumeAttachmentId()); + ifMatch(o.getIfMatch()); + return this; + } + + /** + * Build the instance of DetachBootVolumeRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of DetachBootVolumeRequest + */ + public DetachBootVolumeRequest build() { + DetachBootVolumeRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..7ec7184bb1a --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeAttachmentRequest.java @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class GetBootVolumeAttachmentRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the boot volume attachment. + */ + private String bootVolumeAttachmentId; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetBootVolumeAttachmentRequest o) { + bootVolumeAttachmentId(o.getBootVolumeAttachmentId()); + return this; + } + + /** + * Build the instance of GetBootVolumeAttachmentRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of GetBootVolumeAttachmentRequest + */ + public GetBootVolumeAttachmentRequest build() { + GetBootVolumeAttachmentRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..7bb915d106a --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetBootVolumeRequest.java @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class GetBootVolumeRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the boot volume. + */ + private String bootVolumeId; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetBootVolumeRequest o) { + bootVolumeId(o.getBootVolumeId()); + return this; + } + + /** + * Build the instance of GetBootVolumeRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of GetBootVolumeRequest + */ + public GetBootVolumeRequest build() { + GetBootVolumeRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..f2f6f53d77a --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetLocalPeeringGatewayRequest.java @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class GetLocalPeeringGatewayRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the local peering gateway. + */ + private String localPeeringGatewayId; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetLocalPeeringGatewayRequest o) { + localPeeringGatewayId(o.getLocalPeeringGatewayId()); + return this; + } + + /** + * Build the instance of GetLocalPeeringGatewayRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of GetLocalPeeringGatewayRequest + */ + public GetLocalPeeringGatewayRequest build() { + GetLocalPeeringGatewayRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..e443e7f9c73 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumeAttachmentsRequest.java @@ -0,0 +1,96 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class ListBootVolumeAttachmentsRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The name of the Availability Domain. + *

+ * Example: `Uocm:PHX-AD-1` + * + */ + private String availabilityDomain; + + /** + * The OCID of the compartment. + */ + private String compartmentId; + + /** + * The maximum number of items to return in a paginated \"List\" call. + *

+ * Example: `500` + * + */ + private Integer limit; + + /** + * The value of the `opc-next-page` response header from the previous \"List\" call. + * + */ + private String page; + + /** + * The OCID of the instance. + */ + private String instanceId; + + /** + * The OCID of the boot volume. + */ + private String bootVolumeId; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListBootVolumeAttachmentsRequest o) { + availabilityDomain(o.getAvailabilityDomain()); + compartmentId(o.getCompartmentId()); + limit(o.getLimit()); + page(o.getPage()); + instanceId(o.getInstanceId()); + bootVolumeId(o.getBootVolumeId()); + return this; + } + + /** + * Build the instance of ListBootVolumeAttachmentsRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of ListBootVolumeAttachmentsRequest + */ + public ListBootVolumeAttachmentsRequest build() { + ListBootVolumeAttachmentsRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..2b7eedde0ba --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListBootVolumesRequest.java @@ -0,0 +1,84 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class ListBootVolumesRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The name of the Availability Domain. + *

+ * Example: `Uocm:PHX-AD-1` + * + */ + private String availabilityDomain; + + /** + * The OCID of the compartment. + */ + private String compartmentId; + + /** + * The maximum number of items to return in a paginated \"List\" call. + *

+ * Example: `500` + * + */ + private Integer limit; + + /** + * The value of the `opc-next-page` response header from the previous \"List\" call. + * + */ + private String page; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListBootVolumesRequest o) { + availabilityDomain(o.getAvailabilityDomain()); + compartmentId(o.getCompartmentId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + + /** + * Build the instance of ListBootVolumesRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of ListBootVolumesRequest + */ + public ListBootVolumesRequest build() { + ListBootVolumesRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..ed79883c0cd --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListLocalPeeringGatewaysRequest.java @@ -0,0 +1,81 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class ListLocalPeeringGatewaysRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the compartment. + */ + private String compartmentId; + + /** + * The OCID of the VCN. + */ + private String vcnId; + + /** + * The maximum number of items to return in a paginated \"List\" call. + *

+ * Example: `500` + * + */ + private Integer limit; + + /** + * The value of the `opc-next-page` response header from the previous \"List\" call. + * + */ + private String page; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListLocalPeeringGatewaysRequest o) { + compartmentId(o.getCompartmentId()); + vcnId(o.getVcnId()); + limit(o.getLimit()); + page(o.getPage()); + return this; + } + + /** + * Build the instance of ListLocalPeeringGatewaysRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of ListLocalPeeringGatewaysRequest + */ + public ListLocalPeeringGatewaysRequest build() { + ListLocalPeeringGatewaysRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 dec042d6bab..bb9784aea94 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 @@ -23,6 +23,11 @@ public class TerminateInstanceRequest extends com.oracle.bmc.requests.BmcRequest */ private String ifMatch; + /** + * Specifies whether to delete or preserve the boot volume when terminating an instance. + */ + private Boolean preserveBootVolume; + public static class Builder { private com.oracle.bmc.util.internal.Consumer invocationCallback = null; @@ -46,6 +51,7 @@ public Builder invocationCallback( public Builder copy(TerminateInstanceRequest o) { instanceId(o.getInstanceId()); ifMatch(o.getIfMatch()); + preserveBootVolume(o.getPreserveBootVolume()); 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 new file mode 100644 index 00000000000..c00647ca24a --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateBootVolumeRequest.java @@ -0,0 +1,74 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class UpdateBootVolumeRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the boot volume. + */ + private String bootVolumeId; + + /** + * Update boot volume's display name. + */ + private UpdateBootVolumeDetails updateBootVolumeDetails; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + * parameter to the value of the etag from a previous GET or POST response for that resource. The resource + * will be updated or deleted only if the etag you provide matches the resource's current etag value. + * + */ + private String ifMatch; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateBootVolumeRequest o) { + bootVolumeId(o.getBootVolumeId()); + updateBootVolumeDetails(o.getUpdateBootVolumeDetails()); + ifMatch(o.getIfMatch()); + return this; + } + + /** + * Build the instance of UpdateBootVolumeRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of UpdateBootVolumeRequest + */ + public UpdateBootVolumeRequest build() { + UpdateBootVolumeRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} 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 new file mode 100644 index 00000000000..6c7fa5f7814 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateLocalPeeringGatewayRequest.java @@ -0,0 +1,74 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.requests; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class UpdateLocalPeeringGatewayRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the local peering gateway. + */ + private String localPeeringGatewayId; + + /** + * Details object for updating a local peering gateway. + */ + private UpdateLocalPeeringGatewayDetails updateLocalPeeringGatewayDetails; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + * parameter to the value of the etag from a previous GET or POST response for that resource. The resource + * will be updated or deleted only if the etag you provide matches the resource's current etag value. + * + */ + private String ifMatch; + + public static class Builder { + private com.oracle.bmc.util.internal.Consumer + invocationCallback = null; + + /** + * Set the invocation callback for the request to be built. + * @param invocationCallback the invocation callback to be set for the request + * @return this builder instance + */ + public Builder invocationCallback( + com.oracle.bmc.util.internal.Consumer + invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateLocalPeeringGatewayRequest o) { + localPeeringGatewayId(o.getLocalPeeringGatewayId()); + updateLocalPeeringGatewayDetails(o.getUpdateLocalPeeringGatewayDetails()); + ifMatch(o.getIfMatch()); + return this; + } + + /** + * Build the instance of UpdateLocalPeeringGatewayRequest as configured by this builder + * + * Note that this method takes calls to {@link Builder#invocationCallback(com.oracle.bmc.util.internal.Consumer)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + * This is the preferred method to build an instance. + * + * @return instance of UpdateLocalPeeringGatewayRequest + */ + public UpdateLocalPeeringGatewayRequest build() { + UpdateLocalPeeringGatewayRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/AttachBootVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/AttachBootVolumeResponse.java new file mode 100644 index 00000000000..110f701b571 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/AttachBootVolumeResponse.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class AttachBootVolumeResponse { + + /** + * For optimistic concurrency control. See `if-match`. + */ + private String etag; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * The returned BootVolumeAttachment instance. + */ + private BootVolumeAttachment bootVolumeAttachment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(AttachBootVolumeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + bootVolumeAttachment(o.getBootVolumeAttachment()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ConnectLocalPeeringGatewaysResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ConnectLocalPeeringGatewaysResponse.java new file mode 100644 index 00000000000..b32cf33d70e --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ConnectLocalPeeringGatewaysResponse.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class ConnectLocalPeeringGatewaysResponse { + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ConnectLocalPeeringGatewaysResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateLocalPeeringGatewayResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateLocalPeeringGatewayResponse.java new file mode 100644 index 00000000000..920cc86dce3 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateLocalPeeringGatewayResponse.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class CreateLocalPeeringGatewayResponse { + + /** + * For optimistic concurrency control. See `if-match`. + */ + private String etag; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * The returned LocalPeeringGateway instance. + */ + private LocalPeeringGateway localPeeringGateway; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(CreateLocalPeeringGatewayResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + localPeeringGateway(o.getLocalPeeringGateway()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteBootVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteBootVolumeResponse.java new file mode 100644 index 00000000000..b907e5749be --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteBootVolumeResponse.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class DeleteBootVolumeResponse { + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteBootVolumeResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteLocalPeeringGatewayResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteLocalPeeringGatewayResponse.java new file mode 100644 index 00000000000..45fdc6bed4e --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteLocalPeeringGatewayResponse.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class DeleteLocalPeeringGatewayResponse { + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DeleteLocalPeeringGatewayResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DetachBootVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DetachBootVolumeResponse.java new file mode 100644 index 00000000000..a366d945515 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DetachBootVolumeResponse.java @@ -0,0 +1,31 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class DetachBootVolumeResponse { + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(DetachBootVolumeResponse o) { + opcRequestId(o.getOpcRequestId()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetBootVolumeAttachmentResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetBootVolumeAttachmentResponse.java new file mode 100644 index 00000000000..a2a46765ae5 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetBootVolumeAttachmentResponse.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class GetBootVolumeAttachmentResponse { + + /** + * For optimistic concurrency control. See `if-match`. + */ + private String etag; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * The returned BootVolumeAttachment instance. + */ + private BootVolumeAttachment bootVolumeAttachment; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetBootVolumeAttachmentResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + bootVolumeAttachment(o.getBootVolumeAttachment()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetBootVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetBootVolumeResponse.java new file mode 100644 index 00000000000..d53a2843d3a --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetBootVolumeResponse.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class GetBootVolumeResponse { + + /** + * For optimistic concurrency control. See `if-match`. + */ + private String etag; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * The returned BootVolume instance. + */ + private BootVolume bootVolume; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetBootVolumeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + bootVolume(o.getBootVolume()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetLocalPeeringGatewayResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetLocalPeeringGatewayResponse.java new file mode 100644 index 00000000000..b6e29989dcf --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetLocalPeeringGatewayResponse.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class GetLocalPeeringGatewayResponse { + + /** + * For optimistic concurrency control. See `if-match`. + */ + private String etag; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * The returned LocalPeeringGateway instance. + */ + private LocalPeeringGateway localPeeringGateway; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(GetLocalPeeringGatewayResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + localPeeringGateway(o.getLocalPeeringGateway()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListBootVolumeAttachmentsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListBootVolumeAttachmentsResponse.java new file mode 100644 index 00000000000..543881da768 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListBootVolumeAttachmentsResponse.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class ListBootVolumeAttachmentsResponse { + + /** + * For pagination of a list of items. When paging through a list, if this header appears in the response, + * then a partial list might have been returned. Include this value as the `page` parameter for the + * subsequent GET request to get the next batch of items. + * + */ + private String opcNextPage; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * A list of BootVolumeAttachment instances. + */ + private java.util.List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListBootVolumeAttachmentsResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListBootVolumesResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListBootVolumesResponse.java new file mode 100644 index 00000000000..8e64b38b384 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListBootVolumesResponse.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class ListBootVolumesResponse { + + /** + * For pagination of a list of items. When paging through a list, if this header appears in the response, + * then a partial list might have been returned. Include this value as the `page` parameter for the + * subsequent GET request to get the next batch of items. + * + */ + private String opcNextPage; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * A list of BootVolume instances. + */ + private java.util.List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListBootVolumesResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListLocalPeeringGatewaysResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListLocalPeeringGatewaysResponse.java new file mode 100644 index 00000000000..3ea7707718c --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListLocalPeeringGatewaysResponse.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class ListLocalPeeringGatewaysResponse { + + /** + * For pagination of a list of items. When paging through a list, if this header appears in the response, + * then a partial list might have been returned. Include this value as the `page` parameter for the + * subsequent GET request to get the next batch of items. + * + */ + private String opcNextPage; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * A list of LocalPeeringGateway instances. + */ + private java.util.List items; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ListLocalPeeringGatewaysResponse o) { + opcNextPage(o.getOpcNextPage()); + opcRequestId(o.getOpcRequestId()); + items(o.getItems()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateBootVolumeResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateBootVolumeResponse.java new file mode 100644 index 00000000000..5dfce053a55 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateBootVolumeResponse.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class UpdateBootVolumeResponse { + + /** + * For optimistic concurrency control. See `if-match`. + */ + private String etag; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * The returned BootVolume instance. + */ + private BootVolume bootVolume; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateBootVolumeResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + bootVolume(o.getBootVolume()); + + return this; + } + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateLocalPeeringGatewayResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateLocalPeeringGatewayResponse.java new file mode 100644 index 00000000000..fe9b928975a --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/UpdateLocalPeeringGatewayResponse.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.core.responses; + +import com.oracle.bmc.core.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class UpdateLocalPeeringGatewayResponse { + + /** + * For optimistic concurrency control. See `if-match`. + */ + private String etag; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about + * a particular request, please provide the request ID. + * + */ + private String opcRequestId; + + /** + * The returned LocalPeeringGateway instance. + */ + private LocalPeeringGateway localPeeringGateway; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateLocalPeeringGatewayResponse o) { + etag(o.getEtag()); + opcRequestId(o.getOpcRequestId()); + localPeeringGateway(o.getLocalPeeringGateway()); + + return this; + } + } +} diff --git a/bmc-database/pom.xml b/bmc-database/pom.xml index d465039e8b6..ddcca626b42 100644 --- a/bmc-database/pom.xml +++ b/bmc-database/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.17 + 1.2.18 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 6be3357aa87..d3adc05e73a 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.database; +import java.util.Locale; import com.oracle.bmc.database.internal.http.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; @@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); 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 0151c47fecf..38ed7a96dd8 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.database; +import java.util.Locale; import com.oracle.bmc.database.internal.http.*; import com.oracle.bmc.database.requests.*; import com.oracle.bmc.database.responses.*; @@ -120,7 +121,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/Backup.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/Backup.java index d1a86ed62d2..7157c796e3b 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/Backup.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/Backup.java @@ -128,16 +128,20 @@ public Backup build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Backup o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .databaseId(o.getDatabaseId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .timeEnded(o.getTimeEnded()) - .timeStarted(o.getTimeStarted()) - .type(o.getType()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .databaseId(o.getDatabaseId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .timeEnded(o.getTimeEnded()) + .timeStarted(o.getTimeStarted()) + .type(o.getType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/BackupSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/BackupSummary.java index 4007738d026..afe9c60aeae 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/BackupSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/BackupSummary.java @@ -128,16 +128,20 @@ public BackupSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BackupSummary o) { - return availabilityDomain(o.getAvailabilityDomain()) - .compartmentId(o.getCompartmentId()) - .databaseId(o.getDatabaseId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .timeEnded(o.getTimeEnded()) - .timeStarted(o.getTimeStarted()) - .type(o.getType()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .compartmentId(o.getCompartmentId()) + .databaseId(o.getDatabaseId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .timeEnded(o.getTimeEnded()) + .timeStarted(o.getTimeStarted()) + .type(o.getType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateBackupDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateBackupDetails.java index 7ab940c91fc..c81b7045ed9 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateBackupDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateBackupDetails.java @@ -42,7 +42,10 @@ public CreateBackupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateBackupDetails o) { - return databaseId(o.getDatabaseId()).displayName(o.getDisplayName()); + Builder copiedBuilder = databaseId(o.getDatabaseId()).displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationToExistingDbSystemDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationToExistingDbSystemDetails.java index 33c604def75..042c0e40a8d 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationToExistingDbSystemDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationToExistingDbSystemDetails.java @@ -73,10 +73,14 @@ public CreateDataGuardAssociationToExistingDbSystemDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDataGuardAssociationToExistingDbSystemDetails o) { - return databaseAdminPassword(o.getDatabaseAdminPassword()) - .protectionMode(o.getProtectionMode()) - .transportType(o.getTransportType()) - .peerDbSystemId(o.getPeerDbSystemId()); + Builder copiedBuilder = + databaseAdminPassword(o.getDatabaseAdminPassword()) + .protectionMode(o.getProtectionMode()) + .transportType(o.getTransportType()) + .peerDbSystemId(o.getPeerDbSystemId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 8b5fc85e12a..80a68f3dab7 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 @@ -95,13 +95,17 @@ public CreateDatabaseDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDatabaseDetails o) { - return adminPassword(o.getAdminPassword()) - .characterSet(o.getCharacterSet()) - .dbBackupConfig(o.getDbBackupConfig()) - .dbName(o.getDbName()) - .dbWorkload(o.getDbWorkload()) - .ncharacterSet(o.getNcharacterSet()) - .pdbName(o.getPdbName()); + Builder copiedBuilder = + adminPassword(o.getAdminPassword()) + .characterSet(o.getCharacterSet()) + .dbBackupConfig(o.getDbBackupConfig()) + .dbName(o.getDbName()) + .dbWorkload(o.getDbWorkload()) + .ncharacterSet(o.getNcharacterSet()) + .pdbName(o.getPdbName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseFromBackupDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseFromBackupDetails.java new file mode 100644 index 00000000000..07953f2f689 --- /dev/null +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseFromBackupDetails.java @@ -0,0 +1,92 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.database.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = CreateDatabaseFromBackupDetails.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class CreateDatabaseFromBackupDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") + private String adminPassword; + + public Builder adminPassword(String adminPassword) { + this.adminPassword = adminPassword; + this.__explicitlySet__.add("adminPassword"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("backupId") + private String backupId; + + public Builder backupId(String backupId) { + this.backupId = backupId; + this.__explicitlySet__.add("backupId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("backupTDEPassword") + private String backupTDEPassword; + + public Builder backupTDEPassword(String backupTDEPassword) { + this.backupTDEPassword = backupTDEPassword; + this.__explicitlySet__.add("backupTDEPassword"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public CreateDatabaseFromBackupDetails build() { + CreateDatabaseFromBackupDetails __instance__ = + new CreateDatabaseFromBackupDetails(adminPassword, backupId, backupTDEPassword); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(CreateDatabaseFromBackupDetails o) { + Builder copiedBuilder = + adminPassword(o.getAdminPassword()) + .backupId(o.getBackupId()) + .backupTDEPassword(o.getBackupTDEPassword()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * A strong password for SYS, SYSTEM, PDB Admin and TDE Wallet. The password must be at least nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The special characters must be _, \\#, or -. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") + String adminPassword; + + /** + * The backup OCID. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("backupId") + String backupId; + + /** + * The password to open the TDE wallet. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("backupTDEPassword") + String backupTDEPassword; + + @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/CreateDbHomeDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeDetails.java index 67aab9bf8a2..ba39e3c6683 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeDetails.java @@ -52,9 +52,13 @@ public CreateDbHomeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDbHomeDetails o) { - return database(o.getDatabase()) - .dbVersion(o.getDbVersion()) - .displayName(o.getDisplayName()); + Builder copiedBuilder = + database(o.getDatabase()) + .dbVersion(o.getDbVersion()) + .displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdBase.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdBase.java new file mode 100644 index 00000000000..3f3321f13fe --- /dev/null +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdBase.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.database.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@lombok.experimental.NonFinal +@lombok.AllArgsConstructor(access = lombok.AccessLevel.PROTECTED) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "source", + defaultImpl = CreateDbHomeWithDbSystemIdBase.class +) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = CreateDbHomeWithDbSystemIdFromBackupDetails.class, + name = "DB_BACKUP" + ), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = CreateDbHomeWithDbSystemIdDetails.class, + name = "NONE" + ) +}) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class CreateDbHomeWithDbSystemIdBase { + + /** + * The OCID of the DB System. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbSystemId") + String dbSystemId; + + /** + * The user-provided name of the database home. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; +} diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdDetails.java index 8644cf42100..a098be2d0b2 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdDetails.java @@ -8,20 +8,18 @@ @com.fasterxml.jackson.databind.annotation.JsonDeserialize( builder = CreateDbHomeWithDbSystemIdDetails.Builder.class ) +@lombok.ToString(callSuper = true) +@lombok.EqualsAndHashCode(callSuper = true) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "source" +) @com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) -public class CreateDbHomeWithDbSystemIdDetails { +public class CreateDbHomeWithDbSystemIdDetails extends CreateDbHomeWithDbSystemIdBase { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("database") - private CreateDatabaseDetails database; - - public Builder database(CreateDatabaseDetails database) { - this.database = database; - this.__explicitlySet__.add("database"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("dbSystemId") private String dbSystemId; @@ -31,15 +29,6 @@ public Builder dbSystemId(String dbSystemId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") - private String dbVersion; - - public Builder dbVersion(String dbVersion) { - this.dbVersion = dbVersion; - this.__explicitlySet__.add("dbVersion"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -49,23 +38,45 @@ public Builder displayName(String displayName) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("database") + private CreateDatabaseDetails database; + + public Builder database(CreateDatabaseDetails database) { + this.database = database; + this.__explicitlySet__.add("database"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + private String dbVersion; + + public Builder dbVersion(String dbVersion) { + this.dbVersion = dbVersion; + this.__explicitlySet__.add("dbVersion"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public CreateDbHomeWithDbSystemIdDetails build() { CreateDbHomeWithDbSystemIdDetails __instance__ = new CreateDbHomeWithDbSystemIdDetails( - database, dbSystemId, dbVersion, displayName); + dbSystemId, displayName, database, dbVersion); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDbHomeWithDbSystemIdDetails o) { - return database(o.getDatabase()) - .dbSystemId(o.getDbSystemId()) - .dbVersion(o.getDbVersion()) - .displayName(o.getDisplayName()); + Builder copiedBuilder = + dbSystemId(o.getDbSystemId()) + .displayName(o.getDisplayName()) + .database(o.getDatabase()) + .dbVersion(o.getDbVersion()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -76,27 +87,25 @@ public static Builder builder() { return new Builder(); } + public CreateDbHomeWithDbSystemIdDetails( + String dbSystemId, + String displayName, + CreateDatabaseDetails database, + String dbVersion) { + super(dbSystemId, displayName); + this.database = database; + this.dbVersion = dbVersion; + } + @com.fasterxml.jackson.annotation.JsonProperty("database") CreateDatabaseDetails database; - /** - * The OCID of the DB System. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbSystemId") - String dbSystemId; - /** * A valid Oracle database version. To get a list of supported versions, use the {@link #listDbVersions(ListDbVersionsRequest) listDbVersions} operation. **/ @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") String dbVersion; - /** - * The user-provided name of the database home. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; - @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/CreateDbHomeWithDbSystemIdFromBackupDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdFromBackupDetails.java new file mode 100644 index 00000000000..9ec9d3fa171 --- /dev/null +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdFromBackupDetails.java @@ -0,0 +1,91 @@ +/** + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.database.model; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = CreateDbHomeWithDbSystemIdFromBackupDetails.Builder.class +) +@lombok.ToString(callSuper = true) +@lombok.EqualsAndHashCode(callSuper = true) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "source" +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class CreateDbHomeWithDbSystemIdFromBackupDetails extends CreateDbHomeWithDbSystemIdBase { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("dbSystemId") + private String dbSystemId; + + public Builder dbSystemId(String dbSystemId) { + this.dbSystemId = dbSystemId; + this.__explicitlySet__.add("dbSystemId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("database") + private CreateDatabaseFromBackupDetails database; + + public Builder database(CreateDatabaseFromBackupDetails database) { + this.database = database; + this.__explicitlySet__.add("database"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public CreateDbHomeWithDbSystemIdFromBackupDetails build() { + CreateDbHomeWithDbSystemIdFromBackupDetails __instance__ = + new CreateDbHomeWithDbSystemIdFromBackupDetails( + dbSystemId, displayName, database); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(CreateDbHomeWithDbSystemIdFromBackupDetails o) { + Builder copiedBuilder = + dbSystemId(o.getDbSystemId()) + .displayName(o.getDisplayName()) + .database(o.getDatabase()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + public CreateDbHomeWithDbSystemIdFromBackupDetails( + String dbSystemId, String displayName, CreateDatabaseFromBackupDetails database) { + super(dbSystemId, displayName); + this.database = database; + } + + @com.fasterxml.jackson.annotation.JsonProperty("database") + CreateDatabaseFromBackupDetails database; + + @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/DataGuardAssociation.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DataGuardAssociation.java index 271e1766261..bd913011e7a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DataGuardAssociation.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DataGuardAssociation.java @@ -187,21 +187,25 @@ public DataGuardAssociation build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DataGuardAssociation o) { - return applyLag(o.getApplyLag()) - .applyRate(o.getApplyRate()) - .databaseId(o.getDatabaseId()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .peerDataGuardAssociationId(o.getPeerDataGuardAssociationId()) - .peerDatabaseId(o.getPeerDatabaseId()) - .peerDbHomeId(o.getPeerDbHomeId()) - .peerDbSystemId(o.getPeerDbSystemId()) - .peerRole(o.getPeerRole()) - .protectionMode(o.getProtectionMode()) - .role(o.getRole()) - .timeCreated(o.getTimeCreated()) - .transportType(o.getTransportType()); + Builder copiedBuilder = + applyLag(o.getApplyLag()) + .applyRate(o.getApplyRate()) + .databaseId(o.getDatabaseId()) + .id(o.getId()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .peerDataGuardAssociationId(o.getPeerDataGuardAssociationId()) + .peerDatabaseId(o.getPeerDatabaseId()) + .peerDbHomeId(o.getPeerDbHomeId()) + .peerDbSystemId(o.getPeerDbSystemId()) + .peerRole(o.getPeerRole()) + .protectionMode(o.getProtectionMode()) + .role(o.getRole()) + .timeCreated(o.getTimeCreated()) + .transportType(o.getTransportType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DataGuardAssociationSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DataGuardAssociationSummary.java index 814d10069ff..85a35d15119 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DataGuardAssociationSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DataGuardAssociationSummary.java @@ -187,21 +187,25 @@ public DataGuardAssociationSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DataGuardAssociationSummary o) { - return applyLag(o.getApplyLag()) - .applyRate(o.getApplyRate()) - .databaseId(o.getDatabaseId()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .peerDataGuardAssociationId(o.getPeerDataGuardAssociationId()) - .peerDatabaseId(o.getPeerDatabaseId()) - .peerDbHomeId(o.getPeerDbHomeId()) - .peerDbSystemId(o.getPeerDbSystemId()) - .peerRole(o.getPeerRole()) - .protectionMode(o.getProtectionMode()) - .role(o.getRole()) - .timeCreated(o.getTimeCreated()) - .transportType(o.getTransportType()); + Builder copiedBuilder = + applyLag(o.getApplyLag()) + .applyRate(o.getApplyRate()) + .databaseId(o.getDatabaseId()) + .id(o.getId()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .peerDataGuardAssociationId(o.getPeerDataGuardAssociationId()) + .peerDatabaseId(o.getPeerDatabaseId()) + .peerDbHomeId(o.getPeerDbHomeId()) + .peerDbSystemId(o.getPeerDbSystemId()) + .peerRole(o.getPeerRole()) + .protectionMode(o.getProtectionMode()) + .role(o.getRole()) + .timeCreated(o.getTimeCreated()) + .transportType(o.getTransportType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 e1d0f534601..2d23e04e16d 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 @@ -159,19 +159,23 @@ public Database build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Database o) { - return characterSet(o.getCharacterSet()) - .compartmentId(o.getCompartmentId()) - .dbBackupConfig(o.getDbBackupConfig()) - .dbHomeId(o.getDbHomeId()) - .dbName(o.getDbName()) - .dbUniqueName(o.getDbUniqueName()) - .dbWorkload(o.getDbWorkload()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .ncharacterSet(o.getNcharacterSet()) - .pdbName(o.getPdbName()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + characterSet(o.getCharacterSet()) + .compartmentId(o.getCompartmentId()) + .dbBackupConfig(o.getDbBackupConfig()) + .dbHomeId(o.getDbHomeId()) + .dbName(o.getDbName()) + .dbUniqueName(o.getDbUniqueName()) + .dbWorkload(o.getDbWorkload()) + .id(o.getId()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .ncharacterSet(o.getNcharacterSet()) + .pdbName(o.getPdbName()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 306924a6b01..887cd81be9c 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 @@ -159,19 +159,23 @@ public DatabaseSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DatabaseSummary o) { - return characterSet(o.getCharacterSet()) - .compartmentId(o.getCompartmentId()) - .dbBackupConfig(o.getDbBackupConfig()) - .dbHomeId(o.getDbHomeId()) - .dbName(o.getDbName()) - .dbUniqueName(o.getDbUniqueName()) - .dbWorkload(o.getDbWorkload()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .ncharacterSet(o.getNcharacterSet()) - .pdbName(o.getPdbName()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + characterSet(o.getCharacterSet()) + .compartmentId(o.getCompartmentId()) + .dbBackupConfig(o.getDbBackupConfig()) + .dbHomeId(o.getDbHomeId()) + .dbName(o.getDbName()) + .dbUniqueName(o.getDbUniqueName()) + .dbWorkload(o.getDbWorkload()) + .id(o.getId()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .ncharacterSet(o.getNcharacterSet()) + .pdbName(o.getPdbName()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbBackupConfig.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbBackupConfig.java index 279982616e0..5eb4aa74052 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbBackupConfig.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbBackupConfig.java @@ -36,7 +36,10 @@ public DbBackupConfig build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbBackupConfig o) { - return autoBackupEnabled(o.getAutoBackupEnabled()); + Builder copiedBuilder = autoBackupEnabled(o.getAutoBackupEnabled()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHome.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHome.java index eaaf70e5e6f..0c7d8cc7d16 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHome.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHome.java @@ -114,14 +114,18 @@ public DbHome build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbHome o) { - return compartmentId(o.getCompartmentId()) - .dbSystemId(o.getDbSystemId()) - .dbVersion(o.getDbVersion()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .dbSystemId(o.getDbSystemId()) + .dbVersion(o.getDbVersion()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHomeSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHomeSummary.java index 7abf2fbdb4c..3698a73ce51 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHomeSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHomeSummary.java @@ -114,14 +114,18 @@ public DbHomeSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbHomeSummary o) { - return compartmentId(o.getCompartmentId()) - .dbSystemId(o.getDbSystemId()) - .dbVersion(o.getDbVersion()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) - .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .dbSystemId(o.getDbSystemId()) + .dbVersion(o.getDbVersion()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) + .lifecycleState(o.getLifecycleState()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNode.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNode.java index 1f399e9305b..a4da79f8021 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNode.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNode.java @@ -109,14 +109,18 @@ public DbNode build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbNode o) { - return backupVnicId(o.getBackupVnicId()) - .dbSystemId(o.getDbSystemId()) - .hostname(o.getHostname()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .softwareStorageSizeInGB(o.getSoftwareStorageSizeInGB()) - .timeCreated(o.getTimeCreated()) - .vnicId(o.getVnicId()); + Builder copiedBuilder = + backupVnicId(o.getBackupVnicId()) + .dbSystemId(o.getDbSystemId()) + .hostname(o.getHostname()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .softwareStorageSizeInGB(o.getSoftwareStorageSizeInGB()) + .timeCreated(o.getTimeCreated()) + .vnicId(o.getVnicId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNodeSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNodeSummary.java index b29d5acdca1..3b9ac5f29d4 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNodeSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNodeSummary.java @@ -109,14 +109,18 @@ public DbNodeSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbNodeSummary o) { - return backupVnicId(o.getBackupVnicId()) - .dbSystemId(o.getDbSystemId()) - .hostname(o.getHostname()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .softwareStorageSizeInGB(o.getSoftwareStorageSizeInGB()) - .timeCreated(o.getTimeCreated()) - .vnicId(o.getVnicId()); + Builder copiedBuilder = + backupVnicId(o.getBackupVnicId()) + .dbSystemId(o.getDbSystemId()) + .hostname(o.getHostname()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .softwareStorageSizeInGB(o.getSoftwareStorageSizeInGB()) + .timeCreated(o.getTimeCreated()) + .vnicId(o.getVnicId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 0d14c653ba6..643240b36ce 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 @@ -321,34 +321,38 @@ public DbSystem build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbSystem o) { - return availabilityDomain(o.getAvailabilityDomain()) - .backupSubnetId(o.getBackupSubnetId()) - .clusterName(o.getClusterName()) - .compartmentId(o.getCompartmentId()) - .cpuCoreCount(o.getCpuCoreCount()) - .dataStoragePercentage(o.getDataStoragePercentage()) - .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) - .databaseEdition(o.getDatabaseEdition()) - .diskRedundancy(o.getDiskRedundancy()) - .displayName(o.getDisplayName()) - .domain(o.getDomain()) - .hostname(o.getHostname()) - .id(o.getId()) - .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) - .licenseModel(o.getLicenseModel()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .listenerPort(o.getListenerPort()) - .nodeCount(o.getNodeCount()) - .recoStorageSizeInGB(o.getRecoStorageSizeInGB()) - .scanDnsRecordId(o.getScanDnsRecordId()) - .scanIpIds(o.getScanIpIds()) - .shape(o.getShape()) - .sshPublicKeys(o.getSshPublicKeys()) - .subnetId(o.getSubnetId()) - .timeCreated(o.getTimeCreated()) - .version(o.getVersion()) - .vipIds(o.getVipIds()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .backupSubnetId(o.getBackupSubnetId()) + .clusterName(o.getClusterName()) + .compartmentId(o.getCompartmentId()) + .cpuCoreCount(o.getCpuCoreCount()) + .dataStoragePercentage(o.getDataStoragePercentage()) + .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) + .databaseEdition(o.getDatabaseEdition()) + .diskRedundancy(o.getDiskRedundancy()) + .displayName(o.getDisplayName()) + .domain(o.getDomain()) + .hostname(o.getHostname()) + .id(o.getId()) + .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) + .licenseModel(o.getLicenseModel()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .listenerPort(o.getListenerPort()) + .nodeCount(o.getNodeCount()) + .recoStorageSizeInGB(o.getRecoStorageSizeInGB()) + .scanDnsRecordId(o.getScanDnsRecordId()) + .scanIpIds(o.getScanIpIds()) + .shape(o.getShape()) + .sshPublicKeys(o.getSshPublicKeys()) + .subnetId(o.getSubnetId()) + .timeCreated(o.getTimeCreated()) + .version(o.getVersion()) + .vipIds(o.getVipIds()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemShapeSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemShapeSummary.java index 2bcc5e9ca21..e5d23d5fa17 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemShapeSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemShapeSummary.java @@ -60,9 +60,13 @@ public DbSystemShapeSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbSystemShapeSummary o) { - return availableCoreCount(o.getAvailableCoreCount()) - .name(o.getName()) - .shape(o.getShape()); + Builder copiedBuilder = + availableCoreCount(o.getAvailableCoreCount()) + .name(o.getName()) + .shape(o.getShape()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 9b2924f029c..604a5b80315 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 @@ -321,34 +321,38 @@ public DbSystemSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbSystemSummary o) { - return availabilityDomain(o.getAvailabilityDomain()) - .backupSubnetId(o.getBackupSubnetId()) - .clusterName(o.getClusterName()) - .compartmentId(o.getCompartmentId()) - .cpuCoreCount(o.getCpuCoreCount()) - .dataStoragePercentage(o.getDataStoragePercentage()) - .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) - .databaseEdition(o.getDatabaseEdition()) - .diskRedundancy(o.getDiskRedundancy()) - .displayName(o.getDisplayName()) - .domain(o.getDomain()) - .hostname(o.getHostname()) - .id(o.getId()) - .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) - .licenseModel(o.getLicenseModel()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .listenerPort(o.getListenerPort()) - .nodeCount(o.getNodeCount()) - .recoStorageSizeInGB(o.getRecoStorageSizeInGB()) - .scanDnsRecordId(o.getScanDnsRecordId()) - .scanIpIds(o.getScanIpIds()) - .shape(o.getShape()) - .sshPublicKeys(o.getSshPublicKeys()) - .subnetId(o.getSubnetId()) - .timeCreated(o.getTimeCreated()) - .version(o.getVersion()) - .vipIds(o.getVipIds()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .backupSubnetId(o.getBackupSubnetId()) + .clusterName(o.getClusterName()) + .compartmentId(o.getCompartmentId()) + .cpuCoreCount(o.getCpuCoreCount()) + .dataStoragePercentage(o.getDataStoragePercentage()) + .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) + .databaseEdition(o.getDatabaseEdition()) + .diskRedundancy(o.getDiskRedundancy()) + .displayName(o.getDisplayName()) + .domain(o.getDomain()) + .hostname(o.getHostname()) + .id(o.getId()) + .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) + .licenseModel(o.getLicenseModel()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .listenerPort(o.getListenerPort()) + .nodeCount(o.getNodeCount()) + .recoStorageSizeInGB(o.getRecoStorageSizeInGB()) + .scanDnsRecordId(o.getScanDnsRecordId()) + .scanIpIds(o.getScanIpIds()) + .shape(o.getShape()) + .sshPublicKeys(o.getSshPublicKeys()) + .subnetId(o.getSubnetId()) + .timeCreated(o.getTimeCreated()) + .version(o.getVersion()) + .vipIds(o.getVipIds()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbVersionSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbVersionSummary.java index e6d58626467..9d4934ff70c 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/DbVersionSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbVersionSummary.java @@ -46,7 +46,10 @@ public DbVersionSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbVersionSummary o) { - return supportsPdb(o.getSupportsPdb()).version(o.getVersion()); + Builder copiedBuilder = supportsPdb(o.getSupportsPdb()).version(o.getVersion()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/FailoverDataGuardAssociationDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/FailoverDataGuardAssociationDetails.java index c461bdb2dce..0c236cf8cb4 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/FailoverDataGuardAssociationDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/FailoverDataGuardAssociationDetails.java @@ -38,7 +38,10 @@ public FailoverDataGuardAssociationDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(FailoverDataGuardAssociationDetails o) { - return databaseAdminPassword(o.getDatabaseAdminPassword()); + Builder copiedBuilder = databaseAdminPassword(o.getDatabaseAdminPassword()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 c285de0ace4..e98969c0c3c 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 @@ -205,24 +205,28 @@ public LaunchDbSystemDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LaunchDbSystemDetails o) { - return availabilityDomain(o.getAvailabilityDomain()) - .backupSubnetId(o.getBackupSubnetId()) - .clusterName(o.getClusterName()) - .compartmentId(o.getCompartmentId()) - .cpuCoreCount(o.getCpuCoreCount()) - .dataStoragePercentage(o.getDataStoragePercentage()) - .databaseEdition(o.getDatabaseEdition()) - .dbHome(o.getDbHome()) - .diskRedundancy(o.getDiskRedundancy()) - .displayName(o.getDisplayName()) - .domain(o.getDomain()) - .hostname(o.getHostname()) - .initialDataStorageSizeInGB(o.getInitialDataStorageSizeInGB()) - .licenseModel(o.getLicenseModel()) - .nodeCount(o.getNodeCount()) - .shape(o.getShape()) - .sshPublicKeys(o.getSshPublicKeys()) - .subnetId(o.getSubnetId()); + Builder copiedBuilder = + availabilityDomain(o.getAvailabilityDomain()) + .backupSubnetId(o.getBackupSubnetId()) + .clusterName(o.getClusterName()) + .compartmentId(o.getCompartmentId()) + .cpuCoreCount(o.getCpuCoreCount()) + .dataStoragePercentage(o.getDataStoragePercentage()) + .databaseEdition(o.getDatabaseEdition()) + .dbHome(o.getDbHome()) + .diskRedundancy(o.getDiskRedundancy()) + .displayName(o.getDisplayName()) + .domain(o.getDomain()) + .hostname(o.getHostname()) + .initialDataStorageSizeInGB(o.getInitialDataStorageSizeInGB()) + .licenseModel(o.getLicenseModel()) + .nodeCount(o.getNodeCount()) + .shape(o.getShape()) + .sshPublicKeys(o.getSshPublicKeys()) + .subnetId(o.getSubnetId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/Patch.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/Patch.java index bbf619ce302..4ab30c69d7b 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/Patch.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/Patch.java @@ -111,14 +111,18 @@ public Patch build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Patch o) { - return availableActions(o.getAvailableActions()) - .description(o.getDescription()) - .id(o.getId()) - .lastAction(o.getLastAction()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .timeReleased(o.getTimeReleased()) - .version(o.getVersion()); + Builder copiedBuilder = + availableActions(o.getAvailableActions()) + .description(o.getDescription()) + .id(o.getId()) + .lastAction(o.getLastAction()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .timeReleased(o.getTimeReleased()) + .version(o.getVersion()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchDetails.java index e63e942f3f5..fe3e9082f24 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchDetails.java @@ -46,7 +46,10 @@ public PatchDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PatchDetails o) { - return action(o.getAction()).patchId(o.getPatchId()); + Builder copiedBuilder = action(o.getAction()).patchId(o.getPatchId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntry.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntry.java index 33e100aea66..212c0ab749d 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntry.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntry.java @@ -98,13 +98,17 @@ public PatchHistoryEntry build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PatchHistoryEntry o) { - return action(o.getAction()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .patchId(o.getPatchId()) - .timeEnded(o.getTimeEnded()) - .timeStarted(o.getTimeStarted()); + Builder copiedBuilder = + action(o.getAction()) + .id(o.getId()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .patchId(o.getPatchId()) + .timeEnded(o.getTimeEnded()) + .timeStarted(o.getTimeStarted()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntrySummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntrySummary.java index f88418235cc..0483609a460 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntrySummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntrySummary.java @@ -98,13 +98,17 @@ public PatchHistoryEntrySummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PatchHistoryEntrySummary o) { - return action(o.getAction()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .patchId(o.getPatchId()) - .timeEnded(o.getTimeEnded()) - .timeStarted(o.getTimeStarted()); + Builder copiedBuilder = + action(o.getAction()) + .id(o.getId()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .patchId(o.getPatchId()) + .timeEnded(o.getTimeEnded()) + .timeStarted(o.getTimeStarted()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchSummary.java index 1f70ffc33ee..37bc731998b 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchSummary.java @@ -111,14 +111,18 @@ public PatchSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PatchSummary o) { - return availableActions(o.getAvailableActions()) - .description(o.getDescription()) - .id(o.getId()) - .lastAction(o.getLastAction()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .timeReleased(o.getTimeReleased()) - .version(o.getVersion()); + Builder copiedBuilder = + availableActions(o.getAvailableActions()) + .description(o.getDescription()) + .id(o.getId()) + .lastAction(o.getLastAction()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()) + .timeReleased(o.getTimeReleased()) + .version(o.getVersion()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/ReinstateDataGuardAssociationDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/ReinstateDataGuardAssociationDetails.java index 75b414b70a0..062b2e56333 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/ReinstateDataGuardAssociationDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/ReinstateDataGuardAssociationDetails.java @@ -38,7 +38,10 @@ public ReinstateDataGuardAssociationDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ReinstateDataGuardAssociationDetails o) { - return databaseAdminPassword(o.getDatabaseAdminPassword()); + Builder copiedBuilder = databaseAdminPassword(o.getDatabaseAdminPassword()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/RestoreDatabaseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/RestoreDatabaseDetails.java index d8e2bc2890e..9697e5dc495 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/RestoreDatabaseDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/RestoreDatabaseDetails.java @@ -52,9 +52,13 @@ public RestoreDatabaseDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(RestoreDatabaseDetails o) { - return databaseSCN(o.getDatabaseSCN()) - .latest(o.getLatest()) - .timestamp(o.getTimestamp()); + Builder copiedBuilder = + databaseSCN(o.getDatabaseSCN()) + .latest(o.getLatest()) + .timestamp(o.getTimestamp()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/SwitchoverDataGuardAssociationDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/SwitchoverDataGuardAssociationDetails.java index ec93118c2e4..9ba8f2cbaf2 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/SwitchoverDataGuardAssociationDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/SwitchoverDataGuardAssociationDetails.java @@ -38,7 +38,10 @@ public SwitchoverDataGuardAssociationDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(SwitchoverDataGuardAssociationDetails o) { - return databaseAdminPassword(o.getDatabaseAdminPassword()); + Builder copiedBuilder = databaseAdminPassword(o.getDatabaseAdminPassword()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 c1f4b3fd38a..76bde486963 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 @@ -33,7 +33,10 @@ public UpdateDatabaseDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateDatabaseDetails o) { - return dbBackupConfig(o.getDbBackupConfig()); + Builder copiedBuilder = dbBackupConfig(o.getDbBackupConfig()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbHomeDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbHomeDetails.java index 12cf55fa58a..2c65821383b 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbHomeDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbHomeDetails.java @@ -37,7 +37,10 @@ public UpdateDbHomeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateDbHomeDetails o) { - return dbVersion(o.getDbVersion()); + Builder copiedBuilder = dbVersion(o.getDbVersion()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 bf07b015c13..7a08f3af989 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 @@ -66,10 +66,14 @@ public UpdateDbSystemDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateDbSystemDetails o) { - return cpuCoreCount(o.getCpuCoreCount()) - .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) - .sshPublicKeys(o.getSshPublicKeys()) - .version(o.getVersion()); + Builder copiedBuilder = + cpuCoreCount(o.getCpuCoreCount()) + .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) + .sshPublicKeys(o.getSshPublicKeys()) + .version(o.getVersion()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 af29ba6896a..96b930e2fca 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 @@ -13,7 +13,7 @@ public class CreateDbHomeRequest extends com.oracle.bmc.requests.BmcRequest { /** * Request to create a new DB Home. */ - private CreateDbHomeWithDbSystemIdDetails createDbHomeWithDbSystemIdDetails; + private CreateDbHomeWithDbSystemIdBase createDbHomeWithDbSystemIdDetails; /** * A token that uniquely identifies a request so it can be retried in case of a timeout or diff --git a/bmc-examples/pom.xml b/bmc-examples/pom.xml index f129e0c4d2a..406a7e7d09d 100644 --- a/bmc-examples/pom.xml +++ b/bmc-examples/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-bom - 1.2.17 + 1.2.18 pom import diff --git a/bmc-identity/pom.xml b/bmc-identity/pom.xml index b52edd3c8c0..581dcbdc9ed 100644 --- a/bmc-identity/pom.xml +++ b/bmc-identity/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.17 + 1.2.18 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 9196335b081..e845464f481 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.identity; +import java.util.Locale; import com.oracle.bmc.identity.internal.http.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; @@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); 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 200397e7a45..c3524ab7599 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.identity; +import java.util.Locale; import com.oracle.bmc.identity.internal.http.*; import com.oracle.bmc.identity.requests.*; import com.oracle.bmc.identity.responses.*; @@ -120,7 +121,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AddUserToGroupDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AddUserToGroupDetails.java index 3bd6253b979..3d58328de89 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AddUserToGroupDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AddUserToGroupDetails.java @@ -42,7 +42,10 @@ public AddUserToGroupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AddUserToGroupDetails o) { - return userId(o.getUserId()).groupId(o.getGroupId()); + Builder copiedBuilder = userId(o.getUserId()).groupId(o.getGroupId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ApiKey.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ApiKey.java index c9d0201d4b5..86fb86a00d5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ApiKey.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ApiKey.java @@ -106,13 +106,17 @@ public ApiKey build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ApiKey o) { - return keyId(o.getKeyId()) - .keyValue(o.getKeyValue()) - .fingerprint(o.getFingerprint()) - .userId(o.getUserId()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + keyId(o.getKeyId()) + .keyValue(o.getKeyValue()) + .fingerprint(o.getFingerprint()) + .userId(o.getUserId()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AvailabilityDomain.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AvailabilityDomain.java index a6ea8f1f668..7662e1a117b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AvailabilityDomain.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/AvailabilityDomain.java @@ -48,7 +48,10 @@ public AvailabilityDomain build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AvailabilityDomain o) { - return name(o.getName()).compartmentId(o.getCompartmentId()); + Builder copiedBuilder = name(o.getName()).compartmentId(o.getCompartmentId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Compartment.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Compartment.java index de2af15e00b..6fd14726a4a 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Compartment.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Compartment.java @@ -112,13 +112,17 @@ public Compartment build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Compartment o) { - return id(o.getId()) - .compartmentId(o.getCompartmentId()) - .name(o.getName()) - .description(o.getDescription()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .name(o.getName()) + .description(o.getDescription()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateApiKeyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateApiKeyDetails.java index 52d03656d54..5843b817b39 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateApiKeyDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateApiKeyDetails.java @@ -33,7 +33,10 @@ public CreateApiKeyDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateApiKeyDetails o) { - return key(o.getKey()); + Builder copiedBuilder = key(o.getKey()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCompartmentDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCompartmentDetails.java index df199f80963..54f5a96c83b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCompartmentDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCompartmentDetails.java @@ -52,9 +52,13 @@ public CreateCompartmentDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateCompartmentDetails o) { - return compartmentId(o.getCompartmentId()) - .name(o.getName()) - .description(o.getDescription()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .name(o.getName()) + .description(o.getDescription()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCustomerSecretKeyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCustomerSecretKeyDetails.java index 26d8bca2764..31f73fde78c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCustomerSecretKeyDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateCustomerSecretKeyDetails.java @@ -34,7 +34,10 @@ public CreateCustomerSecretKeyDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateCustomerSecretKeyDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateGroupDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateGroupDetails.java index 563d726ca44..cf4f4993a3a 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateGroupDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateGroupDetails.java @@ -52,9 +52,13 @@ public CreateGroupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateGroupDetails o) { - return compartmentId(o.getCompartmentId()) - .name(o.getName()) - .description(o.getDescription()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .name(o.getName()) + .description(o.getDescription()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateIdpGroupMappingDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateIdpGroupMappingDetails.java index c111b5a91f2..647e6684abd 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateIdpGroupMappingDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateIdpGroupMappingDetails.java @@ -43,7 +43,10 @@ public CreateIdpGroupMappingDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateIdpGroupMappingDetails o) { - return idpGroupName(o.getIdpGroupName()).groupId(o.getGroupId()); + Builder copiedBuilder = idpGroupName(o.getIdpGroupName()).groupId(o.getGroupId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreatePolicyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreatePolicyDetails.java index afba506a832..bd2f4798f90 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreatePolicyDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreatePolicyDetails.java @@ -71,11 +71,15 @@ public CreatePolicyDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreatePolicyDetails o) { - return compartmentId(o.getCompartmentId()) - .name(o.getName()) - .statements(o.getStatements()) - .description(o.getDescription()) - .versionDate(o.getVersionDate()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .name(o.getName()) + .statements(o.getStatements()) + .description(o.getDescription()) + .versionDate(o.getVersionDate()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateRegionSubscriptionDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateRegionSubscriptionDetails.java index f30a64be97a..ab46b882a64 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateRegionSubscriptionDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateRegionSubscriptionDetails.java @@ -34,7 +34,10 @@ public CreateRegionSubscriptionDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateRegionSubscriptionDetails o) { - return regionKey(o.getRegionKey()); + Builder copiedBuilder = regionKey(o.getRegionKey()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSaml2IdentityProviderDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSaml2IdentityProviderDetails.java index e295ff33974..b157d07312d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSaml2IdentityProviderDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSaml2IdentityProviderDetails.java @@ -87,12 +87,16 @@ public CreateSaml2IdentityProviderDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateSaml2IdentityProviderDetails o) { - return compartmentId(o.getCompartmentId()) - .name(o.getName()) - .description(o.getDescription()) - .productType(o.getProductType()) - .metadataUrl(o.getMetadataUrl()) - .metadata(o.getMetadata()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .name(o.getName()) + .description(o.getDescription()) + .productType(o.getProductType()) + .metadataUrl(o.getMetadataUrl()) + .metadata(o.getMetadata()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSwiftPasswordDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSwiftPasswordDetails.java index aac94bba8e4..12859a36ca3 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSwiftPasswordDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateSwiftPasswordDetails.java @@ -33,7 +33,10 @@ public CreateSwiftPasswordDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateSwiftPasswordDetails o) { - return description(o.getDescription()); + Builder copiedBuilder = description(o.getDescription()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateUserDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateUserDetails.java index 0cfcc77c874..c63d734d368 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateUserDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateUserDetails.java @@ -52,9 +52,13 @@ public CreateUserDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateUserDetails o) { - return compartmentId(o.getCompartmentId()) - .name(o.getName()) - .description(o.getDescription()); + Builder copiedBuilder = + compartmentId(o.getCompartmentId()) + .name(o.getName()) + .description(o.getDescription()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKey.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKey.java index 1443792b408..56ae8ee2b1f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKey.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKey.java @@ -115,14 +115,18 @@ public CustomerSecretKey build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CustomerSecretKey o) { - return key(o.getKey()) - .id(o.getId()) - .userId(o.getUserId()) - .displayName(o.getDisplayName()) - .timeCreated(o.getTimeCreated()) - .timeExpires(o.getTimeExpires()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + key(o.getKey()) + .id(o.getId()) + .userId(o.getUserId()) + .displayName(o.getDisplayName()) + .timeCreated(o.getTimeCreated()) + .timeExpires(o.getTimeExpires()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKeySummary.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKeySummary.java index 481845fe638..c4661adf26d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKeySummary.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKeySummary.java @@ -100,13 +100,17 @@ public CustomerSecretKeySummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CustomerSecretKeySummary o) { - return id(o.getId()) - .userId(o.getUserId()) - .displayName(o.getDisplayName()) - .timeCreated(o.getTimeCreated()) - .timeExpires(o.getTimeExpires()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + id(o.getId()) + .userId(o.getUserId()) + .displayName(o.getDisplayName()) + .timeCreated(o.getTimeCreated()) + .timeExpires(o.getTimeExpires()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Group.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Group.java index 3275270e5be..8be7847de6f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Group.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Group.java @@ -109,13 +109,17 @@ public Group build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Group o) { - return id(o.getId()) - .compartmentId(o.getCompartmentId()) - .name(o.getName()) - .description(o.getDescription()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .name(o.getName()) + .description(o.getDescription()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/IdpGroupMapping.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/IdpGroupMapping.java index 133dd183885..606738a19cc 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/IdpGroupMapping.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/IdpGroupMapping.java @@ -117,14 +117,18 @@ public IdpGroupMapping build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(IdpGroupMapping o) { - return id(o.getId()) - .idpId(o.getIdpId()) - .idpGroupName(o.getIdpGroupName()) - .groupId(o.getGroupId()) - .compartmentId(o.getCompartmentId()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + id(o.getId()) + .idpId(o.getIdpId()) + .idpGroupName(o.getIdpGroupName()) + .groupId(o.getGroupId()) + .compartmentId(o.getCompartmentId()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Policy.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Policy.java index b4d1a786b5f..091d72ded20 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Policy.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Policy.java @@ -129,15 +129,19 @@ public Policy build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Policy o) { - return id(o.getId()) - .compartmentId(o.getCompartmentId()) - .name(o.getName()) - .statements(o.getStatements()) - .description(o.getDescription()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()) - .versionDate(o.getVersionDate()); + Builder copiedBuilder = + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .name(o.getName()) + .statements(o.getStatements()) + .description(o.getDescription()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()) + .versionDate(o.getVersionDate()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Region.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Region.java index 85aa12a1e6c..036692c9d5f 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Region.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Region.java @@ -50,7 +50,10 @@ public Region build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Region o) { - return key(o.getKey()).name(o.getName()); + Builder copiedBuilder = key(o.getKey()).name(o.getName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/RegionSubscription.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/RegionSubscription.java index 2589a3b4365..b010fc6f133 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/RegionSubscription.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/RegionSubscription.java @@ -70,10 +70,14 @@ public RegionSubscription build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(RegionSubscription o) { - return regionKey(o.getRegionKey()) - .regionName(o.getRegionName()) - .status(o.getStatus()) - .isHomeRegion(o.getIsHomeRegion()); + Builder copiedBuilder = + regionKey(o.getRegionKey()) + .regionName(o.getRegionName()) + .status(o.getStatus()) + .isHomeRegion(o.getIsHomeRegion()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Saml2IdentityProvider.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Saml2IdentityProvider.java index 3e1fa277b61..1404ebc7846 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Saml2IdentityProvider.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Saml2IdentityProvider.java @@ -148,17 +148,21 @@ public Saml2IdentityProvider build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Saml2IdentityProvider o) { - return id(o.getId()) - .compartmentId(o.getCompartmentId()) - .name(o.getName()) - .description(o.getDescription()) - .productType(o.getProductType()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()) - .metadataUrl(o.getMetadataUrl()) - .signingCertificate(o.getSigningCertificate()) - .redirectUrl(o.getRedirectUrl()); + Builder copiedBuilder = + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .name(o.getName()) + .description(o.getDescription()) + .productType(o.getProductType()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()) + .metadataUrl(o.getMetadataUrl()) + .signingCertificate(o.getSigningCertificate()) + .redirectUrl(o.getRedirectUrl()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/SwiftPassword.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/SwiftPassword.java index 5dbe096ef59..924e9135afb 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/SwiftPassword.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/SwiftPassword.java @@ -113,14 +113,18 @@ public SwiftPassword build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(SwiftPassword o) { - return password(o.getPassword()) - .id(o.getId()) - .userId(o.getUserId()) - .description(o.getDescription()) - .timeCreated(o.getTimeCreated()) - .expiresOn(o.getExpiresOn()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + password(o.getPassword()) + .id(o.getId()) + .userId(o.getUserId()) + .description(o.getDescription()) + .timeCreated(o.getTimeCreated()) + .expiresOn(o.getExpiresOn()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Tenancy.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Tenancy.java index e910908c9f0..e01c806426b 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Tenancy.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Tenancy.java @@ -69,10 +69,14 @@ public Tenancy build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Tenancy o) { - return id(o.getId()) - .name(o.getName()) - .description(o.getDescription()) - .homeRegionKey(o.getHomeRegionKey()); + Builder copiedBuilder = + id(o.getId()) + .name(o.getName()) + .description(o.getDescription()) + .homeRegionKey(o.getHomeRegionKey()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UIPassword.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UIPassword.java index ef9b333d8cd..567ee65a8f6 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UIPassword.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UIPassword.java @@ -75,11 +75,15 @@ public UIPassword build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UIPassword o) { - return password(o.getPassword()) - .userId(o.getUserId()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + password(o.getPassword()) + .userId(o.getUserId()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java index 854517e1343..60fb2486cd1 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java @@ -42,7 +42,10 @@ public UpdateCompartmentDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateCompartmentDetails o) { - return description(o.getDescription()).name(o.getName()); + Builder copiedBuilder = description(o.getDescription()).name(o.getName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCustomerSecretKeyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCustomerSecretKeyDetails.java index f34919e4419..f8c6d7ea3cf 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCustomerSecretKeyDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCustomerSecretKeyDetails.java @@ -34,7 +34,10 @@ public UpdateCustomerSecretKeyDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateCustomerSecretKeyDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateGroupDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateGroupDetails.java index f17cd2ee198..99f04125e21 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateGroupDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateGroupDetails.java @@ -33,7 +33,10 @@ public UpdateGroupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateGroupDetails o) { - return description(o.getDescription()); + Builder copiedBuilder = description(o.getDescription()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateIdpGroupMappingDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateIdpGroupMappingDetails.java index 974616acd99..577ddf1312d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateIdpGroupMappingDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateIdpGroupMappingDetails.java @@ -43,7 +43,10 @@ public UpdateIdpGroupMappingDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateIdpGroupMappingDetails o) { - return idpGroupName(o.getIdpGroupName()).groupId(o.getGroupId()); + Builder copiedBuilder = idpGroupName(o.getIdpGroupName()).groupId(o.getGroupId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdatePolicyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdatePolicyDetails.java index 67b4b0be064..d478513fc0c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdatePolicyDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdatePolicyDetails.java @@ -52,9 +52,13 @@ public UpdatePolicyDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdatePolicyDetails o) { - return description(o.getDescription()) - .statements(o.getStatements()) - .versionDate(o.getVersionDate()); + Builder copiedBuilder = + description(o.getDescription()) + .statements(o.getStatements()) + .versionDate(o.getVersionDate()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSaml2IdentityProviderDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSaml2IdentityProviderDetails.java index a4a430f533c..1d4e4ed6e30 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSaml2IdentityProviderDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSaml2IdentityProviderDetails.java @@ -59,9 +59,13 @@ public UpdateSaml2IdentityProviderDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateSaml2IdentityProviderDetails o) { - return description(o.getDescription()) - .metadataUrl(o.getMetadataUrl()) - .metadata(o.getMetadata()); + Builder copiedBuilder = + description(o.getDescription()) + .metadataUrl(o.getMetadataUrl()) + .metadata(o.getMetadata()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateStateDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateStateDetails.java index ae9a4aab395..9abe79f69f5 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateStateDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateStateDetails.java @@ -33,7 +33,10 @@ public UpdateStateDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateStateDetails o) { - return blocked(o.getBlocked()); + Builder copiedBuilder = blocked(o.getBlocked()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSwiftPasswordDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSwiftPasswordDetails.java index da1959a2647..fe67e46de16 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSwiftPasswordDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateSwiftPasswordDetails.java @@ -33,7 +33,10 @@ public UpdateSwiftPasswordDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateSwiftPasswordDetails o) { - return description(o.getDescription()); + Builder copiedBuilder = description(o.getDescription()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserDetails.java index 55faa75f786..361cffb7857 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserDetails.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserDetails.java @@ -33,7 +33,10 @@ public UpdateUserDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateUserDetails o) { - return description(o.getDescription()); + Builder copiedBuilder = description(o.getDescription()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/User.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/User.java index 41be04776a5..0dc3ee10e3d 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/User.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/User.java @@ -112,13 +112,17 @@ public User build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(User o) { - return id(o.getId()) - .compartmentId(o.getCompartmentId()) - .name(o.getName()) - .description(o.getDescription()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .name(o.getName()) + .description(o.getDescription()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserGroupMembership.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserGroupMembership.java index 2c3ed521059..8ec7032e833 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserGroupMembership.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserGroupMembership.java @@ -100,13 +100,17 @@ public UserGroupMembership build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UserGroupMembership o) { - return id(o.getId()) - .compartmentId(o.getCompartmentId()) - .groupId(o.getGroupId()) - .userId(o.getUserId()) - .timeCreated(o.getTimeCreated()) - .lifecycleState(o.getLifecycleState()) - .inactiveStatus(o.getInactiveStatus()); + Builder copiedBuilder = + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .groupId(o.getGroupId()) + .userId(o.getUserId()) + .timeCreated(o.getTimeCreated()) + .lifecycleState(o.getLifecycleState()) + .inactiveStatus(o.getInactiveStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/pom.xml b/bmc-loadbalancer/pom.xml index 4984984e45b..005fe366cba 100644 --- a/bmc-loadbalancer/pom.xml +++ b/bmc-loadbalancer/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.17 + 1.2.18 diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancer.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancer.java index c84cfdd4c90..e35c330144d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancer.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancer.java @@ -85,7 +85,7 @@ public interface LoadBalancer extends AutoCloseable { * To get a list of Availability Domains, use the `ListAvailabilityDomains` operation * in the Identity and Access Management Service API. *

- * All Oracle Bare Metal Cloud Services resources, including load balancers, get an Oracle-assigned, + * All Oracle Cloud Infrastructure resources, including load balancers, get an Oracle-assigned, * unique ID called an Oracle Cloud Identifier (OCID). When you create a resource, you can find its OCID * in the response. You can also retrieve a resource's OCID by using a List API operation on that resource type, * or by viewing the resource in the Console. Fore more information, see diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerAsync.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerAsync.java index ccc69f6fc7b..9731836ea25 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerAsync.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/LoadBalancerAsync.java @@ -114,7 +114,7 @@ java.util.concurrent.Future createListener( * To get a list of Availability Domains, use the `ListAvailabilityDomains` operation * in the Identity and Access Management Service API. *

- * All Oracle Bare Metal Cloud Services resources, including load balancers, get an Oracle-assigned, + * All Oracle Cloud Infrastructure resources, including load balancers, get an Oracle-assigned, * unique ID called an Oracle Cloud Identifier (OCID). When you create a resource, you can find its OCID * in the response. You can also retrieve a resource's OCID by using a List API operation on that resource type, * or by viewing the resource in the Console. Fore more information, see 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 45c1ad0bb6d..e770b888bac 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.loadbalancer; +import java.util.Locale; import com.oracle.bmc.loadbalancer.internal.http.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; @@ -101,7 +102,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); 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 a37790dc7c1..b6861393f21 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 @@ -3,6 +3,7 @@ */ package com.oracle.bmc.loadbalancer; +import java.util.Locale; import com.oracle.bmc.loadbalancer.internal.http.*; import com.oracle.bmc.loadbalancer.requests.*; import com.oracle.bmc.loadbalancer.responses.*; @@ -120,7 +121,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancersConverter.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancersConverter.java index 2a972e19a72..bc4f76ecece 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancersConverter.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/internal/http/ListLoadBalancersConverter.java @@ -62,6 +62,38 @@ public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( request.getDetail())); } + if (request.getSortBy() != null) { + target = + target.queryParam( + "sortBy", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getSortBy().getValue())); + } + + if (request.getSortOrder() != null) { + target = + target.queryParam( + "sortOrder", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getSortOrder().getValue())); + } + + if (request.getDisplayName() != null) { + target = + target.queryParam( + "displayName", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getDisplayName())); + } + + if (request.getLifecycleState() != null) { + target = + target.queryParam( + "lifecycleState", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getLifecycleState())); + } + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Backend.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Backend.java index 22e84efe39d..cead284c2e0 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Backend.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Backend.java @@ -91,13 +91,17 @@ public Backend build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Backend o) { - return backup(o.getBackup()) - .drain(o.getDrain()) - .ipAddress(o.getIpAddress()) - .name(o.getName()) - .offline(o.getOffline()) - .port(o.getPort()) - .weight(o.getWeight()); + Builder copiedBuilder = + backup(o.getBackup()) + .drain(o.getDrain()) + .ipAddress(o.getIpAddress()) + .name(o.getName()) + .offline(o.getOffline()) + .port(o.getPort()) + .weight(o.getWeight()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendDetails.java index f16cccacd2c..7047bf8ea5a 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendDetails.java @@ -80,12 +80,16 @@ public BackendDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BackendDetails o) { - return backup(o.getBackup()) - .drain(o.getDrain()) - .ipAddress(o.getIpAddress()) - .offline(o.getOffline()) - .port(o.getPort()) - .weight(o.getWeight()); + Builder copiedBuilder = + backup(o.getBackup()) + .drain(o.getDrain()) + .ipAddress(o.getIpAddress()) + .offline(o.getOffline()) + .port(o.getPort()) + .weight(o.getWeight()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendHealth.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendHealth.java index 6ba787670d1..55ddb331eec 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendHealth.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendHealth.java @@ -4,7 +4,7 @@ package com.oracle.bmc.loadbalancer.model; /** - * The health status of the specified backend server as reported by the primary and stand-by load balancers. + * The health status of the specified backend server as reported by the primary and standby load balancers. * **/ @javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") @@ -44,7 +44,11 @@ public BackendHealth build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BackendHealth o) { - return healthCheckResults(o.getHealthCheckResults()).status(o.getStatus()); + Builder copiedBuilder = + healthCheckResults(o.getHealthCheckResults()).status(o.getStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -62,7 +66,7 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("healthCheckResults") java.util.List healthCheckResults; /** - * The general health status of the specified backend server as reported by the primary and stand-by load balancers. + * The general health status of the specified backend server as reported by the primary and standby load balancers. *

* **OK:** Both health checks returned `OK`. *

@@ -119,7 +123,7 @@ public static Status create(String key) { } }; /** - * The general health status of the specified backend server as reported by the primary and stand-by load balancers. + * The general health status of the specified backend server as reported by the primary and standby load balancers. *

* **OK:** Both health checks returned `OK`. *

diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSet.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSet.java index 4bf88ba099a..f5e98e42748 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSet.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSet.java @@ -90,12 +90,16 @@ public BackendSet build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BackendSet o) { - return backends(o.getBackends()) - .healthChecker(o.getHealthChecker()) - .name(o.getName()) - .policy(o.getPolicy()) - .sessionPersistenceConfiguration(o.getSessionPersistenceConfiguration()) - .sslConfiguration(o.getSslConfiguration()); + Builder copiedBuilder = + backends(o.getBackends()) + .healthChecker(o.getHealthChecker()) + .name(o.getName()) + .policy(o.getPolicy()) + .sessionPersistenceConfiguration(o.getSessionPersistenceConfiguration()) + .sslConfiguration(o.getSslConfiguration()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -125,9 +129,8 @@ public static Builder builder() { String name; /** - * The load balancer policy for the backend set. The default load balancing policy is 'ROUND_ROBIN' - * To get a list of available policies, use the {@link #listPolicies(ListPoliciesRequest) listPolicies} - * operation. + * The load balancer policy for the backend set. To get a list of available policies, use the + * {@link #listPolicies(ListPoliciesRequest) listPolicies} operation. *

* Example: `LEAST_CONNECTIONS` * diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSetDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSetDetails.java index 09cfd83ecb2..e0a777be36d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSetDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSetDetails.java @@ -82,11 +82,15 @@ public BackendSetDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BackendSetDetails o) { - return backends(o.getBackends()) - .healthChecker(o.getHealthChecker()) - .policy(o.getPolicy()) - .sessionPersistenceConfiguration(o.getSessionPersistenceConfiguration()) - .sslConfiguration(o.getSslConfiguration()); + Builder copiedBuilder = + backends(o.getBackends()) + .healthChecker(o.getHealthChecker()) + .policy(o.getPolicy()) + .sessionPersistenceConfiguration(o.getSessionPersistenceConfiguration()) + .sslConfiguration(o.getSslConfiguration()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -104,9 +108,8 @@ public static Builder builder() { HealthCheckerDetails healthChecker; /** - * The load balancer policy for the backend set. The default load balancing policy is 'ROUND_ROBIN' - * To get a list of available policies, use the {@link #listPolicies(ListPoliciesRequest) listPolicies} - * operation. + * The load balancer policy for the backend set. To get a list of available policies, use the + * {@link #listPolicies(ListPoliciesRequest) listPolicies} operation. *

* Example: `LEAST_CONNECTIONS` * diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSetHealth.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSetHealth.java index cabc4bf640c..0add954c116 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSetHealth.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendSetHealth.java @@ -80,11 +80,15 @@ public BackendSetHealth build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BackendSetHealth o) { - return criticalStateBackendNames(o.getCriticalStateBackendNames()) - .status(o.getStatus()) - .totalBackendCount(o.getTotalBackendCount()) - .unknownStateBackendNames(o.getUnknownStateBackendNames()) - .warningStateBackendNames(o.getWarningStateBackendNames()); + Builder copiedBuilder = + criticalStateBackendNames(o.getCriticalStateBackendNames()) + .status(o.getStatus()) + .totalBackendCount(o.getTotalBackendCount()) + .unknownStateBackendNames(o.getUnknownStateBackendNames()) + .warningStateBackendNames(o.getWarningStateBackendNames()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Certificate.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Certificate.java index 9e863e002c5..d0eddb57f43 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Certificate.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Certificate.java @@ -56,9 +56,13 @@ public Certificate build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Certificate o) { - return caCertificate(o.getCaCertificate()) - .certificateName(o.getCertificateName()) - .publicCertificate(o.getPublicCertificate()); + Builder copiedBuilder = + caCertificate(o.getCaCertificate()) + .certificateName(o.getCertificateName()) + .publicCertificate(o.getPublicCertificate()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CertificateDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CertificateDetails.java index c48634ab3bc..f40e8b91556 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CertificateDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CertificateDetails.java @@ -81,11 +81,15 @@ public CertificateDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CertificateDetails o) { - return caCertificate(o.getCaCertificate()) - .certificateName(o.getCertificateName()) - .passphrase(o.getPassphrase()) - .privateKey(o.getPrivateKey()) - .publicCertificate(o.getPublicCertificate()); + Builder copiedBuilder = + caCertificate(o.getCaCertificate()) + .certificateName(o.getCertificateName()) + .passphrase(o.getPassphrase()) + .privateKey(o.getPrivateKey()) + .publicCertificate(o.getPublicCertificate()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateBackendDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateBackendDetails.java index 209350cd9da..7f84f41b7dd 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateBackendDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateBackendDetails.java @@ -85,12 +85,16 @@ public CreateBackendDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateBackendDetails o) { - return backup(o.getBackup()) - .drain(o.getDrain()) - .ipAddress(o.getIpAddress()) - .offline(o.getOffline()) - .port(o.getPort()) - .weight(o.getWeight()); + Builder copiedBuilder = + backup(o.getBackup()) + .drain(o.getDrain()) + .ipAddress(o.getIpAddress()) + .offline(o.getOffline()) + .port(o.getPort()) + .weight(o.getWeight()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateBackendSetDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateBackendSetDetails.java index 72de73d0a7a..2b16377a7d3 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateBackendSetDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateBackendSetDetails.java @@ -92,12 +92,16 @@ public CreateBackendSetDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateBackendSetDetails o) { - return backends(o.getBackends()) - .healthChecker(o.getHealthChecker()) - .name(o.getName()) - .policy(o.getPolicy()) - .sessionPersistenceConfiguration(o.getSessionPersistenceConfiguration()) - .sslConfiguration(o.getSslConfiguration()); + Builder copiedBuilder = + backends(o.getBackends()) + .healthChecker(o.getHealthChecker()) + .name(o.getName()) + .policy(o.getPolicy()) + .sessionPersistenceConfiguration(o.getSessionPersistenceConfiguration()) + .sslConfiguration(o.getSslConfiguration()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -127,8 +131,8 @@ public static Builder builder() { String name; /** - * The load balancer policy for the backend set. The default load balancing policy is 'ROUND_ROBIN' - * To get a list of available policies, use the {@link #listPolicies(ListPoliciesRequest) listPolicies} operation. + * The load balancer policy for the backend set. To get a list of available policies, use the + * {@link #listPolicies(ListPoliciesRequest) listPolicies} operation. *

* Example: `LEAST_CONNECTIONS` * diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateCertificateDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateCertificateDetails.java index 3b3ce5f8280..c5e2564c05b 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateCertificateDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateCertificateDetails.java @@ -81,11 +81,15 @@ public CreateCertificateDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateCertificateDetails o) { - return caCertificate(o.getCaCertificate()) - .certificateName(o.getCertificateName()) - .passphrase(o.getPassphrase()) - .privateKey(o.getPrivateKey()) - .publicCertificate(o.getPublicCertificate()); + Builder copiedBuilder = + caCertificate(o.getCaCertificate()) + .certificateName(o.getCertificateName()) + .passphrase(o.getPassphrase()) + .privateKey(o.getPrivateKey()) + .publicCertificate(o.getPublicCertificate()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateListenerDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateListenerDetails.java index 923f9590452..9fae16f0328 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateListenerDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateListenerDetails.java @@ -77,11 +77,15 @@ public CreateListenerDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateListenerDetails o) { - return defaultBackendSetName(o.getDefaultBackendSetName()) - .name(o.getName()) - .port(o.getPort()) - .protocol(o.getProtocol()) - .sslConfiguration(o.getSslConfiguration()); + Builder copiedBuilder = + defaultBackendSetName(o.getDefaultBackendSetName()) + .name(o.getName()) + .port(o.getPort()) + .protocol(o.getProtocol()) + .sslConfiguration(o.getSslConfiguration()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateLoadBalancerDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateLoadBalancerDetails.java index d58fc8d344f..3721a303125 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateLoadBalancerDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/CreateLoadBalancerDetails.java @@ -108,14 +108,18 @@ public CreateLoadBalancerDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateLoadBalancerDetails o) { - return backendSets(o.getBackendSets()) - .certificates(o.getCertificates()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .isPrivate(o.getIsPrivate()) - .listeners(o.getListeners()) - .shapeName(o.getShapeName()) - .subnetIds(o.getSubnetIds()); + Builder copiedBuilder = + backendSets(o.getBackendSets()) + .certificates(o.getCertificates()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .isPrivate(o.getIsPrivate()) + .listeners(o.getListeners()) + .shapeName(o.getShapeName()) + .subnetIds(o.getSubnetIds()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -160,7 +164,7 @@ public static Builder builder() { *

* If \"false\", the service assigns a public IP address to the load balancer. A load balancer with a public IP address * requires two subnets, each in a different Availability Domain. One subnet hosts the primary load balancer and the other - * hosts the secondary (stand-by) load balancer. A public load balancer is accessible from the internet, depending on your + * hosts the secondary (standby) load balancer. A public load balancer is accessible from the internet, depending on your * VCN's [security list rules](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/securitylists.htm). *

* Example: `false` diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthCheckResult.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthCheckResult.java index 1e98f3acaa6..3f92e2c7080 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthCheckResult.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthCheckResult.java @@ -65,10 +65,14 @@ public HealthCheckResult build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(HealthCheckResult o) { - return healthCheckStatus(o.getHealthCheckStatus()) - .sourceIpAddress(o.getSourceIpAddress()) - .subnetId(o.getSubnetId()) - .timestamp(o.getTimestamp()); + Builder copiedBuilder = + healthCheckStatus(o.getHealthCheckStatus()) + .sourceIpAddress(o.getSourceIpAddress()) + .subnetId(o.getSubnetId()) + .timestamp(o.getTimestamp()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthChecker.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthChecker.java index 0267f59b078..7e50f413358 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthChecker.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthChecker.java @@ -108,14 +108,18 @@ public HealthChecker build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(HealthChecker o) { - return intervalInMillis(o.getIntervalInMillis()) - .port(o.getPort()) - .protocol(o.getProtocol()) - .responseBodyRegex(o.getResponseBodyRegex()) - .retries(o.getRetries()) - .returnCode(o.getReturnCode()) - .timeoutInMillis(o.getTimeoutInMillis()) - .urlPath(o.getUrlPath()); + Builder copiedBuilder = + intervalInMillis(o.getIntervalInMillis()) + .port(o.getPort()) + .protocol(o.getProtocol()) + .responseBodyRegex(o.getResponseBodyRegex()) + .retries(o.getRetries()) + .returnCode(o.getReturnCode()) + .timeoutInMillis(o.getTimeoutInMillis()) + .urlPath(o.getUrlPath()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthCheckerDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthCheckerDetails.java index 01ac8ba2a0c..fed830490fe 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthCheckerDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/HealthCheckerDetails.java @@ -108,14 +108,18 @@ public HealthCheckerDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(HealthCheckerDetails o) { - return intervalInMillis(o.getIntervalInMillis()) - .port(o.getPort()) - .protocol(o.getProtocol()) - .responseBodyRegex(o.getResponseBodyRegex()) - .retries(o.getRetries()) - .returnCode(o.getReturnCode()) - .timeoutInMillis(o.getTimeoutInMillis()) - .urlPath(o.getUrlPath()); + Builder copiedBuilder = + intervalInMillis(o.getIntervalInMillis()) + .port(o.getPort()) + .protocol(o.getProtocol()) + .responseBodyRegex(o.getResponseBodyRegex()) + .retries(o.getRetries()) + .returnCode(o.getReturnCode()) + .timeoutInMillis(o.getTimeoutInMillis()) + .urlPath(o.getUrlPath()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/IpAddress.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/IpAddress.java index 389ddaadf9c..4eb22dcf155 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/IpAddress.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/IpAddress.java @@ -43,7 +43,10 @@ public IpAddress build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(IpAddress o) { - return ipAddress(o.getIpAddress()).isPublic(o.getIsPublic()); + Builder copiedBuilder = ipAddress(o.getIpAddress()).isPublic(o.getIsPublic()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Listener.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Listener.java index 1d289b09cf4..7446dc02a30 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Listener.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/Listener.java @@ -74,11 +74,15 @@ public Listener build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Listener o) { - return defaultBackendSetName(o.getDefaultBackendSetName()) - .name(o.getName()) - .port(o.getPort()) - .protocol(o.getProtocol()) - .sslConfiguration(o.getSslConfiguration()); + Builder copiedBuilder = + defaultBackendSetName(o.getDefaultBackendSetName()) + .name(o.getName()) + .port(o.getPort()) + .protocol(o.getProtocol()) + .sslConfiguration(o.getSslConfiguration()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/ListenerDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/ListenerDetails.java index 3eabf7557d2..2023add759d 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/ListenerDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/ListenerDetails.java @@ -62,10 +62,14 @@ public ListenerDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ListenerDetails o) { - return defaultBackendSetName(o.getDefaultBackendSetName()) - .port(o.getPort()) - .protocol(o.getProtocol()) - .sslConfiguration(o.getSslConfiguration()); + Builder copiedBuilder = + defaultBackendSetName(o.getDefaultBackendSetName()) + .port(o.getPort()) + .protocol(o.getProtocol()) + .sslConfiguration(o.getSslConfiguration()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancer.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancer.java index a13d14ef0d6..48ec33bb3cf 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancer.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancer.java @@ -156,18 +156,22 @@ public LoadBalancer build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LoadBalancer o) { - return backendSets(o.getBackendSets()) - .certificates(o.getCertificates()) - .compartmentId(o.getCompartmentId()) - .displayName(o.getDisplayName()) - .id(o.getId()) - .ipAddresses(o.getIpAddresses()) - .isPrivate(o.getIsPrivate()) - .lifecycleState(o.getLifecycleState()) - .listeners(o.getListeners()) - .shapeName(o.getShapeName()) - .subnetIds(o.getSubnetIds()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + backendSets(o.getBackendSets()) + .certificates(o.getCertificates()) + .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .id(o.getId()) + .ipAddresses(o.getIpAddresses()) + .isPrivate(o.getIsPrivate()) + .lifecycleState(o.getLifecycleState()) + .listeners(o.getListeners()) + .shapeName(o.getShapeName()) + .subnetIds(o.getSubnetIds()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -224,13 +228,15 @@ public static Builder builder() { *

* If \"false\", the service assigns a public IP address to the load balancer. A load balancer with a public IP address * requires two subnets, each in a different Availability Domain. One subnet hosts the primary load balancer and the other - * hosts the secondary (stand-by) load balancer. A public load balancer is accessible from the internet, depending on your + * hosts the secondary (standby) load balancer. A public load balancer is accessible from the internet, depending on your * VCN's [security list rules](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/securitylists.htm). * **/ @com.fasterxml.jackson.annotation.JsonProperty("isPrivate") Boolean isPrivate; /** + * The current state of the load balancer. + * **/ @lombok.extern.slf4j.Slf4j public enum LifecycleState { @@ -278,7 +284,10 @@ public static LifecycleState create(String key) { return UnknownEnumValue; } }; - + /** + * The current state of the load balancer. + * + **/ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerHealth.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerHealth.java index 268f4b780d8..0f1ac1ae7b0 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerHealth.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerHealth.java @@ -85,11 +85,15 @@ public LoadBalancerHealth build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LoadBalancerHealth o) { - return criticalStateBackendSetNames(o.getCriticalStateBackendSetNames()) - .status(o.getStatus()) - .totalBackendSetCount(o.getTotalBackendSetCount()) - .unknownStateBackendSetNames(o.getUnknownStateBackendSetNames()) - .warningStateBackendSetNames(o.getWarningStateBackendSetNames()); + Builder copiedBuilder = + criticalStateBackendSetNames(o.getCriticalStateBackendSetNames()) + .status(o.getStatus()) + .totalBackendSetCount(o.getTotalBackendSetCount()) + .unknownStateBackendSetNames(o.getUnknownStateBackendSetNames()) + .warningStateBackendSetNames(o.getWarningStateBackendSetNames()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -214,7 +218,7 @@ public static Status create(String key) { * A list of backend sets that are currently in the `UNKNOWN` health state. The list identifies each backend set by the * friendly name you assigned when you created it. *

- * Example: `Backend set2` + * Example: `Backend_set2` * **/ @com.fasterxml.jackson.annotation.JsonProperty("unknownStateBackendSetNames") @@ -224,7 +228,7 @@ public static Status create(String key) { * A list of backend sets that are currently in the `WARNING` health state. The list identifies each backend set by the * friendly name you assigned when you created it. *

- * Example: `Backend set3` + * Example: `Backend_set3` * **/ @com.fasterxml.jackson.annotation.JsonProperty("warningStateBackendSetNames") diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerHealthSummary.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerHealthSummary.java index 4232c218a45..3a05abfe3cd 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerHealthSummary.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerHealthSummary.java @@ -46,7 +46,10 @@ public LoadBalancerHealthSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LoadBalancerHealthSummary o) { - return loadBalancerId(o.getLoadBalancerId()).status(o.getStatus()); + Builder copiedBuilder = loadBalancerId(o.getLoadBalancerId()).status(o.getStatus()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerPolicy.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerPolicy.java index 1ecefd41a11..21491f1868e 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerPolicy.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerPolicy.java @@ -39,7 +39,10 @@ public LoadBalancerPolicy build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LoadBalancerPolicy o) { - return name(o.getName()); + Builder copiedBuilder = name(o.getName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerProtocol.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerProtocol.java index b0eef88f324..2eff751739e 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerProtocol.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerProtocol.java @@ -36,7 +36,10 @@ public LoadBalancerProtocol build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LoadBalancerProtocol o) { - return name(o.getName()); + Builder copiedBuilder = name(o.getName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerShape.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerShape.java index 4f88ad955e0..1e6f324849a 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerShape.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/LoadBalancerShape.java @@ -41,7 +41,10 @@ public LoadBalancerShape build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LoadBalancerShape o) { - return name(o.getName()); + Builder copiedBuilder = name(o.getName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SSLConfiguration.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SSLConfiguration.java index aaf26db6af6..226170a5e73 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SSLConfiguration.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SSLConfiguration.java @@ -56,9 +56,13 @@ public SSLConfiguration build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(SSLConfiguration o) { - return certificateName(o.getCertificateName()) - .verifyDepth(o.getVerifyDepth()) - .verifyPeerCertificate(o.getVerifyPeerCertificate()); + Builder copiedBuilder = + certificateName(o.getCertificateName()) + .verifyDepth(o.getVerifyDepth()) + .verifyPeerCertificate(o.getVerifyPeerCertificate()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SSLConfigurationDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SSLConfigurationDetails.java index 64a4eadda41..8aee1f645c7 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SSLConfigurationDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SSLConfigurationDetails.java @@ -56,9 +56,13 @@ public SSLConfigurationDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(SSLConfigurationDetails o) { - return certificateName(o.getCertificateName()) - .verifyDepth(o.getVerifyDepth()) - .verifyPeerCertificate(o.getVerifyPeerCertificate()); + Builder copiedBuilder = + certificateName(o.getCertificateName()) + .verifyDepth(o.getVerifyDepth()) + .verifyPeerCertificate(o.getVerifyPeerCertificate()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SessionPersistenceConfigurationDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SessionPersistenceConfigurationDetails.java index 2f5a965c96b..b1687cffa87 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SessionPersistenceConfigurationDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/SessionPersistenceConfigurationDetails.java @@ -55,7 +55,11 @@ public SessionPersistenceConfigurationDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(SessionPersistenceConfigurationDetails o) { - return cookieName(o.getCookieName()).disableFallback(o.getDisableFallback()); + Builder copiedBuilder = + cookieName(o.getCookieName()).disableFallback(o.getDisableFallback()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateBackendDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateBackendDetails.java index 32bc5a6b138..f401f722212 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateBackendDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateBackendDetails.java @@ -64,10 +64,14 @@ public UpdateBackendDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateBackendDetails o) { - return backup(o.getBackup()) - .drain(o.getDrain()) - .offline(o.getOffline()) - .weight(o.getWeight()); + Builder copiedBuilder = + backup(o.getBackup()) + .drain(o.getDrain()) + .offline(o.getOffline()) + .weight(o.getWeight()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateBackendSetDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateBackendSetDetails.java index f7b94d1aaa4..d3082517a3c 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateBackendSetDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateBackendSetDetails.java @@ -82,11 +82,15 @@ public UpdateBackendSetDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateBackendSetDetails o) { - return backends(o.getBackends()) - .healthChecker(o.getHealthChecker()) - .policy(o.getPolicy()) - .sessionPersistenceConfiguration(o.getSessionPersistenceConfiguration()) - .sslConfiguration(o.getSslConfiguration()); + Builder copiedBuilder = + backends(o.getBackends()) + .healthChecker(o.getHealthChecker()) + .policy(o.getPolicy()) + .sessionPersistenceConfiguration(o.getSessionPersistenceConfiguration()) + .sslConfiguration(o.getSslConfiguration()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -104,9 +108,8 @@ public static Builder builder() { HealthCheckerDetails healthChecker; /** - * The load balancer policy for the backend set. The default load balancing policy is 'ROUND_ROBIN' - * To get a list of available policies, use the {@link #listPolicies(ListPoliciesRequest) listPolicies} - * operation. + * The load balancer policy for the backend set. To get a list of available policies, use the + * {@link #listPolicies(ListPoliciesRequest) listPolicies} operation. *

* Example: `LEAST_CONNECTIONS` * diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateHealthCheckerDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateHealthCheckerDetails.java index 3ebd6ab7e42..88f2af5ee96 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateHealthCheckerDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateHealthCheckerDetails.java @@ -108,14 +108,18 @@ public UpdateHealthCheckerDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateHealthCheckerDetails o) { - return intervalInMillis(o.getIntervalInMillis()) - .port(o.getPort()) - .protocol(o.getProtocol()) - .responseBodyRegex(o.getResponseBodyRegex()) - .retries(o.getRetries()) - .returnCode(o.getReturnCode()) - .timeoutInMillis(o.getTimeoutInMillis()) - .urlPath(o.getUrlPath()); + Builder copiedBuilder = + intervalInMillis(o.getIntervalInMillis()) + .port(o.getPort()) + .protocol(o.getProtocol()) + .responseBodyRegex(o.getResponseBodyRegex()) + .retries(o.getRetries()) + .returnCode(o.getReturnCode()) + .timeoutInMillis(o.getTimeoutInMillis()) + .urlPath(o.getUrlPath()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateListenerDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateListenerDetails.java index e66cb62e638..e67c70bc014 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateListenerDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateListenerDetails.java @@ -65,10 +65,14 @@ public UpdateListenerDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateListenerDetails o) { - return defaultBackendSetName(o.getDefaultBackendSetName()) - .port(o.getPort()) - .protocol(o.getProtocol()) - .sslConfiguration(o.getSslConfiguration()); + Builder copiedBuilder = + defaultBackendSetName(o.getDefaultBackendSetName()) + .port(o.getPort()) + .protocol(o.getProtocol()) + .sslConfiguration(o.getSslConfiguration()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateLoadBalancerDetails.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateLoadBalancerDetails.java index 8715ce834f8..c5800ca7413 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateLoadBalancerDetails.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/UpdateLoadBalancerDetails.java @@ -36,7 +36,10 @@ public UpdateLoadBalancerDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateLoadBalancerDetails o) { - return displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/WorkRequest.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/WorkRequest.java index 202cb3e2ed5..7faabbd7512 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/WorkRequest.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/WorkRequest.java @@ -110,14 +110,18 @@ public WorkRequest build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(WorkRequest o) { - return errorDetails(o.getErrorDetails()) - .id(o.getId()) - .lifecycleState(o.getLifecycleState()) - .loadBalancerId(o.getLoadBalancerId()) - .message(o.getMessage()) - .timeAccepted(o.getTimeAccepted()) - .timeFinished(o.getTimeFinished()) - .type(o.getType()); + Builder copiedBuilder = + errorDetails(o.getErrorDetails()) + .id(o.getId()) + .lifecycleState(o.getLifecycleState()) + .loadBalancerId(o.getLoadBalancerId()) + .message(o.getMessage()) + .timeAccepted(o.getTimeAccepted()) + .timeFinished(o.getTimeFinished()) + .type(o.getType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } @@ -137,6 +141,8 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("id") String id; /** + * The current state of the work request. + * **/ @lombok.extern.slf4j.Slf4j public enum LifecycleState { @@ -183,7 +189,10 @@ public static LifecycleState create(String key) { return UnknownEnumValue; } }; - + /** + * The current state of the work request. + * + **/ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/WorkRequestError.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/WorkRequestError.java index 22fb5039a06..c3ae366696b 100644 --- a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/WorkRequestError.java +++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/WorkRequestError.java @@ -43,7 +43,10 @@ public WorkRequestError build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(WorkRequestError o) { - return errorCode(o.getErrorCode()).message(o.getMessage()); + Builder copiedBuilder = errorCode(o.getErrorCode()).message(o.getMessage()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } 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 6523f8ec4d6..9f2b8c663a6 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 @@ -46,6 +46,104 @@ public class ListLoadBalancersRequest extends com.oracle.bmc.requests.BmcRequest */ private String detail; + /** + * The field to sort by. Only one sort order may be provided. Time created is default ordered as descending. Display name is default ordered as ascending. + * + */ + private SortBy sortBy; + + /** + * The field to sort by. Only one sort order may be provided. Time created is default ordered as descending. Display name is default ordered as ascending. + * + **/ + public enum SortBy { + Timecreated("TIMECREATED"), + Displayname("DISPLAYNAME"), + ; + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (SortBy v : SortBy.values()) { + map.put(v.getValue(), v); + } + } + + SortBy(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static SortBy create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + throw new RuntimeException("Invalid SortBy: " + key); + } + }; + + /** + * The sort order to use, either 'asc' or 'desc' + * + */ + private SortOrder sortOrder; + + /** + * The sort order to use, either 'asc' or 'desc' + * + **/ + public enum SortOrder { + Asc("ASC"), + Desc("DESC"), + ; + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (SortOrder v : SortOrder.values()) { + map.put(v.getValue(), v); + } + } + + SortOrder(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static SortOrder create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + throw new RuntimeException("Invalid SortOrder: " + key); + } + }; + + /** + * A filter to only return resources that match the given display name exactly. + * + */ + private String displayName; + + /** + * A filter to only return resources that match the given lifecycle state. + * + */ + private LoadBalancer.LifecycleState lifecycleState; + public static class Builder { private com.oracle.bmc.util.internal.Consumer invocationCallback = null; @@ -72,6 +170,10 @@ public Builder copy(ListLoadBalancersRequest o) { limit(o.getLimit()); page(o.getPage()); detail(o.getDetail()); + sortBy(o.getSortBy()); + sortOrder(o.getSortOrder()); + displayName(o.getDisplayName()); + lifecycleState(o.getLifecycleState()); return this; } diff --git a/bmc-objectstorage/pom.xml b/bmc-objectstorage/pom.xml index 6bff5da09ee..a139726a0b5 100644 --- a/bmc-objectstorage/pom.xml +++ b/bmc-objectstorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.2.17 + 1.2.18 diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java index 2436a77bf81..7d8ae1c19f6 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageAsyncClient.java @@ -3,6 +3,7 @@ */ package com.oracle.bmc.objectstorage; +import java.util.Locale; import com.oracle.bmc.objectstorage.internal.http.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; @@ -75,6 +76,8 @@ public ObjectStorageAsyncClient( com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { com.oracle.bmc.http.internal.RestClientFactory restClientFactory = com.oracle.bmc.http.internal.RestClientFactoryBuilder.builder() + .defaultConfigurator( + new com.oracle.bmc.http.DefaultConfigurator.NonBuffering()) .clientConfigurator(clientConfigurator) .build(); com.oracle.bmc.http.signing.RequestSigner requestSigner = @@ -101,7 +104,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java index 003e62cd846..da1598406fb 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/ObjectStorageClient.java @@ -3,6 +3,7 @@ */ package com.oracle.bmc.objectstorage; +import java.util.Locale; import com.oracle.bmc.objectstorage.internal.http.*; import com.oracle.bmc.objectstorage.requests.*; import com.oracle.bmc.objectstorage.responses.*; @@ -75,6 +76,8 @@ public ObjectStorageClient( com.oracle.bmc.http.signing.RequestSignerFactory requestSignerFactory) { com.oracle.bmc.http.internal.RestClientFactory restClientFactory = com.oracle.bmc.http.internal.RestClientFactoryBuilder.builder() + .defaultConfigurator( + new com.oracle.bmc.http.DefaultConfigurator.NonBuffering()) .clientConfigurator(clientConfigurator) .build(); com.oracle.bmc.http.signing.RequestSigner requestSigner = @@ -101,7 +104,7 @@ public void setRegion(com.oracle.bmc.Region region) { @Override public void setRegion(String regionId) { - regionId = regionId.toLowerCase(); + regionId = regionId.toLowerCase(Locale.ENGLISH); try { com.oracle.bmc.Region region = com.oracle.bmc.Region.fromRegionId(regionId); setRegion(region); diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java index 46ccc0ad31b..72cef6cd5d9 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/GetObjectConverter.java @@ -141,10 +141,13 @@ public GetObjectResponse apply(javax.ws.rs.core.Response rawResponse) { } java.util.Map opcMeta = new java.util.HashMap<>(); - String opcMetaPattern = "opc-meta-".toLowerCase(); + String opcMetaPattern = + "opc-meta-".toLowerCase(java.util.Locale.ROOT); for (java.util.Map.Entry> header : headers.entrySet()) { - if (header.getKey().toLowerCase().startsWith(opcMetaPattern)) { + if (header.getKey() + .toLowerCase(java.util.Locale.ROOT) + .startsWith(opcMetaPattern)) { opcMeta.put(header.getKey(), header.getValue().get(0)); } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java index 63c6316cd40..855a34282de 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/internal/http/HeadObjectConverter.java @@ -133,10 +133,13 @@ public HeadObjectResponse apply(javax.ws.rs.core.Response rawResponse) { } java.util.Map opcMeta = new java.util.HashMap<>(); - String opcMetaPattern = "opc-meta-".toLowerCase(); + String opcMetaPattern = + "opc-meta-".toLowerCase(java.util.Locale.ROOT); for (java.util.Map.Entry> header : headers.entrySet()) { - if (header.getKey().toLowerCase().startsWith(opcMetaPattern)) { + if (header.getKey() + .toLowerCase(java.util.Locale.ROOT) + .startsWith(opcMetaPattern)) { opcMeta.put(header.getKey(), header.getValue().get(0)); } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/Bucket.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/Bucket.java index 81fe56c42d5..5a30bd235db 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/Bucket.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/Bucket.java @@ -123,15 +123,19 @@ public Bucket build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Bucket o) { - return namespace(o.getNamespace()) - .name(o.getName()) - .compartmentId(o.getCompartmentId()) - .metadata(o.getMetadata()) - .createdBy(o.getCreatedBy()) - .timeCreated(o.getTimeCreated()) - .etag(o.getEtag()) - .publicAccessType(o.getPublicAccessType()) - .storageTier(o.getStorageTier()); + Builder copiedBuilder = + namespace(o.getNamespace()) + .name(o.getName()) + .compartmentId(o.getCompartmentId()) + .metadata(o.getMetadata()) + .createdBy(o.getCreatedBy()) + .timeCreated(o.getTimeCreated()) + .etag(o.getEtag()) + .publicAccessType(o.getPublicAccessType()) + .storageTier(o.getStorageTier()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/BucketSummary.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/BucketSummary.java index 92f5f411047..467ab300df2 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/BucketSummary.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/BucketSummary.java @@ -83,12 +83,16 @@ public BucketSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BucketSummary o) { - return namespace(o.getNamespace()) - .name(o.getName()) - .compartmentId(o.getCompartmentId()) - .createdBy(o.getCreatedBy()) - .timeCreated(o.getTimeCreated()) - .etag(o.getEtag()); + Builder copiedBuilder = + namespace(o.getNamespace()) + .name(o.getName()) + .compartmentId(o.getCompartmentId()) + .createdBy(o.getCreatedBy()) + .timeCreated(o.getTimeCreated()) + .etag(o.getEtag()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CommitMultipartUploadDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CommitMultipartUploadDetails.java index 9a614c5f240..25e10737b89 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CommitMultipartUploadDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CommitMultipartUploadDetails.java @@ -50,7 +50,11 @@ public CommitMultipartUploadDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CommitMultipartUploadDetails o) { - return partsToCommit(o.getPartsToCommit()).partsToExclude(o.getPartsToExclude()); + Builder copiedBuilder = + partsToCommit(o.getPartsToCommit()).partsToExclude(o.getPartsToExclude()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CommitMultipartUploadPartDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CommitMultipartUploadPartDetails.java index 026b58e6d78..c36bb05c1a4 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CommitMultipartUploadPartDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CommitMultipartUploadPartDetails.java @@ -49,7 +49,10 @@ public CommitMultipartUploadPartDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CommitMultipartUploadPartDetails o) { - return partNum(o.getPartNum()).etag(o.getEtag()); + Builder copiedBuilder = partNum(o.getPartNum()).etag(o.getEtag()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateBucketDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateBucketDetails.java index fc59ee20b71..711c1e1716d 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateBucketDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateBucketDetails.java @@ -77,11 +77,15 @@ public CreateBucketDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateBucketDetails o) { - return name(o.getName()) - .compartmentId(o.getCompartmentId()) - .metadata(o.getMetadata()) - .publicAccessType(o.getPublicAccessType()) - .storageTier(o.getStorageTier()); + Builder copiedBuilder = + name(o.getName()) + .compartmentId(o.getCompartmentId()) + .metadata(o.getMetadata()) + .publicAccessType(o.getPublicAccessType()) + .storageTier(o.getStorageTier()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateMultipartUploadDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateMultipartUploadDetails.java index af32bad0591..a6e80a56982 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateMultipartUploadDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreateMultipartUploadDetails.java @@ -77,11 +77,15 @@ public CreateMultipartUploadDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateMultipartUploadDetails o) { - return object(o.getObject()) - .contentType(o.getContentType()) - .contentLanguage(o.getContentLanguage()) - .contentEncoding(o.getContentEncoding()) - .metadata(o.getMetadata()); + Builder copiedBuilder = + object(o.getObject()) + .contentType(o.getContentType()) + .contentLanguage(o.getContentLanguage()) + .contentEncoding(o.getContentEncoding()) + .metadata(o.getMetadata()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreatePreauthenticatedRequestDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreatePreauthenticatedRequestDetails.java index c4a26fab38b..05b783945a4 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreatePreauthenticatedRequestDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/CreatePreauthenticatedRequestDetails.java @@ -62,10 +62,14 @@ public CreatePreauthenticatedRequestDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreatePreauthenticatedRequestDetails o) { - return name(o.getName()) - .objectName(o.getObjectName()) - .accessType(o.getAccessType()) - .timeExpires(o.getTimeExpires()); + Builder copiedBuilder = + name(o.getName()) + .objectName(o.getObjectName()) + .accessType(o.getAccessType()) + .timeExpires(o.getTimeExpires()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ListObjects.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ListObjects.java index 3d9c0610a42..fd2a8a9c042 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ListObjects.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ListObjects.java @@ -55,9 +55,13 @@ public ListObjects build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ListObjects o) { - return objects(o.getObjects()) - .prefixes(o.getPrefixes()) - .nextStartWith(o.getNextStartWith()); + Builder copiedBuilder = + objects(o.getObjects()) + .prefixes(o.getPrefixes()) + .nextStartWith(o.getNextStartWith()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/MultipartUpload.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/MultipartUpload.java index 2e31e9e82ca..25fb0a1d697 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/MultipartUpload.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/MultipartUpload.java @@ -80,11 +80,15 @@ public MultipartUpload build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(MultipartUpload o) { - return namespace(o.getNamespace()) - .bucket(o.getBucket()) - .object(o.getObject()) - .uploadId(o.getUploadId()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + namespace(o.getNamespace()) + .bucket(o.getBucket()) + .object(o.getObject()) + .uploadId(o.getUploadId()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/MultipartUploadPartSummary.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/MultipartUploadPartSummary.java index 2e51fc7ca29..e7d986a5cbb 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/MultipartUploadPartSummary.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/MultipartUploadPartSummary.java @@ -68,10 +68,14 @@ public MultipartUploadPartSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(MultipartUploadPartSummary o) { - return etag(o.getEtag()) - .md5(o.getMd5()) - .size(o.getSize()) - .partNumber(o.getPartNumber()); + Builder copiedBuilder = + etag(o.getEtag()) + .md5(o.getMd5()) + .size(o.getSize()) + .partNumber(o.getPartNumber()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/NamespaceMetadata.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/NamespaceMetadata.java index 6f206255a0d..89fca1c144b 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/NamespaceMetadata.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/NamespaceMetadata.java @@ -57,9 +57,13 @@ public NamespaceMetadata build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(NamespaceMetadata o) { - return namespace(o.getNamespace()) - .defaultS3CompartmentId(o.getDefaultS3CompartmentId()) - .defaultSwiftCompartmentId(o.getDefaultSwiftCompartmentId()); + Builder copiedBuilder = + namespace(o.getNamespace()) + .defaultS3CompartmentId(o.getDefaultS3CompartmentId()) + .defaultSwiftCompartmentId(o.getDefaultSwiftCompartmentId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ObjectSummary.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ObjectSummary.java index ebd7707088c..a91482ecb74 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ObjectSummary.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/ObjectSummary.java @@ -64,10 +64,14 @@ public ObjectSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(ObjectSummary o) { - return name(o.getName()) - .size(o.getSize()) - .md5(o.getMd5()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + name(o.getName()) + .size(o.getSize()) + .md5(o.getMd5()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/PreauthenticatedRequest.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/PreauthenticatedRequest.java index e2c38d4ce3d..8d4d78f53fa 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/PreauthenticatedRequest.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/PreauthenticatedRequest.java @@ -98,13 +98,17 @@ public PreauthenticatedRequest build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PreauthenticatedRequest o) { - return id(o.getId()) - .name(o.getName()) - .accessUri(o.getAccessUri()) - .objectName(o.getObjectName()) - .accessType(o.getAccessType()) - .timeExpires(o.getTimeExpires()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + id(o.getId()) + .name(o.getName()) + .accessUri(o.getAccessUri()) + .objectName(o.getObjectName()) + .accessType(o.getAccessType()) + .timeExpires(o.getTimeExpires()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/PreauthenticatedRequestSummary.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/PreauthenticatedRequestSummary.java index 1ee73c097eb..65ddd659626 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/PreauthenticatedRequestSummary.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/PreauthenticatedRequestSummary.java @@ -84,12 +84,16 @@ public PreauthenticatedRequestSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PreauthenticatedRequestSummary o) { - return id(o.getId()) - .name(o.getName()) - .objectName(o.getObjectName()) - .accessType(o.getAccessType()) - .timeExpires(o.getTimeExpires()) - .timeCreated(o.getTimeCreated()); + Builder copiedBuilder = + id(o.getId()) + .name(o.getName()) + .objectName(o.getObjectName()) + .accessType(o.getAccessType()) + .timeExpires(o.getTimeExpires()) + .timeCreated(o.getTimeCreated()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/RenameObjectDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/RenameObjectDetails.java index 9d69f1ebf73..284c4d89071 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/RenameObjectDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/RenameObjectDetails.java @@ -81,11 +81,15 @@ public RenameObjectDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(RenameObjectDetails o) { - return sourceName(o.getSourceName()) - .newName(o.getNewName()) - .srcObjIfMatchETag(o.getSrcObjIfMatchETag()) - .newObjIfMatchETag(o.getNewObjIfMatchETag()) - .newObjIfNoneMatchETag(o.getNewObjIfNoneMatchETag()); + Builder copiedBuilder = + sourceName(o.getSourceName()) + .newName(o.getNewName()) + .srcObjIfMatchETag(o.getSrcObjIfMatchETag()) + .newObjIfMatchETag(o.getNewObjIfMatchETag()) + .newObjIfNoneMatchETag(o.getNewObjIfNoneMatchETag()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/RestoreObjectsDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/RestoreObjectsDetails.java index f0f17d8b118..410da84e91b 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/RestoreObjectsDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/RestoreObjectsDetails.java @@ -33,7 +33,10 @@ public RestoreObjectsDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(RestoreObjectsDetails o) { - return objectName(o.getObjectName()); + Builder copiedBuilder = objectName(o.getObjectName()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateBucketDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateBucketDetails.java index 3739a6720e3..15745704361 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateBucketDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateBucketDetails.java @@ -77,11 +77,15 @@ public UpdateBucketDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateBucketDetails o) { - return namespace(o.getNamespace()) - .compartmentId(o.getCompartmentId()) - .name(o.getName()) - .metadata(o.getMetadata()) - .publicAccessType(o.getPublicAccessType()); + Builder copiedBuilder = + namespace(o.getNamespace()) + .compartmentId(o.getCompartmentId()) + .name(o.getName()) + .metadata(o.getMetadata()) + .publicAccessType(o.getPublicAccessType()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateNamespaceMetadataDetails.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateNamespaceMetadataDetails.java index 247d5de6988..bd5e251df0f 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateNamespaceMetadataDetails.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/model/UpdateNamespaceMetadataDetails.java @@ -49,8 +49,12 @@ public UpdateNamespaceMetadataDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateNamespaceMetadataDetails o) { - return defaultS3CompartmentId(o.getDefaultS3CompartmentId()) - .defaultSwiftCompartmentId(o.getDefaultSwiftCompartmentId()); + Builder copiedBuilder = + defaultS3CompartmentId(o.getDefaultS3CompartmentId()) + .defaultSwiftCompartmentId(o.getDefaultSwiftCompartmentId()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; } } diff --git a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java index 2810882c9c9..8e9985e6fad 100644 --- a/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java +++ b/bmc-objectstorage/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java @@ -311,7 +311,13 @@ public static UploadRequestBuilder builder(InputStream stream, long contentLengt * @return a new UploadRequestBuilder instance. */ public static UploadRequestBuilder builder(File file) { - return new UploadRequestBuilder(StreamUtils.toInputStream(file), file.length()); + InputStream stream = StreamUtils.toInputStream(file); + try { + return new UploadRequestBuilder(stream, file.length()); + } catch (Exception e) { + StreamUtils.closeQuietly(stream); + throw e; + } } @RequiredArgsConstructor diff --git a/bmc-objectstorage/src/test/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssemblerTest.java b/bmc-objectstorage/src/test/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssemblerTest.java index e7a53030d6c..5df74db3d76 100644 --- a/bmc-objectstorage/src/test/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssemblerTest.java +++ b/bmc-objectstorage/src/test/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssemblerTest.java @@ -219,10 +219,9 @@ public void addParts_allSuccessful_commit() throws Exception { File file = File.createTempFile("unitTest", ".txt"); file.deleteOnExit(); - FileOutputStream fos = new FileOutputStream(file); - - fos.write(bytes); - fos.close(); + try (FileOutputStream fos = new FileOutputStream(file)) { + fos.write(bytes); + } String etag1 = "etag1"; String etag2 = "etag2"; @@ -274,10 +273,9 @@ public void addParts_someFailed_commitFailure() throws Exception { File file = File.createTempFile("unitTest", ".txt"); file.deleteOnExit(); - FileOutputStream fos = new FileOutputStream(file); - - fos.write(bytes); - fos.close(); + try (FileOutputStream fos = new FileOutputStream(file)) { + fos.write(bytes); + } String etag1 = "etag1"; UploadPartResponse uploadPartResponse1 = UploadPartResponse.builder().eTag(etag1).build(); diff --git a/pom.xml b/pom.xml index 92e48247bc6..f8dd88ebf72 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.2.17 + 1.2.18 pom Oracle Cloud Infrastructure SDK