From 89c69dc064b2a3162a29c2cbfe0540e5862991c7 Mon Sep 17 00:00:00 2001 From: dshelbyo Date: Thu, 13 Dec 2018 16:32:36 +0000 Subject: [PATCH] Releasing version 1.3.3 --- CHANGELOG.md | 12 + .../bmc-apache-connector-provider/pom.xml | 4 +- bmc-addons/pom.xml | 2 +- bmc-audit/pom.xml | 4 +- bmc-bom/pom.xml | 30 +- bmc-common/pom.xml | 2 +- .../bmc/http/internal/ResponseHelper.java | 23 +- .../ContentLengthVerifyingInputStream.java | 102 +++ .../bmc/http/internal/ResponseHelperTest.java | 1 + ...ContentLengthVerifyingInputStreamTest.java | 104 +++ bmc-containerengine/pom.xml | 4 +- bmc-core/pom.xml | 4 +- .../com/oracle/bmc/core/VirtualNetwork.java | 2 +- .../oracle/bmc/core/VirtualNetworkAsync.java | 2 +- .../AttachParavirtualizedVolumeDetails.java | 31 +- .../bmc/core/model/BootVolumeAttachment.java | 21 +- .../model/CreateDrgAttachmentDetails.java | 3 + .../CreateLocalPeeringGatewayDetails.java | 3 + .../bmc/core/model/CrossConnectMapping.java | 16 +- .../oracle/bmc/core/model/DhcpDnsOption.java | 2 +- .../oracle/bmc/core/model/DrgAttachment.java | 5 +- .../bmc/core/model/IScsiVolumeAttachment.java | 15 +- .../bmc/core/model/LaunchInstanceDetails.java | 21 +- .../oracle/bmc/core/model/LaunchOptions.java | 25 +- .../bmc/core/model/LocalPeeringGateway.java | 5 +- .../ParavirtualizedVolumeAttachment.java | 21 +- .../com/oracle/bmc/core/model/Service.java | 2 +- .../model/UpdateDrgAttachmentDetails.java | 5 +- .../UpdateLocalPeeringGatewayDetails.java | 5 +- .../bmc/core/model/VolumeAttachment.java | 6 + .../bmc/core/model/VolumeBackupSchedule.java | 2 +- bmc-database/pom.xml | 4 +- ...utonomousDataWarehouseWalletConverter.java | 42 +- ...rateAutonomousDatabaseWalletConverter.java | 42 +- ...tonomousDataWarehouseBackupsConverter.java | 24 +- ...ListAutonomousDataWarehousesConverter.java | 24 +- ...istAutonomousDatabaseBackupsConverter.java | 24 +- .../ListAutonomousDatabasesConverter.java | 24 +- .../internal/http/ListBackupsConverter.java | 24 +- .../ListDataGuardAssociationsConverter.java | 24 +- .../internal/http/ListDatabasesConverter.java | 24 +- ...istDbHomePatchHistoryEntriesConverter.java | 24 +- .../http/ListDbHomePatchesConverter.java | 24 +- .../internal/http/ListDbHomesConverter.java | 24 +- .../internal/http/ListDbNodesConverter.java | 24 +- ...tDbSystemPatchHistoryEntriesConverter.java | 24 +- .../http/ListDbSystemPatchesConverter.java | 24 +- .../http/ListDbSystemShapesConverter.java | 24 +- .../internal/http/ListDbSystemsConverter.java | 24 +- .../http/ListDbVersionsConverter.java | 24 +- .../model/AutonomousDataWarehouse.java | 372 ++++----- .../model/AutonomousDataWarehouseBackup.java | 199 +++-- .../AutonomousDataWarehouseBackupSummary.java | 196 ++--- ...onomousDataWarehouseConnectionStrings.java | 54 +- .../model/AutonomousDataWarehouseSummary.java | 370 ++++---- .../database/model/AutonomousDatabase.java | 372 ++++----- .../model/AutonomousDatabaseBackup.java | 199 +++-- .../AutonomousDatabaseBackupSummary.java | 196 ++--- .../AutonomousDatabaseConnectionStrings.java | 54 +- .../model/AutonomousDatabaseSummary.java | 370 ++++---- .../com/oracle/bmc/database/model/Backup.java | 252 +++--- .../bmc/database/model/BackupSummary.java | 248 +++--- .../CompleteExternalBackupJobDetails.java | 90 +- ...eAutonomousDataWarehouseBackupDetails.java | 36 +- .../CreateAutonomousDataWarehouseDetails.java | 134 +-- ...CreateAutonomousDatabaseBackupDetails.java | 36 +- .../CreateAutonomousDatabaseDetails.java | 134 +-- .../CreateDataGuardAssociationDetails.java | 12 +- ...dAssociationToExistingDbSystemDetails.java | 2 +- ...uardAssociationWithNewDbSystemDetails.java | 186 +++++ .../database/model/CreateDatabaseDetails.java | 140 ++-- .../CreateDatabaseFromBackupDetails.java | 38 +- .../database/model/CreateDbHomeDetails.java | 40 +- .../model/CreateDbHomeFromBackupDetails.java | 28 +- .../CreateDbHomeWithDbSystemIdDetails.java | 36 +- .../model/CreateExternalBackupJobDetails.java | 248 +++--- .../database/model/DataGuardAssociation.java | 347 ++++---- .../model/DataGuardAssociationSummary.java | 338 ++++---- .../oracle/bmc/database/model/Database.java | 229 +++-- .../bmc/database/model/DatabaseSummary.java | 224 ++--- .../com/oracle/bmc/database/model/DbHome.java | 113 ++- .../bmc/database/model/DbHomeSummary.java | 104 +-- .../com/oracle/bmc/database/model/DbNode.java | 107 ++- .../bmc/database/model/DbNodeSummary.java | 102 +-- .../oracle/bmc/database/model/DbSystem.java | 789 +++++++++--------- .../database/model/DbSystemShapeSummary.java | 112 +-- .../bmc/database/model/DbSystemSummary.java | 772 ++++++++--------- .../bmc/database/model/DbVersionSummary.java | 53 +- .../bmc/database/model/ExternalBackupJob.java | 76 +- ...eAutonomousDataWarehouseWalletDetails.java | 2 +- ...nerateAutonomousDatabaseWalletDetails.java | 2 +- .../database/model/LaunchDbSystemBase.java | 159 ++-- .../database/model/LaunchDbSystemDetails.java | 254 +++--- .../LaunchDbSystemFromBackupDetails.java | 254 +++--- .../com/oracle/bmc/database/model/Patch.java | 102 ++- .../bmc/database/model/PatchDetails.java | 33 +- .../bmc/database/model/PatchHistoryEntry.java | 125 ++- .../model/PatchHistoryEntrySummary.java | 123 ++- .../bmc/database/model/PatchSummary.java | 97 ++- .../model/RestoreDatabaseDetails.java | 36 +- .../UpdateAutonomousDataWarehouseDetails.java | 84 +- .../UpdateAutonomousDatabaseDetails.java | 84 +- .../database/model/UpdateDatabaseDetails.java | 40 +- .../database/model/UpdateDbSystemDetails.java | 92 +- ...AutonomousDataWarehouseWalletResponse.java | 24 +- ...erateAutonomousDatabaseWalletResponse.java | 24 +- ...utonomousDataWarehouseBackupsResponse.java | 16 +- .../ListAutonomousDataWarehousesResponse.java | 16 +- ...ListAutonomousDatabaseBackupsResponse.java | 16 +- .../ListAutonomousDatabasesResponse.java | 16 +- .../responses/ListBackupsResponse.java | 16 +- .../ListDataGuardAssociationsResponse.java | 16 +- .../responses/ListDatabasesResponse.java | 16 +- ...ListDbHomePatchHistoryEntriesResponse.java | 16 +- .../responses/ListDbHomePatchesResponse.java | 16 +- .../responses/ListDbHomesResponse.java | 16 +- .../responses/ListDbNodesResponse.java | 16 +- ...stDbSystemPatchHistoryEntriesResponse.java | 16 +- .../ListDbSystemPatchesResponse.java | 16 +- .../responses/ListDbSystemShapesResponse.java | 16 +- .../responses/ListDbSystemsResponse.java | 16 +- .../responses/ListDbVersionsResponse.java | 16 +- bmc-dns/pom.xml | 4 +- .../src/main/java/com/oracle/bmc/dns/Dns.java | 10 +- .../java/com/oracle/bmc/dns/DnsAsync.java | 10 +- .../dns/internal/http/ListZonesConverter.java | 16 +- .../bmc/dns/model/CreateZoneDetails.java | 52 +- .../oracle/bmc/dns/model/ExternalMaster.java | 4 +- .../com/oracle/bmc/dns/model/Nameserver.java | 67 ++ .../java/com/oracle/bmc/dns/model/Record.java | 4 +- .../oracle/bmc/dns/model/RecordDetails.java | 4 +- .../oracle/bmc/dns/model/RecordOperation.java | 4 +- .../java/com/oracle/bmc/dns/model/TSIG.java | 5 +- .../bmc/dns/model/UpdateZoneDetails.java | 51 +- .../java/com/oracle/bmc/dns/model/Zone.java | 70 +- .../com/oracle/bmc/dns/model/ZoneSummary.java | 121 ++- .../bmc/dns/requests/ListZonesRequest.java | 66 +- .../responses/GetDomainRecordsResponse.java | 7 +- .../bmc/dns/responses/GetRRSetResponse.java | 7 +- .../dns/responses/GetZoneRecordsResponse.java | 7 +- .../bmc/dns/responses/ListZonesResponse.java | 7 +- .../responses/PatchDomainRecordsResponse.java | 7 +- .../bmc/dns/responses/PatchRRSetResponse.java | 7 +- .../responses/PatchZoneRecordsResponse.java | 7 +- .../UpdateDomainRecordsResponse.java | 7 +- .../dns/responses/UpdateRRSetResponse.java | 7 +- .../responses/UpdateZoneRecordsResponse.java | 7 +- bmc-email/pom.xml | 4 +- bmc-examples/pom.xml | 4 +- .../src/main/java/DatabaseExampleHelper.java | 151 ++++ .../LaunchExaDbSystemWithSparseExample.java | 199 +++++ .../src/main/java/ListDBVersionExample.java | 50 ++ .../java/UpdateUserCapabilitesExample.java | 128 +++ .../src/main/java/VmDataGuardExample.java | 379 +++++++++ .../main/java/VolumeAttachmentExample.java | 44 +- ...hmentWithPvEncryptionInTransitExample.java | 255 ++++++ bmc-filestorage/pom.xml | 4 +- bmc-full/pom.xml | 4 +- bmc-identity/pom.xml | 4 +- .../com/oracle/bmc/identity/Identity.java | 27 + .../oracle/bmc/identity/IdentityAsync.java | 50 ++ .../bmc/identity/IdentityAsyncClient.java | 228 +++++ .../oracle/bmc/identity/IdentityClient.java | 79 ++ .../bmc/identity/IdentityPaginators.java | 119 +++ .../ListIdentityProviderGroupsConverter.java | 129 +++ .../internal/http/ListUsersConverter.java | 16 + .../http/ResetIdpScimClientConverter.java | 94 +++ .../http/UpdateUserCapabilitiesConverter.java | 108 +++ .../CreateSaml2IdentityProviderDetails.java | 27 +- .../model/IdentityProviderGroupSummary.java | 164 ++++ .../identity/model/Saml2IdentityProvider.java | 27 +- .../identity/model/ScimClientCredentials.java | 85 ++ .../UpdateSaml2IdentityProviderDetails.java | 31 +- .../model/UpdateUserCapabilitiesDetails.java | 145 ++++ .../com/oracle/bmc/identity/model/User.java | 55 +- .../bmc/identity/model/UserCapabilities.java | 138 +++ .../ListIdentityProviderGroupsRequest.java | 74 ++ .../identity/requests/ListUsersRequest.java | 14 + .../requests/ResetIdpScimClientRequest.java | 60 ++ .../UpdateUserCapabilitiesRequest.java | 75 ++ .../ListIdentityProviderGroupsResponse.java | 46 + .../responses/ResetIdpScimClientResponse.java | 37 + .../UpdateUserCapabilitiesResponse.java | 43 + bmc-keymanagement/pom.xml | 4 +- bmc-loadbalancer/pom.xml | 4 +- .../bmc-objectstorage-combined/pom.xml | 6 +- .../bmc-objectstorage-extensions/pom.xml | 6 +- .../bmc-objectstorage-generated/pom.xml | 4 +- bmc-objectstorage/pom.xml | 2 +- bmc-resourcesearch/pom.xml | 4 +- bmc-shaded/bmc-shaded-full/pom.xml | 2 +- bmc-shaded/pom.xml | 2 +- pom.xml | 2 +- 193 files changed, 8884 insertions(+), 4962 deletions(-) create mode 100644 bmc-common/src/main/java/com/oracle/bmc/io/internal/ContentLengthVerifyingInputStream.java create mode 100644 bmc-common/src/test/java/com/oracle/bmc/io/internal/ContentLengthVerifyingInputStreamTest.java create mode 100644 bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationWithNewDbSystemDetails.java create mode 100644 bmc-dns/src/main/java/com/oracle/bmc/dns/model/Nameserver.java create mode 100644 bmc-examples/src/main/java/DatabaseExampleHelper.java create mode 100644 bmc-examples/src/main/java/LaunchExaDbSystemWithSparseExample.java create mode 100644 bmc-examples/src/main/java/ListDBVersionExample.java create mode 100644 bmc-examples/src/main/java/UpdateUserCapabilitesExample.java create mode 100644 bmc-examples/src/main/java/VmDataGuardExample.java create mode 100644 bmc-examples/src/main/java/VolumeAttachmentWithPvEncryptionInTransitExample.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdentityProviderGroupsConverter.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ResetIdpScimClientConverter.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserCapabilitiesConverter.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/model/IdentityProviderGroupSummary.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/model/ScimClientCredentials.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserCapabilitiesDetails.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserCapabilities.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdentityProviderGroupsRequest.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ResetIdpScimClientRequest.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserCapabilitiesRequest.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListIdentityProviderGroupsResponse.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ResetIdpScimClientResponse.java create mode 100644 bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserCapabilitiesResponse.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b0c3a8e410..d87708a0dcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Added - N/A +## 1.3.3 - 2018-12-13 +### Added +- Support for Data Guard for VM shapes in the Database service +- Support for sparse disk groups for Exadata shapes in the Database service +- Support for a new field, isLatestForMajorVersion, when listing DB versions in the Database service +- Support for in-transit encryption for paravirtualized boot volume and data volume attachments in the Block Storage service +- Support for tagging DNS Zones in the DNS service +- Support for resetting credentials for SCIM clients associated with an Identity provider and updating user capabilities in the Identity service + +### Fixed +- If the response body is an InputStream and the Content-Length header is available, the OCI Java SDK now throws an IOException if the data provided by the InputStream has a different size + ## 1.3.2 - 2018-11-29 ### Added - Support for getting bucket statistics in the Object Storage service diff --git a/bmc-addons/bmc-apache-connector-provider/pom.xml b/bmc-addons/bmc-apache-connector-provider/pom.xml index 66f4ac16d33..719d5c1543f 100644 --- a/bmc-addons/bmc-apache-connector-provider/pom.xml +++ b/bmc-addons/bmc-apache-connector-provider/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-addons - 1.3.2 + 1.3.3 ../pom.xml @@ -37,7 +37,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-addons/pom.xml b/bmc-addons/pom.xml index a29a0303d33..f0323225faf 100644 --- a/bmc-addons/pom.xml +++ b/bmc-addons/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml diff --git a/bmc-audit/pom.xml b/bmc-audit/pom.xml index 84b0186cd8f..0ef79005919 100644 --- a/bmc-audit/pom.xml +++ b/bmc-audit/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-bom/pom.xml b/bmc-bom/pom.xml index d6b5d384514..1aa45de2c4f 100644 --- a/bmc-bom/pom.xml +++ b/bmc-bom/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml oci-java-sdk-bom @@ -19,86 +19,86 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-audit - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-containerengine - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-core - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-database - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-dns - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-email - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-filestorage - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-identity - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-loadbalancer - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-objectstorage - 1.3.2 + 1.3.3 false com.oracle.oci.sdk oci-java-sdk-resourcesearch false - 1.3.2 + 1.3.3 com.oracle.oci.sdk false oci-java-sdk-addons-apache - 1.3.2 + 1.3.3 com.oracle.oci.sdk oci-java-sdk-keymanagement - 1.3.2 + 1.3.3 false diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml index 1b1a6333313..54bb899c346 100644 --- a/bmc-common/pom.xml +++ b/bmc-common/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml 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 0d9098770ca..fee25cf091a 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 @@ -3,7 +3,6 @@ */ package com.oracle.bmc.http.internal; -import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.HashMap; import java.util.List; @@ -18,6 +17,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; +import com.google.common.base.Optional; +import com.oracle.bmc.io.internal.ContentLengthVerifyingInputStream; import com.oracle.bmc.model.BmcException; import lombok.Builder; @@ -188,7 +189,25 @@ public static T readEntity(@NonNull final Response response, Class entity contentType); try { // NOTE: do not buffer InputStreams (namely object storage) as those might be very large - return response.readEntity(entityType); + final InputStream rawInputStream = response.readEntity(InputStream.class); + InputStream inputStream = rawInputStream; + + Optional> contentLengthHeader = + HeaderUtils.get( + response.getStringHeaders(), HttpHeaders.CONTENT_LENGTH); + // If the Content-Length header is present, verify that the length of the input stream matches it + if (contentLengthHeader.isPresent()) { + long contentLength = + HeaderUtils.toValue( + HttpHeaders.CONTENT_LENGTH, + contentLengthHeader.get().get(0), + Long.class); + + inputStream = + new ContentLengthVerifyingInputStream( + rawInputStream, contentLength); + } + return (T) inputStream; } finally { response.getHeaders().addAll(HttpHeaders.CONTENT_TYPE, contentType); } diff --git a/bmc-common/src/main/java/com/oracle/bmc/io/internal/ContentLengthVerifyingInputStream.java b/bmc-common/src/main/java/com/oracle/bmc/io/internal/ContentLengthVerifyingInputStream.java new file mode 100644 index 00000000000..f0fca9f857b --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/io/internal/ContentLengthVerifyingInputStream.java @@ -0,0 +1,102 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.io.internal; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import java.io.IOException; +import java.io.InputStream; + +/** + * A wrapper over an {@link java.io.InputStream} whose length is known, which verifies that + * the length of the wrapped stream matches its known length. + * + * NOTE: This implementation of content length verification does not support {@link InputStream#reset()} + * and the verification is disabled upon invocation of {@link InputStream#reset()}. + */ +@Slf4j +@RequiredArgsConstructor +public class ContentLengthVerifyingInputStream extends InputStream { + private final InputStream delegate; + private final long contentLength; + + private long totalBytesProcessed = 0L; + private boolean isVerificationEnabled = true; + + @Override + public int read() throws IOException { + final int byteRead = delegate.read(); + // Either one byte read or eof + final int bytesRead = byteRead != -1 ? 1 : -1; + processBytesRead(bytesRead); + return byteRead; + } + + @Override + public int read(byte b[]) throws IOException { + final int bytesRead = delegate.read(b); + processBytesRead(bytesRead); + return bytesRead; + } + + @Override + public int read(byte b[], int off, int len) throws IOException { + final int bytesRead = delegate.read(b, off, len); + processBytesRead(bytesRead); + return bytesRead; + } + + @Override + public long skip(long n) throws IOException { + final long bytesSkipped = delegate.skip(n); + totalBytesProcessed += bytesSkipped; + return bytesSkipped; + } + + @Override + public synchronized void mark(int readlimit) { + delegate.mark(readlimit); + } + + @Override + public synchronized void reset() throws IOException { + isVerificationEnabled = false; + LOG.info("Content length verification disabled"); + delegate.reset(); + } + + @Override + public int available() throws IOException { + return delegate.available(); + } + + @Override + public void close() throws IOException { + delegate.close(); + } + + @Override + public boolean markSupported() { + return delegate.markSupported(); + } + + private void processBytesRead(final int bytesRead) throws IOException { + if (!isVerificationEnabled) { + return; + } + + if (bytesRead == -1) { + if (totalBytesProcessed != contentLength) { + throw new IOException( + String.format( + "Total bytes processed (%d) does not match content-length (%d)", + totalBytesProcessed, + contentLength)); + } + } else { + totalBytesProcessed += bytesRead; + } + } +} diff --git a/bmc-common/src/test/java/com/oracle/bmc/http/internal/ResponseHelperTest.java b/bmc-common/src/test/java/com/oracle/bmc/http/internal/ResponseHelperTest.java index 43ba0a0120d..63de586cdc8 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/http/internal/ResponseHelperTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/http/internal/ResponseHelperTest.java @@ -105,6 +105,7 @@ public void testReadEntity_streamWithConentType() { verify(response).readEntity(entityType); verify(headers).addAll(HttpHeaders.CONTENT_TYPE, contentType); verify(response, never()).bufferEntity(); + verify(response).getStringHeaders(); verifyNoMoreInteractions(response, statusInfo, headers, mockStream); } diff --git a/bmc-common/src/test/java/com/oracle/bmc/io/internal/ContentLengthVerifyingInputStreamTest.java b/bmc-common/src/test/java/com/oracle/bmc/io/internal/ContentLengthVerifyingInputStreamTest.java new file mode 100644 index 00000000000..78530ce0542 --- /dev/null +++ b/bmc-common/src/test/java/com/oracle/bmc/io/internal/ContentLengthVerifyingInputStreamTest.java @@ -0,0 +1,104 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.io.internal; + +import static org.junit.Assert.*; +import org.junit.Test; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; + +public class ContentLengthVerifyingInputStreamTest { + private static byte[] TEST_BUFFER = "This is a test string".getBytes(); + + @Test + public void readByte_validInputStream() throws IOException { + final InputStream inputStream = createInputStream(TEST_BUFFER); + while (inputStream.read() != -1) {} + } + + @Test + public void readBuffer_validInputStream() throws IOException { + final InputStream inputStream = createInputStream(TEST_BUFFER); + byte[] buffer = new byte[8]; + while (inputStream.read(buffer) != -1) {} + } + + @Test + public void readOffsetBuffer_validInputStream() throws IOException { + final InputStream inputStream = createInputStream(TEST_BUFFER); + byte[] buffer = new byte[1000]; + int offset = 0; + int bytesRead; + while ((bytesRead = inputStream.read(buffer, offset, 2)) != -1) { + offset += bytesRead; + } + } + + @Test + public void readSkipMark_validInputStream() throws IOException { + final InputStream inputStream = createInputStream(TEST_BUFFER); + performReadSkipMark(inputStream); + } + + @Test(expected = IOException.class) + public void readSkipMark_inputStreamShorterThanExpectedLength_shouldFail() throws IOException { + final InputStream inputStream = createInputStream(TEST_BUFFER, 2000); + performReadSkipMark(inputStream); + } + + @Test(expected = IOException.class) + public void readBuffer_inputStreamLongerThanExpectedLength_shouldFail() throws IOException { + final InputStream inputStream = createInputStream(TEST_BUFFER, 2); + byte[] buffer = new byte[10]; + while (inputStream.read(buffer) != -1) {} + } + + @Test(expected = IOException.class) + public void readBuffer_inputStreamShorterThanExpectedLength_shouldFail() throws IOException { + final InputStream inputStream = createInputStream(TEST_BUFFER, 2000); + byte[] buffer = new byte[10]; + while (inputStream.read(buffer) != -1) {} + } + + @Test + public void readSkipMarkReset_inputStreamShorterThanExpectedLength_shouldSucceed() + throws IOException { + final InputStream inputStream = createInputStream(TEST_BUFFER, 2000); + byte[] buffer = new byte[6]; + + assertNotEquals(-1, inputStream.read()); + assertEquals(6, inputStream.read(buffer)); + inputStream.mark(1); + assertEquals(3, inputStream.skip(3)); + inputStream.skip(5); + inputStream.reset(); + while (inputStream.read() != -1) {} + } + + private InputStream createInputStream(final byte[] buffer) { + return createInputStream(buffer, buffer.length); + } + + private InputStream createInputStream(final byte[] buffer, final long contentLength) { + return new ContentLengthVerifyingInputStream( + new ByteArrayInputStream(buffer), contentLength); + } + + private static void performReadSkipMark(final InputStream inputStream) throws IOException { + byte[] buffer = new byte[6]; + + assertNotEquals(-1, inputStream.read()); + assertEquals(6, inputStream.read(buffer)); + inputStream.mark(1); + assertEquals(3, inputStream.skip(3)); + inputStream.skip(5); + assertNotEquals(-1, inputStream.read()); + assertEquals(3, inputStream.read(buffer, 2, 3)); + inputStream.mark(2); + assertEquals(2, inputStream.read(buffer)); + while (inputStream.read() != -1) {} + } +} diff --git a/bmc-containerengine/pom.xml b/bmc-containerengine/pom.xml index d79d9dd03c8..7798b6669ab 100644 --- a/bmc-containerengine/pom.xml +++ b/bmc-containerengine/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-core/pom.xml b/bmc-core/pom.xml index 1188d4a4af8..63e63edf55e 100644 --- a/bmc-core/pom.xml +++ b/bmc-core/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 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 a6d66b2a033..c75fb774c84 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 @@ -1551,7 +1551,7 @@ UpdateLocalPeeringGatewayResponse updateLocalPeeringGateway( * {@link #deletePublicIp(DeletePublicIpRequest) deletePublicIp}, which * unassigns and deletes the ephemeral public IP. *

- **Note:** If a public IP (either ephemeral or reserved) is assigned to a secondary private + **Note:** If a public IP is assigned to a secondary private * IP (see {@link PrivateIp}), and you move that secondary * private IP to another VNIC, the public IP moves with it. *

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 168314f5a11..48816381a89 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 @@ -2372,7 +2372,7 @@ java.util.concurrent.Future updatePrivateIp( * {@link #deletePublicIp(DeletePublicIpRequest, Consumer, Consumer) deletePublicIp}, which * unassigns and deletes the ephemeral public IP. *

- **Note:** If a public IP (either ephemeral or reserved) is assigned to a secondary private + **Note:** If a public IP is assigned to a secondary private * IP (see {@link PrivateIp}), and you move that secondary * private IP to another VNIC, the public IP moves with it. *

diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachParavirtualizedVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachParavirtualizedVolumeDetails.java index f7376b52d82..4daf676486e 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachParavirtualizedVolumeDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/AttachParavirtualizedVolumeDetails.java @@ -66,13 +66,26 @@ public Builder volumeId(String volumeId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + private Boolean isPvEncryptionInTransitEnabled; + + public Builder isPvEncryptionInTransitEnabled(Boolean isPvEncryptionInTransitEnabled) { + this.isPvEncryptionInTransitEnabled = isPvEncryptionInTransitEnabled; + this.__explicitlySet__.add("isPvEncryptionInTransitEnabled"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public AttachParavirtualizedVolumeDetails build() { AttachParavirtualizedVolumeDetails __instance__ = new AttachParavirtualizedVolumeDetails( - displayName, instanceId, isReadOnly, volumeId); + displayName, + instanceId, + isReadOnly, + volumeId, + isPvEncryptionInTransitEnabled); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -83,7 +96,8 @@ public Builder copy(AttachParavirtualizedVolumeDetails o) { displayName(o.getDisplayName()) .instanceId(o.getInstanceId()) .isReadOnly(o.getIsReadOnly()) - .volumeId(o.getVolumeId()); + .volumeId(o.getVolumeId()) + .isPvEncryptionInTransitEnabled(o.getIsPvEncryptionInTransitEnabled()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -99,10 +113,21 @@ public static Builder builder() { @Deprecated public AttachParavirtualizedVolumeDetails( - String displayName, String instanceId, Boolean isReadOnly, String volumeId) { + String displayName, + String instanceId, + Boolean isReadOnly, + String volumeId, + Boolean isPvEncryptionInTransitEnabled) { super(displayName, instanceId, isReadOnly, volumeId); + this.isPvEncryptionInTransitEnabled = isPvEncryptionInTransitEnabled; } + /** + * Whether to enable encryption in transit for the PV data volume attachment. Defaults to false. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + Boolean isPvEncryptionInTransitEnabled; + @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 index ead2ec89699..561bba4935a 100644 --- 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 @@ -100,6 +100,15 @@ public Builder timeCreated(java.util.Date timeCreated) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + private Boolean isPvEncryptionInTransitEnabled; + + public Builder isPvEncryptionInTransitEnabled(Boolean isPvEncryptionInTransitEnabled) { + this.isPvEncryptionInTransitEnabled = isPvEncryptionInTransitEnabled; + this.__explicitlySet__.add("isPvEncryptionInTransitEnabled"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -113,7 +122,8 @@ public BootVolumeAttachment build() { id, instanceId, lifecycleState, - timeCreated); + timeCreated, + isPvEncryptionInTransitEnabled); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -128,7 +138,8 @@ public Builder copy(BootVolumeAttachment o) { .id(o.getId()) .instanceId(o.getInstanceId()) .lifecycleState(o.getLifecycleState()) - .timeCreated(o.getTimeCreated()); + .timeCreated(o.getTimeCreated()) + .isPvEncryptionInTransitEnabled(o.getIsPvEncryptionInTransitEnabled()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -247,6 +258,12 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") java.util.Date timeCreated; + /** + * Whether the enable encryption in transit for the PV volume attachment is on or not. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + Boolean isPvEncryptionInTransitEnabled; + @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/CreateDrgAttachmentDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateDrgAttachmentDetails.java index 39e3c6c1af2..e1533abb4e2 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 @@ -108,6 +108,9 @@ public static Builder builder() { * If you don't specify a route table here, the DRG attachment is created without an associated route * table. The Networking service does NOT automatically associate the attached VCN's default route table * with the DRG attachment. + *

+ * For information about why you would associate a route table with a DRG attachment, see + * [Advanced Scenario: Transit Routing](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/transitrouting.htm). * **/ @com.fasterxml.jackson.annotation.JsonProperty("routeTableId") 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 index 0574da033b4..808fffda4a3 100644 --- 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 @@ -158,6 +158,9 @@ public static Builder builder() { * If you don't specify a route table here, the LPG is created without an associated route * table. The Networking service does NOT automatically associate the attached VCN's default route table * with the LPG. + *

+ * For information about why you would associate a route table with an LPG, see + * [Advanced Scenario: Transit Routing](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/transitrouting.htm). * **/ @com.fasterxml.jackson.annotation.JsonProperty("routeTableId") 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 00bbe6bdd3f..00e8fcdae9e 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 @@ -16,7 +16,7 @@ * If you're a customer who is colocated with Oracle, that means you own both * the virtual circuit and the physical connection it runs on (cross-connect or * cross-connect group), so you specify all the information in the mapping. There's - * one exception: for a public virtual circuit, Oracle specifies the BGP IP + * one exception: for a public virtual circuit, Oracle specifies the BGP IPv4 * addresses. *

* If you're a provider, then you own the physical connection that the customer's @@ -28,7 +28,7 @@ * the provider also specifies the BGP peering information. If the BGP session instead * goes from Oracle to the customer's edge router, then the customer specifies the BGP * peering information. There's one exception: for a public virtual circuit, Oracle - * specifies the BGP IP addresses. + * specifies the BGP IPv4 addresses. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -151,13 +151,13 @@ public static Builder builder() { String crossConnectOrCrossConnectGroupId; /** - * The BGP IP address for the router on the other end of the BGP session from + * The BGP IPv4 address for the router on the other end of the BGP session from * Oracle. Specified by the owner of that router. If the session goes from Oracle - * to a customer, this is the BGP IP address of the customer's edge router. If the - * session goes from Oracle to a provider, this is the BGP IP address of the + * to a customer, this is the BGP IPv4 address of the customer's edge router. If the + * session goes from Oracle to a provider, this is the BGP IPv4 address of the * provider's edge router. Must use a /30 or /31 subnet mask. *

- * There's one exception: for a public virtual circuit, Oracle specifies the BGP IP addresses. + * There's one exception: for a public virtual circuit, Oracle specifies the BGP IPv4 addresses. *

* Example: `10.0.0.18/31` * @@ -166,12 +166,12 @@ public static Builder builder() { String customerBgpPeeringIp; /** - * The IP address for Oracle's end of the BGP session. Must use a /30 or /31 + * The IPv4 address for Oracle's end of the BGP session. Must use a /30 or /31 * subnet mask. If the session goes from Oracle to a customer's edge router, * the customer specifies this information. If the session goes from Oracle to * a provider's edge router, the provider specifies this. *

- * There's one exception: for a public virtual circuit, Oracle specifies the BGP IP addresses. + * There's one exception: for a public virtual circuit, Oracle specifies the BGP IPv4 addresses. *

* Example: `10.0.0.19/31` * 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 c4bdc2756d6..d6b812e370e 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 @@ -84,7 +84,7 @@ public DhcpDnsOption(java.util.List customDnsServers, ServerType serverT /** * If you set `serverType` to `CustomDnsServer`, specify the - * IP address of at least one DNS server of your choice (three maximum). gd + * IP address of at least one DNS server of your choice (three maximum). * **/ @com.fasterxml.jackson.annotation.JsonProperty("customDnsServers") 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 9a6bf19f9b6..ae6181c7a1f 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 @@ -221,7 +221,10 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The OCID of the route table the DRG attachment is using. + * The OCID of the route table the DRG attachment is using. For information about why you + * would associate a route table with a DRG attachment, see + * [Advanced Scenario: Transit Routing](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/transitrouting.htm). + * **/ @com.fasterxml.jackson.annotation.JsonProperty("routeTableId") String routeTableId; 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 77e75319630..d53382428be 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 @@ -111,6 +111,15 @@ public Builder volumeId(String volumeId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + private Boolean isPvEncryptionInTransitEnabled; + + public Builder isPvEncryptionInTransitEnabled(Boolean isPvEncryptionInTransitEnabled) { + this.isPvEncryptionInTransitEnabled = isPvEncryptionInTransitEnabled; + this.__explicitlySet__.add("isPvEncryptionInTransitEnabled"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("chapSecret") private String chapSecret; @@ -171,6 +180,7 @@ public IScsiVolumeAttachment build() { lifecycleState, timeCreated, volumeId, + isPvEncryptionInTransitEnabled, chapSecret, chapUsername, ipv4, @@ -192,6 +202,7 @@ public Builder copy(IScsiVolumeAttachment o) { .lifecycleState(o.getLifecycleState()) .timeCreated(o.getTimeCreated()) .volumeId(o.getVolumeId()) + .isPvEncryptionInTransitEnabled(o.getIsPvEncryptionInTransitEnabled()) .chapSecret(o.getChapSecret()) .chapUsername(o.getChapUsername()) .ipv4(o.getIpv4()) @@ -221,6 +232,7 @@ public IScsiVolumeAttachment( LifecycleState lifecycleState, java.util.Date timeCreated, String volumeId, + Boolean isPvEncryptionInTransitEnabled, String chapSecret, String chapUsername, String ipv4, @@ -235,7 +247,8 @@ public IScsiVolumeAttachment( isReadOnly, lifecycleState, timeCreated, - volumeId); + volumeId, + isPvEncryptionInTransitEnabled); this.chapSecret = chapSecret; this.chapUsername = chapUsername; this.ipv4 = ipv4; 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 256209f4307..862a09535db 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 @@ -162,6 +162,15 @@ public Builder subnetId(String subnetId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + private Boolean isPvEncryptionInTransitEnabled; + + public Builder isPvEncryptionInTransitEnabled(Boolean isPvEncryptionInTransitEnabled) { + this.isPvEncryptionInTransitEnabled = isPvEncryptionInTransitEnabled; + this.__explicitlySet__.add("isPvEncryptionInTransitEnabled"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -182,7 +191,8 @@ public LaunchInstanceDetails build() { metadata, shape, sourceDetails, - subnetId); + subnetId, + isPvEncryptionInTransitEnabled); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -204,7 +214,8 @@ public Builder copy(LaunchInstanceDetails o) { .metadata(o.getMetadata()) .shape(o.getShape()) .sourceDetails(o.getSourceDetails()) - .subnetId(o.getSubnetId()); + .subnetId(o.getSubnetId()) + .isPvEncryptionInTransitEnabled(o.getIsPvEncryptionInTransitEnabled()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -439,6 +450,12 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("subnetId") String subnetId; + /** + * Whether to enable encryption in transit for the PV boot volume attachment. Defaults to false. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + Boolean isPvEncryptionInTransitEnabled; + @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/LaunchOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchOptions.java index e6b1d14a217..52e081bab5a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchOptions.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchOptions.java @@ -59,12 +59,26 @@ public Builder remoteDataVolumeType(RemoteDataVolumeType remoteDataVolumeType) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + private Boolean isPvEncryptionInTransitEnabled; + + public Builder isPvEncryptionInTransitEnabled(Boolean isPvEncryptionInTransitEnabled) { + this.isPvEncryptionInTransitEnabled = isPvEncryptionInTransitEnabled; + this.__explicitlySet__.add("isPvEncryptionInTransitEnabled"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public LaunchOptions build() { LaunchOptions __instance__ = - new LaunchOptions(bootVolumeType, firmware, networkType, remoteDataVolumeType); + new LaunchOptions( + bootVolumeType, + firmware, + networkType, + remoteDataVolumeType, + isPvEncryptionInTransitEnabled); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -75,7 +89,8 @@ public Builder copy(LaunchOptions o) { bootVolumeType(o.getBootVolumeType()) .firmware(o.getFirmware()) .networkType(o.getNetworkType()) - .remoteDataVolumeType(o.getRemoteDataVolumeType()); + .remoteDataVolumeType(o.getRemoteDataVolumeType()) + .isPvEncryptionInTransitEnabled(o.getIsPvEncryptionInTransitEnabled()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -351,6 +366,12 @@ public static RemoteDataVolumeType create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("remoteDataVolumeType") RemoteDataVolumeType remoteDataVolumeType; + /** + * Whether to enable encryption in transit for the PV boot volume attachment. Defaults to false. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + Boolean isPvEncryptionInTransitEnabled; + @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/LocalPeeringGateway.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LocalPeeringGateway.java index 423ce9acd51..c25f48dd249 100644 --- 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 @@ -410,7 +410,10 @@ public static PeeringStatus create(String key) { String peeringStatusDetails; /** - * The OCID of the route table the LPG is using. + * The OCID of the route table the LPG is using. For information about why you + * would associate a route table with an LPG, see + * [Advanced Scenario: Transit Routing](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/transitrouting.htm). + * **/ @com.fasterxml.jackson.annotation.JsonProperty("routeTableId") String routeTableId; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/ParavirtualizedVolumeAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/ParavirtualizedVolumeAttachment.java index afb528e471d..dde9cf2de7a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/ParavirtualizedVolumeAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/ParavirtualizedVolumeAttachment.java @@ -111,6 +111,15 @@ public Builder volumeId(String volumeId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + private Boolean isPvEncryptionInTransitEnabled; + + public Builder isPvEncryptionInTransitEnabled(Boolean isPvEncryptionInTransitEnabled) { + this.isPvEncryptionInTransitEnabled = isPvEncryptionInTransitEnabled; + this.__explicitlySet__.add("isPvEncryptionInTransitEnabled"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -125,7 +134,8 @@ public ParavirtualizedVolumeAttachment build() { isReadOnly, lifecycleState, timeCreated, - volumeId); + volumeId, + isPvEncryptionInTransitEnabled); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -141,7 +151,8 @@ public Builder copy(ParavirtualizedVolumeAttachment o) { .isReadOnly(o.getIsReadOnly()) .lifecycleState(o.getLifecycleState()) .timeCreated(o.getTimeCreated()) - .volumeId(o.getVolumeId()); + .volumeId(o.getVolumeId()) + .isPvEncryptionInTransitEnabled(o.getIsPvEncryptionInTransitEnabled()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -165,7 +176,8 @@ public ParavirtualizedVolumeAttachment( Boolean isReadOnly, LifecycleState lifecycleState, java.util.Date timeCreated, - String volumeId) { + String volumeId, + Boolean isPvEncryptionInTransitEnabled) { super( availabilityDomain, compartmentId, @@ -175,7 +187,8 @@ public ParavirtualizedVolumeAttachment( isReadOnly, lifecycleState, timeCreated, - volumeId); + volumeId, + isPvEncryptionInTransitEnabled); } @com.fasterxml.jackson.annotation.JsonIgnore diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Service.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Service.java index b1b84530e1d..474ccba6280 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Service.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Service.java @@ -111,7 +111,7 @@ public static Builder builder() { String id; /** - * Name of the service. + * Name of the service. This name can change and is not guaranteed to be unique. **/ @com.fasterxml.jackson.annotation.JsonProperty("name") String name; 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 b8f23822217..3de0c5e0000 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 @@ -78,7 +78,10 @@ public static Builder builder() { String displayName; /** - * The OCID of the route table the DRG attachment will use. + * The OCID of the route table the DRG attachment will use. For information about why you + * would associate a route table with a DRG attachment, see + * [Advanced Scenario: Transit Routing](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/transitrouting.htm). + * **/ @com.fasterxml.jackson.annotation.JsonProperty("routeTableId") String routeTableId; 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 index 117d3d19344..01b7d6dabd3 100644 --- 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 @@ -122,7 +122,10 @@ public static Builder builder() { java.util.Map freeformTags; /** - * The OCID of the route table the LPG will use. + * The OCID of the route table the LPG will use. For information about why you + * would associate a route table with an LPG, see + * [Advanced Scenario: Transit Routing](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/transitrouting.htm). + * **/ @com.fasterxml.jackson.annotation.JsonProperty("routeTableId") String routeTableId; diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeAttachment.java index f29b8e45476..263c98c58fa 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeAttachment.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeAttachment.java @@ -158,4 +158,10 @@ public static LifecycleState create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("volumeId") String volumeId; + + /** + * Whether the enable encryption in transit for the PV volume attachment is on or not. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("isPvEncryptionInTransitEnabled") + Boolean isPvEncryptionInTransitEnabled; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackupSchedule.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackupSchedule.java index f0c8cb0a5c0..ddf7b7dd5a2 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackupSchedule.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackupSchedule.java @@ -143,7 +143,7 @@ public static BackupType create(String key) { BackupType backupType; /** - * The number of seconds (positive or negative) that the backup time should be shifted from the default interval boundaries specified by the period. + * The number of seconds (positive or negative) that the backup time should be shifted from the default interval boundaries specified by the period. Backup time = Frequency start time + Offset. **/ @com.fasterxml.jackson.annotation.JsonProperty("offsetSeconds") Integer offsetSeconds; diff --git a/bmc-database/pom.xml b/bmc-database/pom.xml index 96348548e2f..9f4b125329a 100644 --- a/bmc-database/pom.xml +++ b/bmc-database/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GenerateAutonomousDataWarehouseWalletConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GenerateAutonomousDataWarehouseWalletConverter.java index 9aecda9f1e6..cefbd8b9afc 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GenerateAutonomousDataWarehouseWalletConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GenerateAutonomousDataWarehouseWalletConverter.java @@ -89,6 +89,27 @@ public GenerateAutonomousDataWarehouseWalletResponse apply( builder.inputStream(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)); + } + com.google.common.base.Optional> contentLengthHeader = com.oracle.bmc.http.internal.HeaderUtils.get( @@ -101,15 +122,6 @@ public GenerateAutonomousDataWarehouseWalletResponse apply( Long.class)); } - 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> lastModifiedHeader = com.oracle.bmc.http.internal.HeaderUtils.get( @@ -122,18 +134,6 @@ public GenerateAutonomousDataWarehouseWalletResponse apply( java.util.Date.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)); - } - GenerateAutonomousDataWarehouseWalletResponse responseWrapper = builder.build(); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GenerateAutonomousDatabaseWalletConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GenerateAutonomousDatabaseWalletConverter.java index 210ec0c8f7e..b4d29a7ca35 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GenerateAutonomousDatabaseWalletConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/GenerateAutonomousDatabaseWalletConverter.java @@ -88,6 +88,27 @@ public GenerateAutonomousDatabaseWalletResponse apply( builder.inputStream(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)); + } + com.google.common.base.Optional> contentLengthHeader = com.oracle.bmc.http.internal.HeaderUtils.get( @@ -100,15 +121,6 @@ public GenerateAutonomousDatabaseWalletResponse apply( Long.class)); } - 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> lastModifiedHeader = com.oracle.bmc.http.internal.HeaderUtils.get( @@ -121,18 +133,6 @@ public GenerateAutonomousDatabaseWalletResponse apply( java.util.Date.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)); - } - GenerateAutonomousDatabaseWalletResponse responseWrapper = builder.build(); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDataWarehouseBackupsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDataWarehouseBackupsConverter.java index 8fc999c9668..3173575ba52 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDataWarehouseBackupsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDataWarehouseBackupsConverter.java @@ -137,18 +137,6 @@ public ListAutonomousDataWarehouseBackupsResponse apply( 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( @@ -161,6 +149,18 @@ public ListAutonomousDataWarehouseBackupsResponse apply( String.class)); } + 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)); + } + ListAutonomousDataWarehouseBackupsResponse responseWrapper = builder.build(); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDataWarehousesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDataWarehousesConverter.java index 862c65655e2..c4477368f96 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDataWarehousesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDataWarehousesConverter.java @@ -126,18 +126,6 @@ public ListAutonomousDataWarehousesResponse apply( 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( @@ -150,6 +138,18 @@ public ListAutonomousDataWarehousesResponse apply( String.class)); } + 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)); + } + ListAutonomousDataWarehousesResponse responseWrapper = builder.build(); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDatabaseBackupsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDatabaseBackupsConverter.java index 69a2dc9c90f..ad788cd28da 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDatabaseBackupsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDatabaseBackupsConverter.java @@ -140,18 +140,6 @@ public ListAutonomousDatabaseBackupsResponse apply( 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( @@ -164,6 +152,18 @@ public ListAutonomousDatabaseBackupsResponse apply( String.class)); } + 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)); + } + ListAutonomousDatabaseBackupsResponse responseWrapper = builder.build(); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDatabasesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDatabasesConverter.java index a0ca684c12b..f08d93c6832 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDatabasesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListAutonomousDatabasesConverter.java @@ -129,18 +129,6 @@ public ListAutonomousDatabasesResponse apply( 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( @@ -153,6 +141,18 @@ public ListAutonomousDatabasesResponse apply( String.class)); } + 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)); + } + ListAutonomousDatabasesResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListBackupsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListBackupsConverter.java index 498b4fb2573..3b9b703a4f7 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListBackupsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListBackupsConverter.java @@ -96,18 +96,6 @@ public ListBackupsResponse apply( 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( @@ -120,6 +108,18 @@ public ListBackupsResponse apply( String.class)); } + 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)); + } + ListBackupsResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDataGuardAssociationsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDataGuardAssociationsConverter.java index 4c935b2bee3..d49443706b4 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDataGuardAssociationsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDataGuardAssociationsConverter.java @@ -94,18 +94,6 @@ public ListDataGuardAssociationsResponse apply( 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( @@ -118,6 +106,18 @@ public ListDataGuardAssociationsResponse apply( String.class)); } + 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)); + } + ListDataGuardAssociationsResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDatabasesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDatabasesConverter.java index 456d035fe46..10bb1985e81 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDatabasesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDatabasesConverter.java @@ -127,18 +127,6 @@ public ListDatabasesResponse apply( 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( @@ -151,6 +139,18 @@ public ListDatabasesResponse apply( String.class)); } + 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)); + } + ListDatabasesResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchHistoryEntriesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchHistoryEntriesConverter.java index 7f2a9dc9ee8..9fd97b91411 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchHistoryEntriesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchHistoryEntriesConverter.java @@ -94,18 +94,6 @@ public ListDbHomePatchHistoryEntriesResponse apply( 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( @@ -118,6 +106,18 @@ public ListDbHomePatchHistoryEntriesResponse apply( String.class)); } + 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)); + } + ListDbHomePatchHistoryEntriesResponse responseWrapper = builder.build(); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchesConverter.java index 552076a7a77..b0ce2b0fc9c 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomePatchesConverter.java @@ -89,18 +89,6 @@ public ListDbHomePatchesResponse apply( 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( @@ -113,6 +101,18 @@ public ListDbHomePatchesResponse apply( String.class)); } + 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)); + } + ListDbHomePatchesResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomesConverter.java index b16141b0f43..2faa8032e00 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbHomesConverter.java @@ -126,18 +126,6 @@ public ListDbHomesResponse apply( 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( @@ -150,6 +138,18 @@ public ListDbHomesResponse apply( String.class)); } + 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)); + } + ListDbHomesResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbNodesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbNodesConverter.java index 5d47e7fa7cf..484ff8ed6d7 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbNodesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbNodesConverter.java @@ -118,18 +118,6 @@ public ListDbNodesResponse apply( 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( @@ -142,6 +130,18 @@ public ListDbNodesResponse apply( String.class)); } + 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)); + } + ListDbNodesResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchHistoryEntriesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchHistoryEntriesConverter.java index afe6a005aa0..75d7b671b88 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchHistoryEntriesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchHistoryEntriesConverter.java @@ -94,18 +94,6 @@ public ListDbSystemPatchHistoryEntriesResponse apply( 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( @@ -118,6 +106,18 @@ public ListDbSystemPatchHistoryEntriesResponse apply( String.class)); } + 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)); + } + ListDbSystemPatchHistoryEntriesResponse responseWrapper = builder.build(); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchesConverter.java index bfde305fabc..b2c91911faa 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemPatchesConverter.java @@ -90,18 +90,6 @@ public ListDbSystemPatchesResponse apply( 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( @@ -114,6 +102,18 @@ public ListDbSystemPatchesResponse apply( String.class)); } + 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)); + } + ListDbSystemPatchesResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemShapesConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemShapesConverter.java index e5a1070a034..d0946d6d613 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemShapesConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemShapesConverter.java @@ -97,18 +97,6 @@ public ListDbSystemShapesResponse apply( 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( @@ -121,6 +109,18 @@ public ListDbSystemShapesResponse apply( String.class)); } + 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)); + } + ListDbSystemShapesResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemsConverter.java index 9fd5925e77c..5872cc3f7bc 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbSystemsConverter.java @@ -136,18 +136,6 @@ public ListDbSystemsResponse apply( 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( @@ -160,6 +148,18 @@ public ListDbSystemsResponse apply( String.class)); } + 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)); + } + ListDbSystemsResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbVersionsConverter.java b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbVersionsConverter.java index 4b4024ffbdb..c58a269ffe9 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbVersionsConverter.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/internal/http/ListDbVersionsConverter.java @@ -104,18 +104,6 @@ public ListDbVersionsResponse apply( 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( @@ -128,6 +116,18 @@ public ListDbVersionsResponse apply( String.class)); } + 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)); + } + ListDbVersionsResponse responseWrapper = builder.build(); return responseWrapper; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouse.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouse.java index 60e909f9d67..c46a64cd805 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouse.java @@ -5,8 +5,6 @@ /** * An Oracle Autonomous Data Warehouse. - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -27,6 +25,15 @@ public class AutonomousDataWarehouse { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @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("compartmentId") private String compartmentId; @@ -36,13 +43,30 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") - private AutonomousDataWarehouseConnectionStrings connectionStrings; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; - public Builder connectionStrings( - AutonomousDataWarehouseConnectionStrings connectionStrings) { - this.connectionStrings = connectionStrings; - this.__explicitlySet__.add("connectionStrings"); + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; + + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + private String dbName; + + public Builder dbName(String dbName) { + this.dbName = dbName; + this.__explicitlySet__.add("dbName"); return this; } @@ -64,31 +88,12 @@ public Builder dataStorageSizeInTBs(Integer dataStorageSizeInTBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - private String dbName; - - public Builder dbName(String dbName) { - this.dbName = dbName; - this.__explicitlySet__.add("dbName"); - 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("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); return this; } @@ -101,21 +106,22 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") + private String serviceConsoleUrl; - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); + public Builder serviceConsoleUrl(String serviceConsoleUrl) { + this.serviceConsoleUrl = serviceConsoleUrl; + this.__explicitlySet__.add("serviceConsoleUrl"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") + private AutonomousDataWarehouseConnectionStrings connectionStrings; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder connectionStrings( + AutonomousDataWarehouseConnectionStrings connectionStrings) { + this.connectionStrings = connectionStrings; + this.__explicitlySet__.add("connectionStrings"); return this; } @@ -128,39 +134,31 @@ public Builder licenseModel(LicenseModel licenseModel) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; - - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - private LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; - public Builder lifecycleState(LifecycleState lifecycleState) { - this.lifecycleState = lifecycleState; - this.__explicitlySet__.add("lifecycleState"); + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") - private String serviceConsoleUrl; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder serviceConsoleUrl(String serviceConsoleUrl) { - this.serviceConsoleUrl = serviceConsoleUrl; - this.__explicitlySet__.add("serviceConsoleUrl"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - private java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + private String dbVersion; - public Builder timeCreated(java.util.Date timeCreated) { - this.timeCreated = timeCreated; - this.__explicitlySet__.add("timeCreated"); + public Builder dbVersion(String dbVersion) { + this.dbVersion = dbVersion; + this.__explicitlySet__.add("dbVersion"); return this; } @@ -170,21 +168,21 @@ public Builder timeCreated(java.util.Date timeCreated) { public AutonomousDataWarehouse build() { AutonomousDataWarehouse __instance__ = new AutonomousDataWarehouse( + id, compartmentId, - connectionStrings, + lifecycleState, + lifecycleDetails, + dbName, cpuCoreCount, dataStorageSizeInTBs, - dbName, - dbVersion, - definedTags, + timeCreated, displayName, - freeformTags, - id, - licenseModel, - lifecycleDetails, - lifecycleState, serviceConsoleUrl, - timeCreated); + connectionStrings, + licenseModel, + freeformTags, + definedTags, + dbVersion); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -192,21 +190,21 @@ public AutonomousDataWarehouse build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDataWarehouse o) { Builder copiedBuilder = - compartmentId(o.getCompartmentId()) - .connectionStrings(o.getConnectionStrings()) + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .lifecycleState(o.getLifecycleState()) + .lifecycleDetails(o.getLifecycleDetails()) + .dbName(o.getDbName()) .cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInTBs(o.getDataStorageSizeInTBs()) - .dbName(o.getDbName()) - .dbVersion(o.getDbVersion()) - .definedTags(o.getDefinedTags()) + .timeCreated(o.getTimeCreated()) .displayName(o.getDisplayName()) - .freeformTags(o.getFreeformTags()) - .id(o.getId()) - .licenseModel(o.getLicenseModel()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) .serviceConsoleUrl(o.getServiceConsoleUrl()) - .timeCreated(o.getTimeCreated()); + .connectionStrings(o.getConnectionStrings()) + .licenseModel(o.getLicenseModel()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) + .dbVersion(o.getDbVersion()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -220,29 +218,84 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; - /** - * The connection string used to connect to the Data Warehouse. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Data Warehouse for the password value. + * The current state of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") - AutonomousDataWarehouseConnectionStrings connectionStrings; + @lombok.extern.slf4j.Slf4j + public enum LifecycleState { + Provisioning("PROVISIONING"), + Available("AVAILABLE"), + Stopping("STOPPING"), + Stopped("STOPPED"), + Starting("STARTING"), + Terminating("TERMINATING"), + Terminated("TERMINATED"), + Unavailable("UNAVAILABLE"), + RestoreInProgress("RESTORE_IN_PROGRESS"), + BackupInProgress("BACKUP_IN_PROGRESS"), + ScaleInProgress("SCALE_IN_PROGRESS"), + AvailableNeedsAttention("AVAILABLE_NEEDS_ATTENTION"), + + /** + * 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 number of CPU cores to be made available to the database. + * The current state of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") - Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; /** - * The quantity of data in the database, in terabytes. + * Information about the current lifecycle state. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") - Integer dataStorageSizeInTBs; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** * The database name. @@ -251,20 +304,22 @@ public static Builder builder() { String dbName; /** - * A valid Oracle Database version for Autonomous Data Warehouse. + * The number of CPU cores to be made available to the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") - String dbVersion; + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") + Integer cpuCoreCount; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * + * The quantity of data in the database, in terabytes. **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") + Integer dataStorageSizeInTBs; + + /** + * The date and time the database was created. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; /** * The user-friendly name for the Autonomous Data Warehouse. The name does not have to be unique. @@ -273,20 +328,16 @@ public static Builder builder() { String displayName; /** - * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Department\": \"Finance\"}` - * + * The URL of the Service Console for the Data Warehouse. **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") + String serviceConsoleUrl; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse. + * The connection string used to connect to the Data Warehouse. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Data Warehouse for the password value. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") + AutonomousDataWarehouseConnectionStrings connectionStrings; /** * The Oracle license model that applies to the Oracle Autonomous Data Warehouse. The default is BRING_YOUR_OWN_LICENSE. * @@ -342,83 +393,30 @@ public static LicenseModel create(String key) { LicenseModel licenseModel; /** - * Information about the current lifecycle state. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; - /** - * The current state of the database. - **/ - @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Provisioning("PROVISIONING"), - Available("AVAILABLE"), - Stopping("STOPPING"), - Stopped("STOPPED"), - Starting("STARTING"), - Terminating("TERMINATING"), - Terminated("TERMINATED"), - Unavailable("UNAVAILABLE"), - RestoreInProgress("RESTORE_IN_PROGRESS"), - BackupInProgress("BACKUP_IN_PROGRESS"), - ScaleInProgress("SCALE_IN_PROGRESS"), - AvailableNeedsAttention("AVAILABLE_NEEDS_ATTENTION"), - - /** - * 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 database. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The URL of the Service Console for the Data Warehouse. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") - String serviceConsoleUrl; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; /** - * The date and time the database was created. + * A valid Oracle Database version for Autonomous Data Warehouse. **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + String dbVersion; @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/AutonomousDataWarehouseBackup.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseBackup.java index 346538bf01f..63ff1faca0e 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseBackup.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseBackup.java @@ -5,9 +5,6 @@ /** * An Autonomous Data Warehouse backup. - * 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). - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -28,12 +25,12 @@ public class AutonomousDataWarehouseBackup { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") - private String autonomousDataWarehouseId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder autonomousDataWarehouseId(String autonomousDataWarehouseId) { - this.autonomousDataWarehouseId = autonomousDataWarehouseId; - this.__explicitlySet__.add("autonomousDataWarehouseId"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -46,6 +43,15 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") + private String autonomousDataWarehouseId; + + public Builder autonomousDataWarehouseId(String autonomousDataWarehouseId) { + this.autonomousDataWarehouseId = autonomousDataWarehouseId; + this.__explicitlySet__.add("autonomousDataWarehouseId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -55,12 +61,12 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("type") + private Type type; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder type(Type type) { + this.type = type; + this.__explicitlySet__.add("type"); return this; } @@ -73,21 +79,12 @@ public Builder isAutomatic(Boolean isAutomatic) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; - - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - private LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") + private java.util.Date timeStarted; - public Builder lifecycleState(LifecycleState lifecycleState) { - this.lifecycleState = lifecycleState; - this.__explicitlySet__.add("lifecycleState"); + public Builder timeStarted(java.util.Date timeStarted) { + this.timeStarted = timeStarted; + this.__explicitlySet__.add("timeStarted"); return this; } @@ -100,21 +97,21 @@ public Builder timeEnded(java.util.Date timeEnded) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") - private java.util.Date timeStarted; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder timeStarted(java.util.Date timeStarted) { - this.timeStarted = timeStarted; - this.__explicitlySet__.add("timeStarted"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("type") - private Type type; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; - public Builder type(Type type) { - this.type = type; - this.__explicitlySet__.add("type"); + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); return this; } @@ -124,16 +121,16 @@ public Builder type(Type type) { public AutonomousDataWarehouseBackup build() { AutonomousDataWarehouseBackup __instance__ = new AutonomousDataWarehouseBackup( - autonomousDataWarehouseId, + id, compartmentId, + autonomousDataWarehouseId, displayName, - id, + type, isAutomatic, - lifecycleDetails, - lifecycleState, - timeEnded, timeStarted, - type); + timeEnded, + lifecycleDetails, + lifecycleState); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -141,16 +138,16 @@ public AutonomousDataWarehouseBackup build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDataWarehouseBackup o) { Builder copiedBuilder = - autonomousDataWarehouseId(o.getAutonomousDataWarehouseId()) + id(o.getId()) .compartmentId(o.getCompartmentId()) + .autonomousDataWarehouseId(o.getAutonomousDataWarehouseId()) .displayName(o.getDisplayName()) - .id(o.getId()) + .type(o.getType()) .isAutomatic(o.getIsAutomatic()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .timeEnded(o.getTimeEnded()) .timeStarted(o.getTimeStarted()) - .type(o.getType()); + .timeEnded(o.getTimeEnded()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -165,10 +162,10 @@ public static Builder builder() { } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") - String autonomousDataWarehouseId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. @@ -177,38 +174,23 @@ public static Builder builder() { String compartmentId; /** - * The user-friendly name for the backup. The name does not have to be unique. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse backup. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; - - /** - * Indicates whether the backup is user-initiated or automatic. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse. **/ - @com.fasterxml.jackson.annotation.JsonProperty("isAutomatic") - Boolean isAutomatic; + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") + String autonomousDataWarehouseId; /** - * Additional information about the current lifecycle state. + * The user-friendly name for the backup. The name does not have to be unique. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; /** - * The current state of the backup. + * The type of backup. **/ @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Creating("CREATING"), - Active("ACTIVE"), - Deleting("DELETING"), - Deleted("DELETED"), - Failed("FAILED"), + public enum Type { + Incremental("INCREMENTAL"), + Full("FULL"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -217,18 +199,18 @@ public enum LifecycleState { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (LifecycleState v : LifecycleState.values()) { + for (Type v : Type.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - LifecycleState(String value) { + Type(String value) { this.value = value; } @@ -238,40 +220,54 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static LifecycleState create(String key) { + public static Type create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", - key); + "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * The current state of the backup. + * The type of backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("type") + Type type; /** - * The date and time the backup completed. + * Indicates whether the backup is user-initiated or automatic. **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - java.util.Date timeEnded; + @com.fasterxml.jackson.annotation.JsonProperty("isAutomatic") + Boolean isAutomatic; /** * The date and time the backup started. **/ @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") java.util.Date timeStarted; + /** - * The type of backup. + * The date and time the backup completed. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + java.util.Date timeEnded; + + /** + * Additional information about the current lifecycle state. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; + /** + * The current state of the backup. **/ @lombok.extern.slf4j.Slf4j - public enum Type { - Incremental("INCREMENTAL"), - Full("FULL"), + public enum LifecycleState { + Creating("CREATING"), + Active("ACTIVE"), + Deleting("DELETING"), + Deleted("DELETED"), + Failed("FAILED"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -280,18 +276,18 @@ public enum Type { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (Type v : Type.values()) { + for (LifecycleState v : LifecycleState.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - Type(String value) { + LifecycleState(String value) { this.value = value; } @@ -301,20 +297,21 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static Type create(String key) { + public static LifecycleState create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", + key); return UnknownEnumValue; } }; /** - * The type of backup. + * The current state of the backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("type") - Type type; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; @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/AutonomousDataWarehouseBackupSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseBackupSummary.java index 1521f2718c5..db67c134c92 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseBackupSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseBackupSummary.java @@ -28,12 +28,12 @@ public class AutonomousDataWarehouseBackupSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") - private String autonomousDataWarehouseId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder autonomousDataWarehouseId(String autonomousDataWarehouseId) { - this.autonomousDataWarehouseId = autonomousDataWarehouseId; - this.__explicitlySet__.add("autonomousDataWarehouseId"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -46,6 +46,15 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") + private String autonomousDataWarehouseId; + + public Builder autonomousDataWarehouseId(String autonomousDataWarehouseId) { + this.autonomousDataWarehouseId = autonomousDataWarehouseId; + this.__explicitlySet__.add("autonomousDataWarehouseId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -55,12 +64,12 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("type") + private Type type; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder type(Type type) { + this.type = type; + this.__explicitlySet__.add("type"); return this; } @@ -73,21 +82,12 @@ public Builder isAutomatic(Boolean isAutomatic) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; - - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - private LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") + private java.util.Date timeStarted; - public Builder lifecycleState(LifecycleState lifecycleState) { - this.lifecycleState = lifecycleState; - this.__explicitlySet__.add("lifecycleState"); + public Builder timeStarted(java.util.Date timeStarted) { + this.timeStarted = timeStarted; + this.__explicitlySet__.add("timeStarted"); return this; } @@ -100,21 +100,21 @@ public Builder timeEnded(java.util.Date timeEnded) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") - private java.util.Date timeStarted; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder timeStarted(java.util.Date timeStarted) { - this.timeStarted = timeStarted; - this.__explicitlySet__.add("timeStarted"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("type") - private Type type; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; - public Builder type(Type type) { - this.type = type; - this.__explicitlySet__.add("type"); + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); return this; } @@ -124,16 +124,16 @@ public Builder type(Type type) { public AutonomousDataWarehouseBackupSummary build() { AutonomousDataWarehouseBackupSummary __instance__ = new AutonomousDataWarehouseBackupSummary( - autonomousDataWarehouseId, + id, compartmentId, + autonomousDataWarehouseId, displayName, - id, + type, isAutomatic, - lifecycleDetails, - lifecycleState, - timeEnded, timeStarted, - type); + timeEnded, + lifecycleDetails, + lifecycleState); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -141,16 +141,16 @@ public AutonomousDataWarehouseBackupSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDataWarehouseBackupSummary o) { Builder copiedBuilder = - autonomousDataWarehouseId(o.getAutonomousDataWarehouseId()) + id(o.getId()) .compartmentId(o.getCompartmentId()) + .autonomousDataWarehouseId(o.getAutonomousDataWarehouseId()) .displayName(o.getDisplayName()) - .id(o.getId()) + .type(o.getType()) .isAutomatic(o.getIsAutomatic()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .timeEnded(o.getTimeEnded()) .timeStarted(o.getTimeStarted()) - .type(o.getType()); + .timeEnded(o.getTimeEnded()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -165,10 +165,10 @@ public static Builder builder() { } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") - String autonomousDataWarehouseId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. @@ -177,38 +177,23 @@ public static Builder builder() { String compartmentId; /** - * The user-friendly name for the backup. The name does not have to be unique. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse backup. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; - - /** - * Indicates whether the backup is user-initiated or automatic. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse. **/ - @com.fasterxml.jackson.annotation.JsonProperty("isAutomatic") - Boolean isAutomatic; + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") + String autonomousDataWarehouseId; /** - * Additional information about the current lifecycle state. + * The user-friendly name for the backup. The name does not have to be unique. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; /** - * The current state of the backup. + * The type of backup. **/ @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Creating("CREATING"), - Active("ACTIVE"), - Deleting("DELETING"), - Deleted("DELETED"), - Failed("FAILED"), + public enum Type { + Incremental("INCREMENTAL"), + Full("FULL"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -217,18 +202,18 @@ public enum LifecycleState { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (LifecycleState v : LifecycleState.values()) { + for (Type v : Type.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - LifecycleState(String value) { + Type(String value) { this.value = value; } @@ -238,40 +223,54 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static LifecycleState create(String key) { + public static Type create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", - key); + "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * The current state of the backup. + * The type of backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("type") + Type type; /** - * The date and time the backup completed. + * Indicates whether the backup is user-initiated or automatic. **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - java.util.Date timeEnded; + @com.fasterxml.jackson.annotation.JsonProperty("isAutomatic") + Boolean isAutomatic; /** * The date and time the backup started. **/ @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") java.util.Date timeStarted; + /** - * The type of backup. + * The date and time the backup completed. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + java.util.Date timeEnded; + + /** + * Additional information about the current lifecycle state. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; + /** + * The current state of the backup. **/ @lombok.extern.slf4j.Slf4j - public enum Type { - Incremental("INCREMENTAL"), - Full("FULL"), + public enum LifecycleState { + Creating("CREATING"), + Active("ACTIVE"), + Deleting("DELETING"), + Deleted("DELETED"), + Failed("FAILED"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -280,18 +279,18 @@ public enum Type { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (Type v : Type.values()) { + for (LifecycleState v : LifecycleState.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - Type(String value) { + LifecycleState(String value) { this.value = value; } @@ -301,20 +300,21 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static Type create(String key) { + public static LifecycleState create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", + key); return UnknownEnumValue; } }; /** - * The type of backup. + * The current state of the backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("type") - Type type; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; @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/AutonomousDataWarehouseConnectionStrings.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseConnectionStrings.java index 0c823d256b9..caf9faf5758 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseConnectionStrings.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseConnectionStrings.java @@ -25,15 +25,6 @@ public class AutonomousDataWarehouseConnectionStrings { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("allConnectionStrings") - private java.util.Map allConnectionStrings; - - public Builder allConnectionStrings(java.util.Map allConnectionStrings) { - this.allConnectionStrings = allConnectionStrings; - this.__explicitlySet__.add("allConnectionStrings"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("high") private String high; @@ -43,6 +34,15 @@ public Builder high(String high) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("medium") + private String medium; + + public Builder medium(String medium) { + this.medium = medium; + this.__explicitlySet__.add("medium"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("low") private String low; @@ -52,12 +52,12 @@ public Builder low(String low) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("medium") - private String medium; + @com.fasterxml.jackson.annotation.JsonProperty("allConnectionStrings") + private java.util.Map allConnectionStrings; - public Builder medium(String medium) { - this.medium = medium; - this.__explicitlySet__.add("medium"); + public Builder allConnectionStrings(java.util.Map allConnectionStrings) { + this.allConnectionStrings = allConnectionStrings; + this.__explicitlySet__.add("allConnectionStrings"); return this; } @@ -67,7 +67,7 @@ public Builder medium(String medium) { public AutonomousDataWarehouseConnectionStrings build() { AutonomousDataWarehouseConnectionStrings __instance__ = new AutonomousDataWarehouseConnectionStrings( - allConnectionStrings, high, low, medium); + high, medium, low, allConnectionStrings); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -75,10 +75,10 @@ public AutonomousDataWarehouseConnectionStrings build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDataWarehouseConnectionStrings o) { Builder copiedBuilder = - allConnectionStrings(o.getAllConnectionStrings()) - .high(o.getHigh()) + high(o.getHigh()) + .medium(o.getMedium()) .low(o.getLow()) - .medium(o.getMedium()); + .allConnectionStrings(o.getAllConnectionStrings()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -92,18 +92,18 @@ public static Builder builder() { return new Builder(); } - /** - * All connection strings to use to connect to the Data Warehouse. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("allConnectionStrings") - java.util.Map allConnectionStrings; - /** * The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements. **/ @com.fasterxml.jackson.annotation.JsonProperty("high") String high; + /** + * The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("medium") + String medium; + /** * The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements. **/ @@ -111,10 +111,10 @@ public static Builder builder() { String low; /** - * The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. + * All connection strings to use to connect to the Data Warehouse. **/ - @com.fasterxml.jackson.annotation.JsonProperty("medium") - String medium; + @com.fasterxml.jackson.annotation.JsonProperty("allConnectionStrings") + java.util.Map allConnectionStrings; @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/AutonomousDataWarehouseSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseSummary.java index fc9dac3ff5b..dcc7cb498e3 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDataWarehouseSummary.java @@ -27,6 +27,15 @@ public class AutonomousDataWarehouseSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @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("compartmentId") private String compartmentId; @@ -36,13 +45,30 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") - private AutonomousDataWarehouseConnectionStrings connectionStrings; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; - public Builder connectionStrings( - AutonomousDataWarehouseConnectionStrings connectionStrings) { - this.connectionStrings = connectionStrings; - this.__explicitlySet__.add("connectionStrings"); + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; + + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + private String dbName; + + public Builder dbName(String dbName) { + this.dbName = dbName; + this.__explicitlySet__.add("dbName"); return this; } @@ -64,31 +90,12 @@ public Builder dataStorageSizeInTBs(Integer dataStorageSizeInTBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - private String dbName; - - public Builder dbName(String dbName) { - this.dbName = dbName; - this.__explicitlySet__.add("dbName"); - 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("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); return this; } @@ -101,21 +108,22 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") + private String serviceConsoleUrl; - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); + public Builder serviceConsoleUrl(String serviceConsoleUrl) { + this.serviceConsoleUrl = serviceConsoleUrl; + this.__explicitlySet__.add("serviceConsoleUrl"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") + private AutonomousDataWarehouseConnectionStrings connectionStrings; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder connectionStrings( + AutonomousDataWarehouseConnectionStrings connectionStrings) { + this.connectionStrings = connectionStrings; + this.__explicitlySet__.add("connectionStrings"); return this; } @@ -128,39 +136,31 @@ public Builder licenseModel(LicenseModel licenseModel) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; - - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - private LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; - public Builder lifecycleState(LifecycleState lifecycleState) { - this.lifecycleState = lifecycleState; - this.__explicitlySet__.add("lifecycleState"); + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") - private String serviceConsoleUrl; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder serviceConsoleUrl(String serviceConsoleUrl) { - this.serviceConsoleUrl = serviceConsoleUrl; - this.__explicitlySet__.add("serviceConsoleUrl"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - private java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + private String dbVersion; - public Builder timeCreated(java.util.Date timeCreated) { - this.timeCreated = timeCreated; - this.__explicitlySet__.add("timeCreated"); + public Builder dbVersion(String dbVersion) { + this.dbVersion = dbVersion; + this.__explicitlySet__.add("dbVersion"); return this; } @@ -170,21 +170,21 @@ public Builder timeCreated(java.util.Date timeCreated) { public AutonomousDataWarehouseSummary build() { AutonomousDataWarehouseSummary __instance__ = new AutonomousDataWarehouseSummary( + id, compartmentId, - connectionStrings, + lifecycleState, + lifecycleDetails, + dbName, cpuCoreCount, dataStorageSizeInTBs, - dbName, - dbVersion, - definedTags, + timeCreated, displayName, - freeformTags, - id, - licenseModel, - lifecycleDetails, - lifecycleState, serviceConsoleUrl, - timeCreated); + connectionStrings, + licenseModel, + freeformTags, + definedTags, + dbVersion); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -192,21 +192,21 @@ public AutonomousDataWarehouseSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDataWarehouseSummary o) { Builder copiedBuilder = - compartmentId(o.getCompartmentId()) - .connectionStrings(o.getConnectionStrings()) + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .lifecycleState(o.getLifecycleState()) + .lifecycleDetails(o.getLifecycleDetails()) + .dbName(o.getDbName()) .cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInTBs(o.getDataStorageSizeInTBs()) - .dbName(o.getDbName()) - .dbVersion(o.getDbVersion()) - .definedTags(o.getDefinedTags()) + .timeCreated(o.getTimeCreated()) .displayName(o.getDisplayName()) - .freeformTags(o.getFreeformTags()) - .id(o.getId()) - .licenseModel(o.getLicenseModel()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) .serviceConsoleUrl(o.getServiceConsoleUrl()) - .timeCreated(o.getTimeCreated()); + .connectionStrings(o.getConnectionStrings()) + .licenseModel(o.getLicenseModel()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) + .dbVersion(o.getDbVersion()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -220,29 +220,84 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; - /** - * The connection string used to connect to the Data Warehouse. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Data Warehouse for the password value. + * The current state of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") - AutonomousDataWarehouseConnectionStrings connectionStrings; + @lombok.extern.slf4j.Slf4j + public enum LifecycleState { + Provisioning("PROVISIONING"), + Available("AVAILABLE"), + Stopping("STOPPING"), + Stopped("STOPPED"), + Starting("STARTING"), + Terminating("TERMINATING"), + Terminated("TERMINATED"), + Unavailable("UNAVAILABLE"), + RestoreInProgress("RESTORE_IN_PROGRESS"), + BackupInProgress("BACKUP_IN_PROGRESS"), + ScaleInProgress("SCALE_IN_PROGRESS"), + AvailableNeedsAttention("AVAILABLE_NEEDS_ATTENTION"), + + /** + * 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 number of CPU cores to be made available to the database. + * The current state of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") - Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; /** - * The quantity of data in the database, in terabytes. + * Information about the current lifecycle state. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") - Integer dataStorageSizeInTBs; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** * The database name. @@ -251,20 +306,22 @@ public static Builder builder() { String dbName; /** - * A valid Oracle Database version for Autonomous Data Warehouse. + * The number of CPU cores to be made available to the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") - String dbVersion; + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") + Integer cpuCoreCount; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * + * The quantity of data in the database, in terabytes. **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") + Integer dataStorageSizeInTBs; + + /** + * The date and time the database was created. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; /** * The user-friendly name for the Autonomous Data Warehouse. The name does not have to be unique. @@ -273,20 +330,16 @@ public static Builder builder() { String displayName; /** - * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Department\": \"Finance\"}` - * + * The URL of the Service Console for the Data Warehouse. **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") + String serviceConsoleUrl; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse. + * The connection string used to connect to the Data Warehouse. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Data Warehouse for the password value. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") + AutonomousDataWarehouseConnectionStrings connectionStrings; /** * The Oracle license model that applies to the Oracle Autonomous Data Warehouse. The default is BRING_YOUR_OWN_LICENSE. * @@ -342,83 +395,30 @@ public static LicenseModel create(String key) { LicenseModel licenseModel; /** - * Information about the current lifecycle state. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; - /** - * The current state of the database. - **/ - @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Provisioning("PROVISIONING"), - Available("AVAILABLE"), - Stopping("STOPPING"), - Stopped("STOPPED"), - Starting("STARTING"), - Terminating("TERMINATING"), - Terminated("TERMINATED"), - Unavailable("UNAVAILABLE"), - RestoreInProgress("RESTORE_IN_PROGRESS"), - BackupInProgress("BACKUP_IN_PROGRESS"), - ScaleInProgress("SCALE_IN_PROGRESS"), - AvailableNeedsAttention("AVAILABLE_NEEDS_ATTENTION"), - - /** - * 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 database. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The URL of the Service Console for the Data Warehouse. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") - String serviceConsoleUrl; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; /** - * The date and time the database was created. + * A valid Oracle Database version for Autonomous Data Warehouse. **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + String dbVersion; @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/AutonomousDatabase.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabase.java index 16991486403..06cab687a46 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabase.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabase.java @@ -5,8 +5,6 @@ /** * An Oracle Autonomous Database. - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -27,6 +25,15 @@ public class AutonomousDatabase { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @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("compartmentId") private String compartmentId; @@ -36,12 +43,30 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") - private AutonomousDatabaseConnectionStrings connectionStrings; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; - public Builder connectionStrings(AutonomousDatabaseConnectionStrings connectionStrings) { - this.connectionStrings = connectionStrings; - this.__explicitlySet__.add("connectionStrings"); + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; + + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + private String dbName; + + public Builder dbName(String dbName) { + this.dbName = dbName; + this.__explicitlySet__.add("dbName"); return this; } @@ -63,31 +88,12 @@ public Builder dataStorageSizeInTBs(Integer dataStorageSizeInTBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - private String dbName; - - public Builder dbName(String dbName) { - this.dbName = dbName; - this.__explicitlySet__.add("dbName"); - 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("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); return this; } @@ -100,21 +106,21 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") + private String serviceConsoleUrl; - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); + public Builder serviceConsoleUrl(String serviceConsoleUrl) { + this.serviceConsoleUrl = serviceConsoleUrl; + this.__explicitlySet__.add("serviceConsoleUrl"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") + private AutonomousDatabaseConnectionStrings connectionStrings; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder connectionStrings(AutonomousDatabaseConnectionStrings connectionStrings) { + this.connectionStrings = connectionStrings; + this.__explicitlySet__.add("connectionStrings"); return this; } @@ -127,39 +133,31 @@ public Builder licenseModel(LicenseModel licenseModel) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; - - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - private LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; - public Builder lifecycleState(LifecycleState lifecycleState) { - this.lifecycleState = lifecycleState; - this.__explicitlySet__.add("lifecycleState"); + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") - private String serviceConsoleUrl; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder serviceConsoleUrl(String serviceConsoleUrl) { - this.serviceConsoleUrl = serviceConsoleUrl; - this.__explicitlySet__.add("serviceConsoleUrl"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - private java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + private String dbVersion; - public Builder timeCreated(java.util.Date timeCreated) { - this.timeCreated = timeCreated; - this.__explicitlySet__.add("timeCreated"); + public Builder dbVersion(String dbVersion) { + this.dbVersion = dbVersion; + this.__explicitlySet__.add("dbVersion"); return this; } @@ -169,21 +167,21 @@ public Builder timeCreated(java.util.Date timeCreated) { public AutonomousDatabase build() { AutonomousDatabase __instance__ = new AutonomousDatabase( + id, compartmentId, - connectionStrings, + lifecycleState, + lifecycleDetails, + dbName, cpuCoreCount, dataStorageSizeInTBs, - dbName, - dbVersion, - definedTags, + timeCreated, displayName, - freeformTags, - id, - licenseModel, - lifecycleDetails, - lifecycleState, serviceConsoleUrl, - timeCreated); + connectionStrings, + licenseModel, + freeformTags, + definedTags, + dbVersion); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -191,21 +189,21 @@ public AutonomousDatabase build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDatabase o) { Builder copiedBuilder = - compartmentId(o.getCompartmentId()) - .connectionStrings(o.getConnectionStrings()) + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .lifecycleState(o.getLifecycleState()) + .lifecycleDetails(o.getLifecycleDetails()) + .dbName(o.getDbName()) .cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInTBs(o.getDataStorageSizeInTBs()) - .dbName(o.getDbName()) - .dbVersion(o.getDbVersion()) - .definedTags(o.getDefinedTags()) + .timeCreated(o.getTimeCreated()) .displayName(o.getDisplayName()) - .freeformTags(o.getFreeformTags()) - .id(o.getId()) - .licenseModel(o.getLicenseModel()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) .serviceConsoleUrl(o.getServiceConsoleUrl()) - .timeCreated(o.getTimeCreated()); + .connectionStrings(o.getConnectionStrings()) + .licenseModel(o.getLicenseModel()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) + .dbVersion(o.getDbVersion()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -219,29 +217,85 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; - /** - * The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value. + * The current state of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") - AutonomousDatabaseConnectionStrings connectionStrings; + @lombok.extern.slf4j.Slf4j + public enum LifecycleState { + Provisioning("PROVISIONING"), + Available("AVAILABLE"), + Stopping("STOPPING"), + Stopped("STOPPED"), + Starting("STARTING"), + Terminating("TERMINATING"), + Terminated("TERMINATED"), + Unavailable("UNAVAILABLE"), + RestoreInProgress("RESTORE_IN_PROGRESS"), + RestoreFailed("RESTORE_FAILED"), + BackupInProgress("BACKUP_IN_PROGRESS"), + ScaleInProgress("SCALE_IN_PROGRESS"), + AvailableNeedsAttention("AVAILABLE_NEEDS_ATTENTION"), + + /** + * 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 number of CPU cores to be made available to the database. + * The current state of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") - Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; /** - * The quantity of data in the database, in terabytes. + * Information about the current lifecycle state. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") - Integer dataStorageSizeInTBs; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** * The database name. @@ -250,20 +304,22 @@ public static Builder builder() { String dbName; /** - * A valid Oracle Database version for Autonomous Database. + * The number of CPU cores to be made available to the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") - String dbVersion; + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") + Integer cpuCoreCount; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * + * The quantity of data in the database, in terabytes. **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") + Integer dataStorageSizeInTBs; + + /** + * The date and time the database was created. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; /** * The user-friendly name for the Autonomous Database. The name does not have to be unique. @@ -272,20 +328,16 @@ public static Builder builder() { String displayName; /** - * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Department\": \"Finance\"}` - * + * The URL of the Service Console for the Autonomous Database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") + String serviceConsoleUrl; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database. + * The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") + AutonomousDatabaseConnectionStrings connectionStrings; /** * The Oracle license model that applies to the Oracle Autonomous Database. The default is BRING_YOUR_OWN_LICENSE. * @@ -341,84 +393,30 @@ public static LicenseModel create(String key) { LicenseModel licenseModel; /** - * Information about the current lifecycle state. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; - /** - * The current state of the database. - **/ - @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Provisioning("PROVISIONING"), - Available("AVAILABLE"), - Stopping("STOPPING"), - Stopped("STOPPED"), - Starting("STARTING"), - Terminating("TERMINATING"), - Terminated("TERMINATED"), - Unavailable("UNAVAILABLE"), - RestoreInProgress("RESTORE_IN_PROGRESS"), - RestoreFailed("RESTORE_FAILED"), - BackupInProgress("BACKUP_IN_PROGRESS"), - ScaleInProgress("SCALE_IN_PROGRESS"), - AvailableNeedsAttention("AVAILABLE_NEEDS_ATTENTION"), - - /** - * 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 database. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The URL of the Service Console for the Autonomous Database. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") - String serviceConsoleUrl; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; /** - * The date and time the database was created. + * A valid Oracle Database version for Autonomous Database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + String dbVersion; @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/AutonomousDatabaseBackup.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseBackup.java index bb6921c9a31..20e03459e82 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseBackup.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseBackup.java @@ -5,9 +5,6 @@ /** * An Autonomous Database backup. - * 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). - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -28,12 +25,12 @@ public class AutonomousDatabaseBackup { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") - private String autonomousDatabaseId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder autonomousDatabaseId(String autonomousDatabaseId) { - this.autonomousDatabaseId = autonomousDatabaseId; - this.__explicitlySet__.add("autonomousDatabaseId"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -46,6 +43,15 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") + private String autonomousDatabaseId; + + public Builder autonomousDatabaseId(String autonomousDatabaseId) { + this.autonomousDatabaseId = autonomousDatabaseId; + this.__explicitlySet__.add("autonomousDatabaseId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -55,12 +61,12 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("type") + private Type type; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder type(Type type) { + this.type = type; + this.__explicitlySet__.add("type"); return this; } @@ -73,21 +79,12 @@ public Builder isAutomatic(Boolean isAutomatic) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; - - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - private LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") + private java.util.Date timeStarted; - public Builder lifecycleState(LifecycleState lifecycleState) { - this.lifecycleState = lifecycleState; - this.__explicitlySet__.add("lifecycleState"); + public Builder timeStarted(java.util.Date timeStarted) { + this.timeStarted = timeStarted; + this.__explicitlySet__.add("timeStarted"); return this; } @@ -100,21 +97,21 @@ public Builder timeEnded(java.util.Date timeEnded) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") - private java.util.Date timeStarted; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder timeStarted(java.util.Date timeStarted) { - this.timeStarted = timeStarted; - this.__explicitlySet__.add("timeStarted"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("type") - private Type type; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; - public Builder type(Type type) { - this.type = type; - this.__explicitlySet__.add("type"); + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); return this; } @@ -124,16 +121,16 @@ public Builder type(Type type) { public AutonomousDatabaseBackup build() { AutonomousDatabaseBackup __instance__ = new AutonomousDatabaseBackup( - autonomousDatabaseId, + id, compartmentId, + autonomousDatabaseId, displayName, - id, + type, isAutomatic, - lifecycleDetails, - lifecycleState, - timeEnded, timeStarted, - type); + timeEnded, + lifecycleDetails, + lifecycleState); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -141,16 +138,16 @@ public AutonomousDatabaseBackup build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDatabaseBackup o) { Builder copiedBuilder = - autonomousDatabaseId(o.getAutonomousDatabaseId()) + id(o.getId()) .compartmentId(o.getCompartmentId()) + .autonomousDatabaseId(o.getAutonomousDatabaseId()) .displayName(o.getDisplayName()) - .id(o.getId()) + .type(o.getType()) .isAutomatic(o.getIsAutomatic()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .timeEnded(o.getTimeEnded()) .timeStarted(o.getTimeStarted()) - .type(o.getType()); + .timeEnded(o.getTimeEnded()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -165,10 +162,10 @@ public static Builder builder() { } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") - String autonomousDatabaseId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. @@ -177,38 +174,23 @@ public static Builder builder() { String compartmentId; /** - * The user-friendly name for the backup. The name does not have to be unique. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database backup. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; - - /** - * Indicates whether the backup is user-initiated or automatic. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("isAutomatic") - Boolean isAutomatic; + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") + String autonomousDatabaseId; /** - * Additional information about the current lifecycle state. + * The user-friendly name for the backup. The name does not have to be unique. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; /** - * The current state of the backup. + * The type of backup. **/ @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Creating("CREATING"), - Active("ACTIVE"), - Deleting("DELETING"), - Deleted("DELETED"), - Failed("FAILED"), + public enum Type { + Incremental("INCREMENTAL"), + Full("FULL"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -217,18 +199,18 @@ public enum LifecycleState { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (LifecycleState v : LifecycleState.values()) { + for (Type v : Type.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - LifecycleState(String value) { + Type(String value) { this.value = value; } @@ -238,40 +220,54 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static LifecycleState create(String key) { + public static Type create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", - key); + "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * The current state of the backup. + * The type of backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("type") + Type type; /** - * The date and time the backup completed. + * Indicates whether the backup is user-initiated or automatic. **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - java.util.Date timeEnded; + @com.fasterxml.jackson.annotation.JsonProperty("isAutomatic") + Boolean isAutomatic; /** * The date and time the backup started. **/ @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") java.util.Date timeStarted; + /** - * The type of backup. + * The date and time the backup completed. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + java.util.Date timeEnded; + + /** + * Additional information about the current lifecycle state. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; + /** + * The current state of the backup. **/ @lombok.extern.slf4j.Slf4j - public enum Type { - Incremental("INCREMENTAL"), - Full("FULL"), + public enum LifecycleState { + Creating("CREATING"), + Active("ACTIVE"), + Deleting("DELETING"), + Deleted("DELETED"), + Failed("FAILED"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -280,18 +276,18 @@ public enum Type { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (Type v : Type.values()) { + for (LifecycleState v : LifecycleState.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - Type(String value) { + LifecycleState(String value) { this.value = value; } @@ -301,20 +297,21 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static Type create(String key) { + public static LifecycleState create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", + key); return UnknownEnumValue; } }; /** - * The type of backup. + * The current state of the backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("type") - Type type; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; @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/AutonomousDatabaseBackupSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseBackupSummary.java index 656ec502e87..af9fcb921a1 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseBackupSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseBackupSummary.java @@ -28,12 +28,12 @@ public class AutonomousDatabaseBackupSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") - private String autonomousDatabaseId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder autonomousDatabaseId(String autonomousDatabaseId) { - this.autonomousDatabaseId = autonomousDatabaseId; - this.__explicitlySet__.add("autonomousDatabaseId"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -46,6 +46,15 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") + private String autonomousDatabaseId; + + public Builder autonomousDatabaseId(String autonomousDatabaseId) { + this.autonomousDatabaseId = autonomousDatabaseId; + this.__explicitlySet__.add("autonomousDatabaseId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -55,12 +64,12 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("type") + private Type type; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder type(Type type) { + this.type = type; + this.__explicitlySet__.add("type"); return this; } @@ -73,21 +82,12 @@ public Builder isAutomatic(Boolean isAutomatic) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; - - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - private LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") + private java.util.Date timeStarted; - public Builder lifecycleState(LifecycleState lifecycleState) { - this.lifecycleState = lifecycleState; - this.__explicitlySet__.add("lifecycleState"); + public Builder timeStarted(java.util.Date timeStarted) { + this.timeStarted = timeStarted; + this.__explicitlySet__.add("timeStarted"); return this; } @@ -100,21 +100,21 @@ public Builder timeEnded(java.util.Date timeEnded) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") - private java.util.Date timeStarted; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder timeStarted(java.util.Date timeStarted) { - this.timeStarted = timeStarted; - this.__explicitlySet__.add("timeStarted"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("type") - private Type type; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; - public Builder type(Type type) { - this.type = type; - this.__explicitlySet__.add("type"); + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); return this; } @@ -124,16 +124,16 @@ public Builder type(Type type) { public AutonomousDatabaseBackupSummary build() { AutonomousDatabaseBackupSummary __instance__ = new AutonomousDatabaseBackupSummary( - autonomousDatabaseId, + id, compartmentId, + autonomousDatabaseId, displayName, - id, + type, isAutomatic, - lifecycleDetails, - lifecycleState, - timeEnded, timeStarted, - type); + timeEnded, + lifecycleDetails, + lifecycleState); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -141,16 +141,16 @@ public AutonomousDatabaseBackupSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDatabaseBackupSummary o) { Builder copiedBuilder = - autonomousDatabaseId(o.getAutonomousDatabaseId()) + id(o.getId()) .compartmentId(o.getCompartmentId()) + .autonomousDatabaseId(o.getAutonomousDatabaseId()) .displayName(o.getDisplayName()) - .id(o.getId()) + .type(o.getType()) .isAutomatic(o.getIsAutomatic()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) - .timeEnded(o.getTimeEnded()) .timeStarted(o.getTimeStarted()) - .type(o.getType()); + .timeEnded(o.getTimeEnded()) + .lifecycleDetails(o.getLifecycleDetails()) + .lifecycleState(o.getLifecycleState()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -165,10 +165,10 @@ public static Builder builder() { } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") - String autonomousDatabaseId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. @@ -177,38 +177,23 @@ public static Builder builder() { String compartmentId; /** - * The user-friendly name for the backup. The name does not have to be unique. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database backup. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; - - /** - * Indicates whether the backup is user-initiated or automatic. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("isAutomatic") - Boolean isAutomatic; + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") + String autonomousDatabaseId; /** - * Additional information about the current lifecycle state. + * The user-friendly name for the backup. The name does not have to be unique. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; /** - * The current state of the backup. + * The type of backup. **/ @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Creating("CREATING"), - Active("ACTIVE"), - Deleting("DELETING"), - Deleted("DELETED"), - Failed("FAILED"), + public enum Type { + Incremental("INCREMENTAL"), + Full("FULL"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -217,18 +202,18 @@ public enum LifecycleState { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (LifecycleState v : LifecycleState.values()) { + for (Type v : Type.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - LifecycleState(String value) { + Type(String value) { this.value = value; } @@ -238,40 +223,54 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static LifecycleState create(String key) { + public static Type create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", - key); + "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * The current state of the backup. + * The type of backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("type") + Type type; /** - * The date and time the backup completed. + * Indicates whether the backup is user-initiated or automatic. **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - java.util.Date timeEnded; + @com.fasterxml.jackson.annotation.JsonProperty("isAutomatic") + Boolean isAutomatic; /** * The date and time the backup started. **/ @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") java.util.Date timeStarted; + /** - * The type of backup. + * The date and time the backup completed. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + java.util.Date timeEnded; + + /** + * Additional information about the current lifecycle state. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; + /** + * The current state of the backup. **/ @lombok.extern.slf4j.Slf4j - public enum Type { - Incremental("INCREMENTAL"), - Full("FULL"), + public enum LifecycleState { + Creating("CREATING"), + Active("ACTIVE"), + Deleting("DELETING"), + Deleted("DELETED"), + Failed("FAILED"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -280,18 +279,18 @@ public enum Type { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (Type v : Type.values()) { + for (LifecycleState v : LifecycleState.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - Type(String value) { + LifecycleState(String value) { this.value = value; } @@ -301,20 +300,21 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static Type create(String key) { + public static LifecycleState create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", + key); return UnknownEnumValue; } }; /** - * The type of backup. + * The current state of the backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("type") - Type type; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; @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/AutonomousDatabaseConnectionStrings.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseConnectionStrings.java index 54187b826bf..f61e73186e5 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseConnectionStrings.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseConnectionStrings.java @@ -25,15 +25,6 @@ public class AutonomousDatabaseConnectionStrings { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("allConnectionStrings") - private java.util.Map allConnectionStrings; - - public Builder allConnectionStrings(java.util.Map allConnectionStrings) { - this.allConnectionStrings = allConnectionStrings; - this.__explicitlySet__.add("allConnectionStrings"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("high") private String high; @@ -43,6 +34,15 @@ public Builder high(String high) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("medium") + private String medium; + + public Builder medium(String medium) { + this.medium = medium; + this.__explicitlySet__.add("medium"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("low") private String low; @@ -52,12 +52,12 @@ public Builder low(String low) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("medium") - private String medium; + @com.fasterxml.jackson.annotation.JsonProperty("allConnectionStrings") + private java.util.Map allConnectionStrings; - public Builder medium(String medium) { - this.medium = medium; - this.__explicitlySet__.add("medium"); + public Builder allConnectionStrings(java.util.Map allConnectionStrings) { + this.allConnectionStrings = allConnectionStrings; + this.__explicitlySet__.add("allConnectionStrings"); return this; } @@ -67,7 +67,7 @@ public Builder medium(String medium) { public AutonomousDatabaseConnectionStrings build() { AutonomousDatabaseConnectionStrings __instance__ = new AutonomousDatabaseConnectionStrings( - allConnectionStrings, high, low, medium); + high, medium, low, allConnectionStrings); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -75,10 +75,10 @@ public AutonomousDatabaseConnectionStrings build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDatabaseConnectionStrings o) { Builder copiedBuilder = - allConnectionStrings(o.getAllConnectionStrings()) - .high(o.getHigh()) + high(o.getHigh()) + .medium(o.getMedium()) .low(o.getLow()) - .medium(o.getMedium()); + .allConnectionStrings(o.getAllConnectionStrings()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -92,18 +92,18 @@ public static Builder builder() { return new Builder(); } - /** - * All connection strings to use to connect to the Autonomous Database. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("allConnectionStrings") - java.util.Map allConnectionStrings; - /** * The High database service provides the highest level of resources to each SQL statement resulting in the highest performance, but supports the fewest number of concurrent SQL statements. **/ @com.fasterxml.jackson.annotation.JsonProperty("high") String high; + /** + * The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("medium") + String medium; + /** * The Low database service provides the least level of resources to each SQL statement, but supports the most number of concurrent SQL statements. **/ @@ -111,10 +111,10 @@ public static Builder builder() { String low; /** - * The Medium database service provides a lower level of resources to each SQL statement potentially resulting a lower level of performance, but supports more concurrent SQL statements. + * All connection strings to use to connect to the Autonomous Database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("medium") - String medium; + @com.fasterxml.jackson.annotation.JsonProperty("allConnectionStrings") + java.util.Map allConnectionStrings; @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/AutonomousDatabaseSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseSummary.java index a77c99ee7c7..89089eeba48 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseSummary.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/AutonomousDatabaseSummary.java @@ -27,6 +27,15 @@ public class AutonomousDatabaseSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @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("compartmentId") private String compartmentId; @@ -36,12 +45,30 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") - private AutonomousDatabaseConnectionStrings connectionStrings; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private LifecycleState lifecycleState; - public Builder connectionStrings(AutonomousDatabaseConnectionStrings connectionStrings) { - this.connectionStrings = connectionStrings; - this.__explicitlySet__.add("connectionStrings"); + public Builder lifecycleState(LifecycleState lifecycleState) { + this.lifecycleState = lifecycleState; + this.__explicitlySet__.add("lifecycleState"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; + + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + private String dbName; + + public Builder dbName(String dbName) { + this.dbName = dbName; + this.__explicitlySet__.add("dbName"); return this; } @@ -63,31 +90,12 @@ public Builder dataStorageSizeInTBs(Integer dataStorageSizeInTBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - private String dbName; - - public Builder dbName(String dbName) { - this.dbName = dbName; - this.__explicitlySet__.add("dbName"); - 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("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); return this; } @@ -100,21 +108,21 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") + private String serviceConsoleUrl; - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); + public Builder serviceConsoleUrl(String serviceConsoleUrl) { + this.serviceConsoleUrl = serviceConsoleUrl; + this.__explicitlySet__.add("serviceConsoleUrl"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") + private AutonomousDatabaseConnectionStrings connectionStrings; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder connectionStrings(AutonomousDatabaseConnectionStrings connectionStrings) { + this.connectionStrings = connectionStrings; + this.__explicitlySet__.add("connectionStrings"); return this; } @@ -127,39 +135,31 @@ public Builder licenseModel(LicenseModel licenseModel) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; - - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - private LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; - public Builder lifecycleState(LifecycleState lifecycleState) { - this.lifecycleState = lifecycleState; - this.__explicitlySet__.add("lifecycleState"); + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") - private String serviceConsoleUrl; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder serviceConsoleUrl(String serviceConsoleUrl) { - this.serviceConsoleUrl = serviceConsoleUrl; - this.__explicitlySet__.add("serviceConsoleUrl"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - private java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + private String dbVersion; - public Builder timeCreated(java.util.Date timeCreated) { - this.timeCreated = timeCreated; - this.__explicitlySet__.add("timeCreated"); + public Builder dbVersion(String dbVersion) { + this.dbVersion = dbVersion; + this.__explicitlySet__.add("dbVersion"); return this; } @@ -169,21 +169,21 @@ public Builder timeCreated(java.util.Date timeCreated) { public AutonomousDatabaseSummary build() { AutonomousDatabaseSummary __instance__ = new AutonomousDatabaseSummary( + id, compartmentId, - connectionStrings, + lifecycleState, + lifecycleDetails, + dbName, cpuCoreCount, dataStorageSizeInTBs, - dbName, - dbVersion, - definedTags, + timeCreated, displayName, - freeformTags, - id, - licenseModel, - lifecycleDetails, - lifecycleState, serviceConsoleUrl, - timeCreated); + connectionStrings, + licenseModel, + freeformTags, + definedTags, + dbVersion); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -191,21 +191,21 @@ public AutonomousDatabaseSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(AutonomousDatabaseSummary o) { Builder copiedBuilder = - compartmentId(o.getCompartmentId()) - .connectionStrings(o.getConnectionStrings()) + id(o.getId()) + .compartmentId(o.getCompartmentId()) + .lifecycleState(o.getLifecycleState()) + .lifecycleDetails(o.getLifecycleDetails()) + .dbName(o.getDbName()) .cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInTBs(o.getDataStorageSizeInTBs()) - .dbName(o.getDbName()) - .dbVersion(o.getDbVersion()) - .definedTags(o.getDefinedTags()) + .timeCreated(o.getTimeCreated()) .displayName(o.getDisplayName()) - .freeformTags(o.getFreeformTags()) - .id(o.getId()) - .licenseModel(o.getLicenseModel()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) .serviceConsoleUrl(o.getServiceConsoleUrl()) - .timeCreated(o.getTimeCreated()); + .connectionStrings(o.getConnectionStrings()) + .licenseModel(o.getLicenseModel()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) + .dbVersion(o.getDbVersion()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -219,29 +219,85 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; - /** - * The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value. + * The current state of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") - AutonomousDatabaseConnectionStrings connectionStrings; + @lombok.extern.slf4j.Slf4j + public enum LifecycleState { + Provisioning("PROVISIONING"), + Available("AVAILABLE"), + Stopping("STOPPING"), + Stopped("STOPPED"), + Starting("STARTING"), + Terminating("TERMINATING"), + Terminated("TERMINATED"), + Unavailable("UNAVAILABLE"), + RestoreInProgress("RESTORE_IN_PROGRESS"), + RestoreFailed("RESTORE_FAILED"), + BackupInProgress("BACKUP_IN_PROGRESS"), + ScaleInProgress("SCALE_IN_PROGRESS"), + AvailableNeedsAttention("AVAILABLE_NEEDS_ATTENTION"), + + /** + * 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 number of CPU cores to be made available to the database. + * The current state of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") - Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; /** - * The quantity of data in the database, in terabytes. + * Information about the current lifecycle state. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") - Integer dataStorageSizeInTBs; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** * The database name. @@ -250,20 +306,22 @@ public static Builder builder() { String dbName; /** - * A valid Oracle Database version for Autonomous Database. + * The number of CPU cores to be made available to the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") - String dbVersion; + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") + Integer cpuCoreCount; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * + * The quantity of data in the database, in terabytes. **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") + Integer dataStorageSizeInTBs; + + /** + * The date and time the database was created. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; /** * The user-friendly name for the Autonomous Database. The name does not have to be unique. @@ -272,20 +330,16 @@ public static Builder builder() { String displayName; /** - * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Department\": \"Finance\"}` - * + * The URL of the Service Console for the Autonomous Database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") + String serviceConsoleUrl; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database. + * The connection string used to connect to the Autonomous Database. The username for the Service Console is ADMIN. Use the password you entered when creating the Autonomous Database for the password value. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("connectionStrings") + AutonomousDatabaseConnectionStrings connectionStrings; /** * The Oracle license model that applies to the Oracle Autonomous Database. The default is BRING_YOUR_OWN_LICENSE. * @@ -341,84 +395,30 @@ public static LicenseModel create(String key) { LicenseModel licenseModel; /** - * Information about the current lifecycle state. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; - /** - * The current state of the database. - **/ - @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Provisioning("PROVISIONING"), - Available("AVAILABLE"), - Stopping("STOPPING"), - Stopped("STOPPED"), - Starting("STARTING"), - Terminating("TERMINATING"), - Terminated("TERMINATED"), - Unavailable("UNAVAILABLE"), - RestoreInProgress("RESTORE_IN_PROGRESS"), - RestoreFailed("RESTORE_FAILED"), - BackupInProgress("BACKUP_IN_PROGRESS"), - ScaleInProgress("SCALE_IN_PROGRESS"), - AvailableNeedsAttention("AVAILABLE_NEEDS_ATTENTION"), - - /** - * 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 database. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The URL of the Service Console for the Autonomous Database. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("serviceConsoleUrl") - String serviceConsoleUrl; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; /** - * The date and time the database was created. + * A valid Oracle Database version for Autonomous Database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + String dbVersion; @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/Backup.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/Backup.java index 5225c15a3f9..d7a8a1201ae 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 @@ -4,10 +4,6 @@ package com.oracle.bmc.database.model; /** - * A database backup. - * 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). - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -26,12 +22,12 @@ public class Backup { @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; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder availabilityDomain(String availabilityDomain) { - this.availabilityDomain = availabilityDomain; - this.__explicitlySet__.add("availabilityDomain"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -44,15 +40,6 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - private DatabaseEdition databaseEdition; - - public Builder databaseEdition(DatabaseEdition databaseEdition) { - this.databaseEdition = databaseEdition; - this.__explicitlySet__.add("databaseEdition"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("databaseId") private String databaseId; @@ -62,15 +49,6 @@ public Builder databaseId(String databaseId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("databaseSizeInGBs") - private Double databaseSizeInGBs; - - public Builder databaseSizeInGBs(Double databaseSizeInGBs) { - this.databaseSizeInGBs = databaseSizeInGBs; - this.__explicitlySet__.add("databaseSizeInGBs"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -80,12 +58,30 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("type") + private Type type; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder type(Type type) { + this.type = type; + this.__explicitlySet__.add("type"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") + private java.util.Date timeStarted; + + public Builder timeStarted(java.util.Date timeStarted) { + this.timeStarted = timeStarted; + this.__explicitlySet__.add("timeStarted"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + private java.util.Date timeEnded; + + public Builder timeEnded(java.util.Date timeEnded) { + this.timeEnded = timeEnded; + this.__explicitlySet__.add("timeEnded"); return this; } @@ -98,6 +94,15 @@ public Builder lifecycleDetails(String lifecycleDetails) { return this; } + @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("lifecycleState") private LifecycleState lifecycleState; @@ -107,30 +112,21 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - private java.util.Date timeEnded; - - public Builder timeEnded(java.util.Date timeEnded) { - this.timeEnded = timeEnded; - this.__explicitlySet__.add("timeEnded"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") - private java.util.Date timeStarted; + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + private DatabaseEdition databaseEdition; - public Builder timeStarted(java.util.Date timeStarted) { - this.timeStarted = timeStarted; - this.__explicitlySet__.add("timeStarted"); + public Builder databaseEdition(DatabaseEdition databaseEdition) { + this.databaseEdition = databaseEdition; + this.__explicitlySet__.add("databaseEdition"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("type") - private Type type; + @com.fasterxml.jackson.annotation.JsonProperty("databaseSizeInGBs") + private Double databaseSizeInGBs; - public Builder type(Type type) { - this.type = type; - this.__explicitlySet__.add("type"); + public Builder databaseSizeInGBs(Double databaseSizeInGBs) { + this.databaseSizeInGBs = databaseSizeInGBs; + this.__explicitlySet__.add("databaseSizeInGBs"); return this; } @@ -140,18 +136,18 @@ public Builder type(Type type) { public Backup build() { Backup __instance__ = new Backup( - availabilityDomain, + id, compartmentId, - databaseEdition, databaseId, - databaseSizeInGBs, displayName, - id, + type, + timeStarted, + timeEnded, lifecycleDetails, + availabilityDomain, lifecycleState, - timeEnded, - timeStarted, - type); + databaseEdition, + databaseSizeInGBs); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -159,18 +155,18 @@ public Backup build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Backup o) { Builder copiedBuilder = - availabilityDomain(o.getAvailabilityDomain()) + id(o.getId()) .compartmentId(o.getCompartmentId()) - .databaseEdition(o.getDatabaseEdition()) .databaseId(o.getDatabaseId()) - .databaseSizeInGBs(o.getDatabaseSizeInGBs()) .displayName(o.getDisplayName()) - .id(o.getId()) + .type(o.getType()) + .timeStarted(o.getTimeStarted()) + .timeEnded(o.getTimeEnded()) .lifecycleDetails(o.getLifecycleDetails()) + .availabilityDomain(o.getAvailabilityDomain()) .lifecycleState(o.getLifecycleState()) - .timeEnded(o.getTimeEnded()) - .timeStarted(o.getTimeStarted()) - .type(o.getType()); + .databaseEdition(o.getDatabaseEdition()) + .databaseSizeInGBs(o.getDatabaseSizeInGBs()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -185,26 +181,35 @@ public static Builder builder() { } /** - * The name of the availability domain where the database backup is stored. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") - String availabilityDomain; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; + /** - * The Oracle Database edition of the DB system from which the database backup was taken. - * + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("databaseId") + String databaseId; + + /** + * The user-friendly name for the backup. The name does not have to be unique. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + /** + * The type of backup. **/ @lombok.extern.slf4j.Slf4j - public enum DatabaseEdition { - StandardEdition("STANDARD_EDITION"), - EnterpriseEdition("ENTERPRISE_EDITION"), - EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), - EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), + public enum Type { + Incremental("INCREMENTAL"), + Full("FULL"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -213,18 +218,18 @@ public enum DatabaseEdition { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (DatabaseEdition v : DatabaseEdition.values()) { + for (Type v : Type.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - DatabaseEdition(String value) { + Type(String value) { this.value = value; } @@ -234,53 +239,44 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static DatabaseEdition create(String key) { + public static Type create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'DatabaseEdition', returning UnknownEnumValue", - key); + "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * The Oracle Database edition of the DB system from which the database backup was taken. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - DatabaseEdition databaseEdition; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseId") - String databaseId; - - /** - * The size of the database in gigabytes at the time the backup was taken. - * + * The type of backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseSizeInGBs") - Double databaseSizeInGBs; + @com.fasterxml.jackson.annotation.JsonProperty("type") + Type type; /** - * The user-friendly name for the backup. The name does not have to be unique. + * The date and time the backup started. **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") + java.util.Date timeStarted; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup. + * The date and time the backup was completed. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + java.util.Date timeEnded; /** * Additional information about the current lifecycleState. **/ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") String lifecycleDetails; + + /** + * The name of the availability domain where the database backup is stored. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + String availabilityDomain; /** * The current state of the backup. **/ @@ -336,25 +332,16 @@ public static LifecycleState create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; - - /** - * The date and time the backup was completed. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - java.util.Date timeEnded; - - /** - * The date and time the backup started. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") - java.util.Date timeStarted; /** - * The type of backup. + * The Oracle Database edition of the DB system from which the database backup was taken. + * **/ @lombok.extern.slf4j.Slf4j - public enum Type { - Incremental("INCREMENTAL"), - Full("FULL"), + public enum DatabaseEdition { + StandardEdition("STANDARD_EDITION"), + EnterpriseEdition("ENTERPRISE_EDITION"), + EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), + EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -363,18 +350,18 @@ public enum Type { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (Type v : Type.values()) { + for (DatabaseEdition v : DatabaseEdition.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - Type(String value) { + DatabaseEdition(String value) { this.value = value; } @@ -384,20 +371,29 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static Type create(String key) { + public static DatabaseEdition create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); + "Received unknown value '{}' for enum 'DatabaseEdition', returning UnknownEnumValue", + key); return UnknownEnumValue; } }; /** - * The type of backup. + * The Oracle Database edition of the DB system from which the database backup was taken. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("type") - Type type; + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + DatabaseEdition databaseEdition; + + /** + * The size of the database in gigabytes at the time the backup was taken. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("databaseSizeInGBs") + Double databaseSizeInGBs; @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/BackupSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/BackupSummary.java index e72c2a4e805..40bd8fae301 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 @@ -26,12 +26,12 @@ public class BackupSummary { @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; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder availabilityDomain(String availabilityDomain) { - this.availabilityDomain = availabilityDomain; - this.__explicitlySet__.add("availabilityDomain"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -44,15 +44,6 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - private DatabaseEdition databaseEdition; - - public Builder databaseEdition(DatabaseEdition databaseEdition) { - this.databaseEdition = databaseEdition; - this.__explicitlySet__.add("databaseEdition"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("databaseId") private String databaseId; @@ -62,15 +53,6 @@ public Builder databaseId(String databaseId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("databaseSizeInGBs") - private Double databaseSizeInGBs; - - public Builder databaseSizeInGBs(Double databaseSizeInGBs) { - this.databaseSizeInGBs = databaseSizeInGBs; - this.__explicitlySet__.add("databaseSizeInGBs"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -80,12 +62,30 @@ public Builder displayName(String displayName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("type") + private Type type; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder type(Type type) { + this.type = type; + this.__explicitlySet__.add("type"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") + private java.util.Date timeStarted; + + public Builder timeStarted(java.util.Date timeStarted) { + this.timeStarted = timeStarted; + this.__explicitlySet__.add("timeStarted"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + private java.util.Date timeEnded; + + public Builder timeEnded(java.util.Date timeEnded) { + this.timeEnded = timeEnded; + this.__explicitlySet__.add("timeEnded"); return this; } @@ -98,6 +98,15 @@ public Builder lifecycleDetails(String lifecycleDetails) { return this; } + @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("lifecycleState") private LifecycleState lifecycleState; @@ -107,30 +116,21 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - private java.util.Date timeEnded; - - public Builder timeEnded(java.util.Date timeEnded) { - this.timeEnded = timeEnded; - this.__explicitlySet__.add("timeEnded"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") - private java.util.Date timeStarted; + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + private DatabaseEdition databaseEdition; - public Builder timeStarted(java.util.Date timeStarted) { - this.timeStarted = timeStarted; - this.__explicitlySet__.add("timeStarted"); + public Builder databaseEdition(DatabaseEdition databaseEdition) { + this.databaseEdition = databaseEdition; + this.__explicitlySet__.add("databaseEdition"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("type") - private Type type; + @com.fasterxml.jackson.annotation.JsonProperty("databaseSizeInGBs") + private Double databaseSizeInGBs; - public Builder type(Type type) { - this.type = type; - this.__explicitlySet__.add("type"); + public Builder databaseSizeInGBs(Double databaseSizeInGBs) { + this.databaseSizeInGBs = databaseSizeInGBs; + this.__explicitlySet__.add("databaseSizeInGBs"); return this; } @@ -140,18 +140,18 @@ public Builder type(Type type) { public BackupSummary build() { BackupSummary __instance__ = new BackupSummary( - availabilityDomain, + id, compartmentId, - databaseEdition, databaseId, - databaseSizeInGBs, displayName, - id, + type, + timeStarted, + timeEnded, lifecycleDetails, + availabilityDomain, lifecycleState, - timeEnded, - timeStarted, - type); + databaseEdition, + databaseSizeInGBs); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -159,18 +159,18 @@ public BackupSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BackupSummary o) { Builder copiedBuilder = - availabilityDomain(o.getAvailabilityDomain()) + id(o.getId()) .compartmentId(o.getCompartmentId()) - .databaseEdition(o.getDatabaseEdition()) .databaseId(o.getDatabaseId()) - .databaseSizeInGBs(o.getDatabaseSizeInGBs()) .displayName(o.getDisplayName()) - .id(o.getId()) + .type(o.getType()) + .timeStarted(o.getTimeStarted()) + .timeEnded(o.getTimeEnded()) .lifecycleDetails(o.getLifecycleDetails()) + .availabilityDomain(o.getAvailabilityDomain()) .lifecycleState(o.getLifecycleState()) - .timeEnded(o.getTimeEnded()) - .timeStarted(o.getTimeStarted()) - .type(o.getType()); + .databaseEdition(o.getDatabaseEdition()) + .databaseSizeInGBs(o.getDatabaseSizeInGBs()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -185,26 +185,35 @@ public static Builder builder() { } /** - * The name of the availability domain where the database backup is stored. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") - String availabilityDomain; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; + /** - * The Oracle Database edition of the DB system from which the database backup was taken. - * + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("databaseId") + String databaseId; + + /** + * The user-friendly name for the backup. The name does not have to be unique. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + /** + * The type of backup. **/ @lombok.extern.slf4j.Slf4j - public enum DatabaseEdition { - StandardEdition("STANDARD_EDITION"), - EnterpriseEdition("ENTERPRISE_EDITION"), - EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), - EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), + public enum Type { + Incremental("INCREMENTAL"), + Full("FULL"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -213,18 +222,18 @@ public enum DatabaseEdition { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (DatabaseEdition v : DatabaseEdition.values()) { + for (Type v : Type.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - DatabaseEdition(String value) { + Type(String value) { this.value = value; } @@ -234,53 +243,44 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static DatabaseEdition create(String key) { + public static Type create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'DatabaseEdition', returning UnknownEnumValue", - key); + "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * The Oracle Database edition of the DB system from which the database backup was taken. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - DatabaseEdition databaseEdition; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseId") - String databaseId; - - /** - * The size of the database in gigabytes at the time the backup was taken. - * + * The type of backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseSizeInGBs") - Double databaseSizeInGBs; + @com.fasterxml.jackson.annotation.JsonProperty("type") + Type type; /** - * The user-friendly name for the backup. The name does not have to be unique. + * The date and time the backup started. **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") + java.util.Date timeStarted; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup. + * The date and time the backup was completed. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + java.util.Date timeEnded; /** * Additional information about the current lifecycleState. **/ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") String lifecycleDetails; + + /** + * The name of the availability domain where the database backup is stored. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + String availabilityDomain; /** * The current state of the backup. **/ @@ -336,25 +336,16 @@ public static LifecycleState create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; - - /** - * The date and time the backup was completed. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - java.util.Date timeEnded; - - /** - * The date and time the backup started. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") - java.util.Date timeStarted; /** - * The type of backup. + * The Oracle Database edition of the DB system from which the database backup was taken. + * **/ @lombok.extern.slf4j.Slf4j - public enum Type { - Incremental("INCREMENTAL"), - Full("FULL"), + public enum DatabaseEdition { + StandardEdition("STANDARD_EDITION"), + EnterpriseEdition("ENTERPRISE_EDITION"), + EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), + EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -363,18 +354,18 @@ public enum Type { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (Type v : Type.values()) { + for (DatabaseEdition v : DatabaseEdition.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - Type(String value) { + DatabaseEdition(String value) { this.value = value; } @@ -384,20 +375,29 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static Type create(String key) { + public static DatabaseEdition create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); + "Received unknown value '{}' for enum 'DatabaseEdition', returning UnknownEnumValue", + key); return UnknownEnumValue; } }; /** - * The type of backup. + * The Oracle Database edition of the DB system from which the database backup was taken. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("type") - Type type; + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + DatabaseEdition databaseEdition; + + /** + * The size of the database in gigabytes at the time the backup was taken. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("databaseSizeInGBs") + Double databaseSizeInGBs; @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/CompleteExternalBackupJobDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CompleteExternalBackupJobDetails.java index 567c63bf5f1..9db92ff03a9 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CompleteExternalBackupJobDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CompleteExternalBackupJobDetails.java @@ -24,6 +24,15 @@ public class CompleteExternalBackupJobDetails { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("tdeWalletPath") + private String tdeWalletPath; + + public Builder tdeWalletPath(String tdeWalletPath) { + this.tdeWalletPath = tdeWalletPath; + this.__explicitlySet__.add("tdeWalletPath"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("cfBackupHandle") private String cfBackupHandle; @@ -33,24 +42,6 @@ public Builder cfBackupHandle(String cfBackupHandle) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dataSize") - private Long dataSize; - - public Builder dataSize(Long dataSize) { - this.dataSize = dataSize; - this.__explicitlySet__.add("dataSize"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("redoSize") - private Long redoSize; - - public Builder redoSize(Long redoSize) { - this.redoSize = redoSize; - this.__explicitlySet__.add("redoSize"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("spfBackupHandle") private String spfBackupHandle; @@ -69,12 +60,21 @@ public Builder sqlPatches(java.util.List sqlPatches) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("tdeWalletPath") - private String tdeWalletPath; + @com.fasterxml.jackson.annotation.JsonProperty("dataSize") + private Long dataSize; - public Builder tdeWalletPath(String tdeWalletPath) { - this.tdeWalletPath = tdeWalletPath; - this.__explicitlySet__.add("tdeWalletPath"); + public Builder dataSize(Long dataSize) { + this.dataSize = dataSize; + this.__explicitlySet__.add("dataSize"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("redoSize") + private Long redoSize; + + public Builder redoSize(Long redoSize) { + this.redoSize = redoSize; + this.__explicitlySet__.add("redoSize"); return this; } @@ -84,12 +84,12 @@ public Builder tdeWalletPath(String tdeWalletPath) { public CompleteExternalBackupJobDetails build() { CompleteExternalBackupJobDetails __instance__ = new CompleteExternalBackupJobDetails( + tdeWalletPath, cfBackupHandle, - dataSize, - redoSize, spfBackupHandle, sqlPatches, - tdeWalletPath); + dataSize, + redoSize); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -97,12 +97,12 @@ public CompleteExternalBackupJobDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CompleteExternalBackupJobDetails o) { Builder copiedBuilder = - cfBackupHandle(o.getCfBackupHandle()) - .dataSize(o.getDataSize()) - .redoSize(o.getRedoSize()) + tdeWalletPath(o.getTdeWalletPath()) + .cfBackupHandle(o.getCfBackupHandle()) .spfBackupHandle(o.getSpfBackupHandle()) .sqlPatches(o.getSqlPatches()) - .tdeWalletPath(o.getTdeWalletPath()); + .dataSize(o.getDataSize()) + .redoSize(o.getRedoSize()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -117,22 +117,16 @@ public static Builder builder() { } /** - * The handle of the control file backup. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("cfBackupHandle") - String cfBackupHandle; - - /** - * The size of the data in the database, in megabytes. + * If the database being backed up is TDE enabled, this will be the path to the associated TDE wallet in Object Storage. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dataSize") - Long dataSize; + @com.fasterxml.jackson.annotation.JsonProperty("tdeWalletPath") + String tdeWalletPath; /** - * The size of the redo in the database, in megabytes. + * The handle of the control file backup. **/ - @com.fasterxml.jackson.annotation.JsonProperty("redoSize") - Long redoSize; + @com.fasterxml.jackson.annotation.JsonProperty("cfBackupHandle") + String cfBackupHandle; /** * The handle of the spfile backup. @@ -147,10 +141,16 @@ public static Builder builder() { java.util.List sqlPatches; /** - * If the database being backed up is TDE enabled, this will be the path to the associated TDE wallet in Object Storage. + * The size of the data in the database, in megabytes. **/ - @com.fasterxml.jackson.annotation.JsonProperty("tdeWalletPath") - String tdeWalletPath; + @com.fasterxml.jackson.annotation.JsonProperty("dataSize") + Long dataSize; + + /** + * The size of the redo in the database, in megabytes. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("redoSize") + Long redoSize; @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/CreateAutonomousDataWarehouseBackupDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDataWarehouseBackupDetails.java index eb9cd8b30fc..58d76a35ba9 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDataWarehouseBackupDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDataWarehouseBackupDetails.java @@ -27,15 +27,6 @@ public class CreateAutonomousDataWarehouseBackupDetails { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") - private String autonomousDataWarehouseId; - - public Builder autonomousDataWarehouseId(String autonomousDataWarehouseId) { - this.autonomousDataWarehouseId = autonomousDataWarehouseId; - this.__explicitlySet__.add("autonomousDataWarehouseId"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -45,13 +36,22 @@ public Builder displayName(String displayName) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") + private String autonomousDataWarehouseId; + + public Builder autonomousDataWarehouseId(String autonomousDataWarehouseId) { + this.autonomousDataWarehouseId = autonomousDataWarehouseId; + this.__explicitlySet__.add("autonomousDataWarehouseId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public CreateAutonomousDataWarehouseBackupDetails build() { CreateAutonomousDataWarehouseBackupDetails __instance__ = new CreateAutonomousDataWarehouseBackupDetails( - autonomousDataWarehouseId, displayName); + displayName, autonomousDataWarehouseId); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -59,8 +59,8 @@ public CreateAutonomousDataWarehouseBackupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateAutonomousDataWarehouseBackupDetails o) { Builder copiedBuilder = - autonomousDataWarehouseId(o.getAutonomousDataWarehouseId()) - .displayName(o.getDisplayName()); + displayName(o.getDisplayName()) + .autonomousDataWarehouseId(o.getAutonomousDataWarehouseId()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -74,18 +74,18 @@ public static Builder builder() { return new Builder(); } - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse backup. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") - String autonomousDataWarehouseId; - /** * The user-friendly name for the backup. The name does not have to be unique. **/ @com.fasterxml.jackson.annotation.JsonProperty("displayName") String displayName; + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Data Warehouse backup. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDataWarehouseId") + String autonomousDataWarehouseId; + @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/CreateAutonomousDataWarehouseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDataWarehouseDetails.java index b5472827a4b..2b1ce2fa753 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDataWarehouseDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDataWarehouseDetails.java @@ -27,15 +27,6 @@ public class CreateAutonomousDataWarehouseDetails { @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("compartmentId") private String compartmentId; @@ -45,6 +36,15 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + private String dbName; + + public Builder dbName(String dbName) { + this.dbName = dbName; + this.__explicitlySet__.add("dbName"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") private Integer cpuCoreCount; @@ -63,22 +63,12 @@ public Builder dataStorageSizeInTBs(Integer dataStorageSizeInTBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - private String dbName; - - public Builder dbName(String dbName) { - this.dbName = dbName; - this.__explicitlySet__.add("dbName"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") + private String adminPassword; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder adminPassword(String adminPassword) { + this.adminPassword = adminPassword; + this.__explicitlySet__.add("adminPassword"); return this; } @@ -91,6 +81,15 @@ public Builder displayName(String displayName) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") + private LicenseModel licenseModel; + + public Builder licenseModel(LicenseModel licenseModel) { + this.licenseModel = licenseModel; + this.__explicitlySet__.add("licenseModel"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") private java.util.Map freeformTags; @@ -100,12 +99,13 @@ public Builder freeformTags(java.util.Map freeformTags) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") - private LicenseModel licenseModel; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder licenseModel(LicenseModel licenseModel) { - this.licenseModel = licenseModel; - this.__explicitlySet__.add("licenseModel"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } @@ -115,15 +115,15 @@ public Builder licenseModel(LicenseModel licenseModel) { public CreateAutonomousDataWarehouseDetails build() { CreateAutonomousDataWarehouseDetails __instance__ = new CreateAutonomousDataWarehouseDetails( - adminPassword, compartmentId, + dbName, cpuCoreCount, dataStorageSizeInTBs, - dbName, - definedTags, + adminPassword, displayName, + licenseModel, freeformTags, - licenseModel); + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -131,15 +131,15 @@ public CreateAutonomousDataWarehouseDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateAutonomousDataWarehouseDetails o) { Builder copiedBuilder = - adminPassword(o.getAdminPassword()) - .compartmentId(o.getCompartmentId()) + compartmentId(o.getCompartmentId()) + .dbName(o.getDbName()) .cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInTBs(o.getDataStorageSizeInTBs()) - .dbName(o.getDbName()) - .definedTags(o.getDefinedTags()) + .adminPassword(o.getAdminPassword()) .displayName(o.getDisplayName()) + .licenseModel(o.getLicenseModel()) .freeformTags(o.getFreeformTags()) - .licenseModel(o.getLicenseModel()); + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -153,18 +153,18 @@ public static Builder builder() { return new Builder(); } - /** - * A strong password for Admin. The password must be between 12 and 60 characters long, and must contain at least 1 uppercase, 1 lowercase and 2 numeric characters. It cannot contain the double quote symbol (\"). It must be different than the last 4 passwords. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") - String adminPassword; - /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment of the Autonomous Data Warehouse. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; + /** + * The database name. The name must begin with an alphabetic character and can contain a maximum of 14 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + String dbName; + /** * The number of CPU Cores to be made available to the database. **/ @@ -179,36 +179,16 @@ public static Builder builder() { Integer dataStorageSizeInTBs; /** - * The database name. The name must begin with an alphabetic character and can contain a maximum of 14 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. + * The password must be between 12 and 30 characters long, and must contain at least 1 uppercase, 1 lowercase, and 1 numeric character. It cannot contain the double quote symbol (\") or the username \"admin\", regardless of casing. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - String dbName; - - /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

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

- * Example: `{\"Department\": \"Finance\"}` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; /** * The Oracle license model that applies to the Oracle Autonomous Data Warehouse. The default is BRING_YOUR_OWN_LICENSE. * @@ -252,6 +232,26 @@ public static LicenseModel create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") LicenseModel licenseModel; + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + @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/CreateAutonomousDatabaseBackupDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDatabaseBackupDetails.java index 4d3e0a29388..8db00643631 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDatabaseBackupDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDatabaseBackupDetails.java @@ -27,15 +27,6 @@ public class CreateAutonomousDatabaseBackupDetails { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") - private String autonomousDatabaseId; - - public Builder autonomousDatabaseId(String autonomousDatabaseId) { - this.autonomousDatabaseId = autonomousDatabaseId; - this.__explicitlySet__.add("autonomousDatabaseId"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -45,12 +36,21 @@ public Builder displayName(String displayName) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") + private String autonomousDatabaseId; + + public Builder autonomousDatabaseId(String autonomousDatabaseId) { + this.autonomousDatabaseId = autonomousDatabaseId; + this.__explicitlySet__.add("autonomousDatabaseId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public CreateAutonomousDatabaseBackupDetails build() { CreateAutonomousDatabaseBackupDetails __instance__ = - new CreateAutonomousDatabaseBackupDetails(autonomousDatabaseId, displayName); + new CreateAutonomousDatabaseBackupDetails(displayName, autonomousDatabaseId); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -58,8 +58,8 @@ public CreateAutonomousDatabaseBackupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateAutonomousDatabaseBackupDetails o) { Builder copiedBuilder = - autonomousDatabaseId(o.getAutonomousDatabaseId()) - .displayName(o.getDisplayName()); + displayName(o.getDisplayName()) + .autonomousDatabaseId(o.getAutonomousDatabaseId()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -73,18 +73,18 @@ public static Builder builder() { return new Builder(); } - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database backup. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") - String autonomousDatabaseId; - /** * The user-friendly name for the backup. The name does not have to be unique. **/ @com.fasterxml.jackson.annotation.JsonProperty("displayName") String displayName; + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Autonomous Database backup. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("autonomousDatabaseId") + String autonomousDatabaseId; + @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/CreateAutonomousDatabaseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDatabaseDetails.java index 1737e366eb3..648f02ed1ed 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDatabaseDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateAutonomousDatabaseDetails.java @@ -27,15 +27,6 @@ public class CreateAutonomousDatabaseDetails { @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("compartmentId") private String compartmentId; @@ -45,6 +36,15 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + private String dbName; + + public Builder dbName(String dbName) { + this.dbName = dbName; + this.__explicitlySet__.add("dbName"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") private Integer cpuCoreCount; @@ -63,22 +63,12 @@ public Builder dataStorageSizeInTBs(Integer dataStorageSizeInTBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - private String dbName; - - public Builder dbName(String dbName) { - this.dbName = dbName; - this.__explicitlySet__.add("dbName"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") + private String adminPassword; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder adminPassword(String adminPassword) { + this.adminPassword = adminPassword; + this.__explicitlySet__.add("adminPassword"); return this; } @@ -91,6 +81,15 @@ public Builder displayName(String displayName) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") + private LicenseModel licenseModel; + + public Builder licenseModel(LicenseModel licenseModel) { + this.licenseModel = licenseModel; + this.__explicitlySet__.add("licenseModel"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") private java.util.Map freeformTags; @@ -100,12 +99,13 @@ public Builder freeformTags(java.util.Map freeformTags) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") - private LicenseModel licenseModel; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder licenseModel(LicenseModel licenseModel) { - this.licenseModel = licenseModel; - this.__explicitlySet__.add("licenseModel"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } @@ -115,15 +115,15 @@ public Builder licenseModel(LicenseModel licenseModel) { public CreateAutonomousDatabaseDetails build() { CreateAutonomousDatabaseDetails __instance__ = new CreateAutonomousDatabaseDetails( - adminPassword, compartmentId, + dbName, cpuCoreCount, dataStorageSizeInTBs, - dbName, - definedTags, + adminPassword, displayName, + licenseModel, freeformTags, - licenseModel); + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -131,15 +131,15 @@ public CreateAutonomousDatabaseDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateAutonomousDatabaseDetails o) { Builder copiedBuilder = - adminPassword(o.getAdminPassword()) - .compartmentId(o.getCompartmentId()) + compartmentId(o.getCompartmentId()) + .dbName(o.getDbName()) .cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInTBs(o.getDataStorageSizeInTBs()) - .dbName(o.getDbName()) - .definedTags(o.getDefinedTags()) + .adminPassword(o.getAdminPassword()) .displayName(o.getDisplayName()) + .licenseModel(o.getLicenseModel()) .freeformTags(o.getFreeformTags()) - .licenseModel(o.getLicenseModel()); + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -153,18 +153,18 @@ public static Builder builder() { return new Builder(); } - /** - * A strong password for Admin. The password must be between 12 and 60 characters long, and must contain at least 1 uppercase, 1 lowercase and 2 numeric characters. It cannot contain the double quote symbol (\"). It must be different than the last 4 passwords. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") - String adminPassword; - /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment of the autonomous database. **/ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; + /** + * The database name. The name must begin with an alphabetic character and can contain a maximum of 14 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + String dbName; + /** * The number of CPU Cores to be made available to the database. **/ @@ -179,36 +179,16 @@ public static Builder builder() { Integer dataStorageSizeInTBs; /** - * The database name. The name must begin with an alphabetic character and can contain a maximum of 14 alphanumeric characters. Special characters are not permitted. The database name must be unique in the tenancy. + * The password must be between 12 and 30 characters long, and must contain at least 1 uppercase, 1 lowercase, and 1 numeric character. It cannot contain the double quote symbol (\") or the username \"admin\", regardless of casing. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - String dbName; - - /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

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

- * Example: `{\"Department\": \"Finance\"}` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; /** * The Oracle license model that applies to the Oracle Autonomous Database. The default is BRING_YOUR_OWN_LICENSE. * @@ -252,6 +232,26 @@ public static LicenseModel create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") LicenseModel licenseModel; + /** + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + @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/CreateDataGuardAssociationDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationDetails.java index adcc657df00..3cb460ca6ec 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationDetails.java @@ -35,6 +35,10 @@ defaultImpl = CreateDataGuardAssociationDetails.class ) @com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = CreateDataGuardAssociationWithNewDbSystemDetails.class, + name = "NewDbSystem" + ), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = CreateDataGuardAssociationToExistingDbSystemDetails.class, name = "ExistingDbSystem" @@ -66,7 +70,7 @@ public class CreateDataGuardAssociationDetails { * [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) * in the Oracle Data Guard documentation. *

- **IMPORTANT** - The only protection mode currently supported by the Database Service is MAXIMUM_PERFORMANCE. + **IMPORTANT** - The only protection mode currently supported by the Database service is MAXIMUM_PERFORMANCE. * **/ public enum ProtectionMode { @@ -107,7 +111,7 @@ public static ProtectionMode create(String key) { * [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) * in the Oracle Data Guard documentation. *

- **IMPORTANT** - The only protection mode currently supported by the Database Service is MAXIMUM_PERFORMANCE. + **IMPORTANT** - The only protection mode currently supported by the Database service is MAXIMUM_PERFORMANCE. * **/ @com.fasterxml.jackson.annotation.JsonProperty("protectionMode") @@ -123,7 +127,7 @@ public static ProtectionMode create(String key) { * [Redo Transport Services](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-redo-transport-services.htm#SBYDB00400) * in the Oracle Data Guard documentation. *

- **IMPORTANT** - The only transport type currently supported by the Database Service is ASYNC. + **IMPORTANT** - The only transport type currently supported by the Database service is ASYNC. * **/ public enum TransportType { @@ -170,7 +174,7 @@ public static TransportType create(String key) { * [Redo Transport Services](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-redo-transport-services.htm#SBYDB00400) * in the Oracle Data Guard documentation. *

- **IMPORTANT** - The only transport type currently supported by the Database Service is ASYNC. + **IMPORTANT** - The only transport type currently supported by the Database service is ASYNC. * **/ @com.fasterxml.jackson.annotation.JsonProperty("transportType") 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 e138b4204f7..b8317b508e5 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 @@ -109,7 +109,7 @@ public CreateDataGuardAssociationToExistingDbSystemDetails( } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system to create the standby database on. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system in which to create the standby database. * **/ @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationWithNewDbSystemDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationWithNewDbSystemDetails.java new file mode 100644 index 00000000000..6ba76e6d86c --- /dev/null +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDataGuardAssociationWithNewDbSystemDetails.java @@ -0,0 +1,186 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.database.model; + +/** + * The configuration details for creating a Data Guard association to an existing database. A new DbSystem will be launched for standby database. + *
+ * Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields + * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in + * the setter methods of the {@link Builder}, which maintain a set of all explicitly set fields called + * {@link #__explicitlySet__}. The {@link #hashCode()} and {@link #equals(Object)} methods are implemented to take + * {@link #__explicitlySet__} into account. The constructor, on the other hand, does not set {@link #__explicitlySet__} + * (since the constructor cannot distinguish explicit {@code null} from unset {@code null}). + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = CreateDataGuardAssociationWithNewDbSystemDetails.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 = "creationType" +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class CreateDataGuardAssociationWithNewDbSystemDetails + extends CreateDataGuardAssociationDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("databaseAdminPassword") + private String databaseAdminPassword; + + public Builder databaseAdminPassword(String databaseAdminPassword) { + this.databaseAdminPassword = databaseAdminPassword; + this.__explicitlySet__.add("databaseAdminPassword"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("protectionMode") + private ProtectionMode protectionMode; + + public Builder protectionMode(ProtectionMode protectionMode) { + this.protectionMode = protectionMode; + this.__explicitlySet__.add("protectionMode"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("transportType") + private TransportType transportType; + + public Builder transportType(TransportType transportType) { + this.transportType = transportType; + this.__explicitlySet__.add("transportType"); + 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("availabilityDomain") + private String availabilityDomain; + + public Builder availabilityDomain(String availabilityDomain) { + this.availabilityDomain = availabilityDomain; + this.__explicitlySet__.add("availabilityDomain"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private String subnetId; + + public Builder subnetId(String subnetId) { + this.subnetId = subnetId; + this.__explicitlySet__.add("subnetId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + private String hostname; + + public Builder hostname(String hostname) { + this.hostname = hostname; + this.__explicitlySet__.add("hostname"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public CreateDataGuardAssociationWithNewDbSystemDetails build() { + CreateDataGuardAssociationWithNewDbSystemDetails __instance__ = + new CreateDataGuardAssociationWithNewDbSystemDetails( + databaseAdminPassword, + protectionMode, + transportType, + displayName, + availabilityDomain, + subnetId, + hostname); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(CreateDataGuardAssociationWithNewDbSystemDetails o) { + Builder copiedBuilder = + databaseAdminPassword(o.getDatabaseAdminPassword()) + .protectionMode(o.getProtectionMode()) + .transportType(o.getTransportType()) + .displayName(o.getDisplayName()) + .availabilityDomain(o.getAvailabilityDomain()) + .subnetId(o.getSubnetId()) + .hostname(o.getHostname()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + @Deprecated + public CreateDataGuardAssociationWithNewDbSystemDetails( + String databaseAdminPassword, + ProtectionMode protectionMode, + TransportType transportType, + String displayName, + String availabilityDomain, + String subnetId, + String hostname) { + super(databaseAdminPassword, protectionMode, transportType); + this.displayName = displayName; + this.availabilityDomain = availabilityDomain; + this.subnetId = subnetId; + this.hostname = hostname; + } + + /** + * The user-friendly name of the DB system that will contain the the standby database. The display name does not have to be unique. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + /** + * The name of the availability domain that the standby database DB system will be located in. For example- \"Uocm:PHX-AD-1\". + **/ + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + String availabilityDomain; + + /** + * The OCID of the subnet the DB system is associated with. + * **Subnet Restrictions:** + * - For 1- and 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.16.16/28 + *

+ * These subnets are used by the Oracle Clusterware private interconnect on the database instance. + * Specifying an overlapping subnet will cause the private interconnect to malfunction. + * This restriction applies to both the client subnet and backup subnet. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + String subnetId; + + /** + * The host name for the DB Node. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + String hostname; + + @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/CreateDatabaseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseDetails.java index c08420cc50e..8f6542f683d 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 @@ -27,6 +27,24 @@ public class CreateDatabaseDetails { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + private String dbName; + + public Builder dbName(String dbName) { + this.dbName = dbName; + this.__explicitlySet__.add("dbName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("pdbName") + private String pdbName; + + public Builder pdbName(String pdbName) { + this.pdbName = pdbName; + this.__explicitlySet__.add("pdbName"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") private String adminPassword; @@ -45,21 +63,12 @@ public Builder characterSet(String characterSet) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") - private DbBackupConfig dbBackupConfig; - - public Builder dbBackupConfig(DbBackupConfig dbBackupConfig) { - this.dbBackupConfig = dbBackupConfig; - this.__explicitlySet__.add("dbBackupConfig"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - private String dbName; + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") + private String ncharacterSet; - public Builder dbName(String dbName) { - this.dbName = dbName; - this.__explicitlySet__.add("dbName"); + public Builder ncharacterSet(String ncharacterSet) { + this.ncharacterSet = ncharacterSet; + this.__explicitlySet__.add("ncharacterSet"); return this; } @@ -72,13 +81,12 @@ public Builder dbWorkload(DbWorkload dbWorkload) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") + private DbBackupConfig dbBackupConfig; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder dbBackupConfig(DbBackupConfig dbBackupConfig) { + this.dbBackupConfig = dbBackupConfig; + this.__explicitlySet__.add("dbBackupConfig"); return this; } @@ -91,21 +99,13 @@ public Builder freeformTags(java.util.Map freeformTags) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") - private String ncharacterSet; - - public Builder ncharacterSet(String ncharacterSet) { - this.ncharacterSet = ncharacterSet; - this.__explicitlySet__.add("ncharacterSet"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("pdbName") - private String pdbName; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder pdbName(String pdbName) { - this.pdbName = pdbName; - this.__explicitlySet__.add("pdbName"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } @@ -115,15 +115,15 @@ public Builder pdbName(String pdbName) { public CreateDatabaseDetails build() { CreateDatabaseDetails __instance__ = new CreateDatabaseDetails( + dbName, + pdbName, adminPassword, characterSet, - dbBackupConfig, - dbName, + ncharacterSet, dbWorkload, - definedTags, + dbBackupConfig, freeformTags, - ncharacterSet, - pdbName); + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -131,15 +131,15 @@ public CreateDatabaseDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDatabaseDetails o) { Builder copiedBuilder = - adminPassword(o.getAdminPassword()) + dbName(o.getDbName()) + .pdbName(o.getPdbName()) + .adminPassword(o.getAdminPassword()) .characterSet(o.getCharacterSet()) - .dbBackupConfig(o.getDbBackupConfig()) - .dbName(o.getDbName()) + .ncharacterSet(o.getNcharacterSet()) .dbWorkload(o.getDbWorkload()) - .definedTags(o.getDefinedTags()) + .dbBackupConfig(o.getDbBackupConfig()) .freeformTags(o.getFreeformTags()) - .ncharacterSet(o.getNcharacterSet()) - .pdbName(o.getPdbName()); + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -153,6 +153,18 @@ public static Builder builder() { return new Builder(); } + /** + * The database name. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + String dbName; + + /** + * The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("pdbName") + String pdbName; + /** * A strong password for SYS, SYSTEM, and PDB Admin. 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 -. **/ @@ -168,14 +180,13 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("characterSet") String characterSet; - @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") - DbBackupConfig dbBackupConfig; - /** - * The database name. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. + * The national character set for the database. The default is AL16UTF16. Allowed values are: + * AL16UTF16 or UTF8. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - String dbName; + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") + String ncharacterSet; /** * The database workload type. **/ @@ -217,15 +228,8 @@ public static DbWorkload create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("dbWorkload") DbWorkload dbWorkload; - /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") + DbBackupConfig dbBackupConfig; /** * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. @@ -238,18 +242,14 @@ public static DbWorkload create(String key) { java.util.Map freeformTags; /** - * The national character set for the database. The default is AL16UTF16. Allowed values are: - * AL16UTF16 or UTF8. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` * **/ - @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") - String ncharacterSet; - - /** - * The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("pdbName") - String pdbName; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; @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/CreateDatabaseFromBackupDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDatabaseFromBackupDetails.java index 1614401c99f..2f976d0bb50 100644 --- 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 @@ -24,15 +24,6 @@ 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; @@ -51,12 +42,21 @@ public Builder backupTDEPassword(String backupTDEPassword) { return this; } + @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.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public CreateDatabaseFromBackupDetails build() { CreateDatabaseFromBackupDetails __instance__ = - new CreateDatabaseFromBackupDetails(adminPassword, backupId, backupTDEPassword); + new CreateDatabaseFromBackupDetails(backupId, backupTDEPassword, adminPassword); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -64,9 +64,9 @@ public CreateDatabaseFromBackupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDatabaseFromBackupDetails o) { Builder copiedBuilder = - adminPassword(o.getAdminPassword()) - .backupId(o.getBackupId()) - .backupTDEPassword(o.getBackupTDEPassword()); + backupId(o.getBackupId()) + .backupTDEPassword(o.getBackupTDEPassword()) + .adminPassword(o.getAdminPassword()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -80,12 +80,6 @@ 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](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm). **/ @@ -98,6 +92,12 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("backupTDEPassword") String backupTDEPassword; + /** + * 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; + @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 2806796be66..f5af4d10f1f 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 @@ -27,12 +27,12 @@ public class CreateDbHomeDetails { @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; + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; - public Builder database(CreateDatabaseDetails database) { - this.database = database; - this.__explicitlySet__.add("database"); + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); return this; } @@ -45,12 +45,12 @@ public Builder dbVersion(String dbVersion) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - private String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("database") + private CreateDatabaseDetails database; - public Builder displayName(String displayName) { - this.displayName = displayName; - this.__explicitlySet__.add("displayName"); + public Builder database(CreateDatabaseDetails database) { + this.database = database; + this.__explicitlySet__.add("database"); return this; } @@ -59,7 +59,7 @@ public Builder displayName(String displayName) { public CreateDbHomeDetails build() { CreateDbHomeDetails __instance__ = - new CreateDbHomeDetails(database, dbVersion, displayName); + new CreateDbHomeDetails(displayName, dbVersion, database); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -67,9 +67,9 @@ public CreateDbHomeDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDbHomeDetails o) { Builder copiedBuilder = - database(o.getDatabase()) + displayName(o.getDisplayName()) .dbVersion(o.getDbVersion()) - .displayName(o.getDisplayName()); + .database(o.getDatabase()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -83,8 +83,11 @@ public static Builder builder() { return new Builder(); } - @com.fasterxml.jackson.annotation.JsonProperty("database") - CreateDatabaseDetails database; + /** + * The user-provided name of the database home. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; /** * A valid Oracle Database version. To get a list of supported versions, use the {@link #listDbVersions(ListDbVersionsRequest) listDbVersions} operation. @@ -92,11 +95,8 @@ public static Builder builder() { @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.JsonProperty("database") + CreateDatabaseDetails 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/CreateDbHomeFromBackupDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeFromBackupDetails.java index b14e3847326..b262e0e8927 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeFromBackupDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeFromBackupDetails.java @@ -27,15 +27,6 @@ public class CreateDbHomeFromBackupDetails { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @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.JsonProperty("displayName") private String displayName; @@ -45,19 +36,28 @@ public Builder displayName(String 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 CreateDbHomeFromBackupDetails build() { CreateDbHomeFromBackupDetails __instance__ = - new CreateDbHomeFromBackupDetails(database, displayName); + new CreateDbHomeFromBackupDetails(displayName, database); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(CreateDbHomeFromBackupDetails o) { - Builder copiedBuilder = database(o.getDatabase()).displayName(o.getDisplayName()); + Builder copiedBuilder = displayName(o.getDisplayName()).database(o.getDatabase()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -71,15 +71,15 @@ public static Builder builder() { return new Builder(); } - @com.fasterxml.jackson.annotation.JsonProperty("database") - CreateDatabaseFromBackupDetails database; - /** * The user-provided name of the database home. **/ @com.fasterxml.jackson.annotation.JsonProperty("displayName") String displayName; + @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/CreateDbHomeWithDbSystemIdDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateDbHomeWithDbSystemIdDetails.java index 1c21f5b4859..80081904939 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 @@ -48,15 +48,6 @@ 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; @@ -66,13 +57,22 @@ public Builder dbVersion(String dbVersion) { 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.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public CreateDbHomeWithDbSystemIdDetails build() { CreateDbHomeWithDbSystemIdDetails __instance__ = new CreateDbHomeWithDbSystemIdDetails( - dbSystemId, displayName, database, dbVersion); + dbSystemId, displayName, dbVersion, database); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -82,8 +82,8 @@ public Builder copy(CreateDbHomeWithDbSystemIdDetails o) { Builder copiedBuilder = dbSystemId(o.getDbSystemId()) .displayName(o.getDisplayName()) - .database(o.getDatabase()) - .dbVersion(o.getDbVersion()); + .dbVersion(o.getDbVersion()) + .database(o.getDatabase()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -101,22 +101,22 @@ public static Builder builder() { public CreateDbHomeWithDbSystemIdDetails( String dbSystemId, String displayName, - CreateDatabaseDetails database, - String dbVersion) { + String dbVersion, + CreateDatabaseDetails database) { super(dbSystemId, displayName); - this.database = database; this.dbVersion = dbVersion; + this.database = database; } - @com.fasterxml.jackson.annotation.JsonProperty("database") - CreateDatabaseDetails database; - /** * 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; + @com.fasterxml.jackson.annotation.JsonProperty("database") + CreateDatabaseDetails 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/CreateExternalBackupJobDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateExternalBackupJobDetails.java index e0f50eb77ac..e35f9a16ebd 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateExternalBackupJobDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/CreateExternalBackupJobDetails.java @@ -33,15 +33,6 @@ public Builder availabilityDomain(String availabilityDomain) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("characterSet") - private String characterSet; - - public Builder characterSet(String characterSet) { - this.characterSet = characterSet; - this.__explicitlySet__.add("characterSet"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") private String compartmentId; @@ -51,21 +42,21 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - private DatabaseEdition databaseEdition; + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; - public Builder databaseEdition(DatabaseEdition databaseEdition) { - this.databaseEdition = databaseEdition; - this.__explicitlySet__.add("databaseEdition"); + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("databaseMode") - private DatabaseMode databaseMode; + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + private String dbVersion; - public Builder databaseMode(DatabaseMode databaseMode) { - this.databaseMode = databaseMode; - this.__explicitlySet__.add("databaseMode"); + public Builder dbVersion(String dbVersion) { + this.dbVersion = dbVersion; + this.__explicitlySet__.add("dbVersion"); return this; } @@ -87,21 +78,12 @@ public Builder dbUniqueName(String dbUniqueName) { 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; + @com.fasterxml.jackson.annotation.JsonProperty("pdbName") + private String pdbName; - public Builder displayName(String displayName) { - this.displayName = displayName; - this.__explicitlySet__.add("displayName"); + public Builder pdbName(String pdbName) { + this.pdbName = pdbName; + this.__explicitlySet__.add("pdbName"); return this; } @@ -114,6 +96,15 @@ public Builder externalDatabaseIdentifier(Long externalDatabaseIdentifier) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("characterSet") + private String characterSet; + + public Builder characterSet(String characterSet) { + this.characterSet = characterSet; + this.__explicitlySet__.add("characterSet"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") private String ncharacterSet; @@ -123,12 +114,21 @@ public Builder ncharacterSet(String ncharacterSet) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("pdbName") - private String pdbName; + @com.fasterxml.jackson.annotation.JsonProperty("databaseMode") + private DatabaseMode databaseMode; - public Builder pdbName(String pdbName) { - this.pdbName = pdbName; - this.__explicitlySet__.add("pdbName"); + public Builder databaseMode(DatabaseMode databaseMode) { + this.databaseMode = databaseMode; + this.__explicitlySet__.add("databaseMode"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + private DatabaseEdition databaseEdition; + + public Builder databaseEdition(DatabaseEdition databaseEdition) { + this.databaseEdition = databaseEdition; + this.__explicitlySet__.add("databaseEdition"); return this; } @@ -139,17 +139,17 @@ public CreateExternalBackupJobDetails build() { CreateExternalBackupJobDetails __instance__ = new CreateExternalBackupJobDetails( availabilityDomain, - characterSet, compartmentId, - databaseEdition, - databaseMode, + displayName, + dbVersion, dbName, dbUniqueName, - dbVersion, - displayName, + pdbName, externalDatabaseIdentifier, + characterSet, ncharacterSet, - pdbName); + databaseMode, + databaseEdition); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -158,17 +158,17 @@ public CreateExternalBackupJobDetails build() { public Builder copy(CreateExternalBackupJobDetails o) { Builder copiedBuilder = availabilityDomain(o.getAvailabilityDomain()) - .characterSet(o.getCharacterSet()) .compartmentId(o.getCompartmentId()) - .databaseEdition(o.getDatabaseEdition()) - .databaseMode(o.getDatabaseMode()) + .displayName(o.getDisplayName()) + .dbVersion(o.getDbVersion()) .dbName(o.getDbName()) .dbUniqueName(o.getDbUniqueName()) - .dbVersion(o.getDbVersion()) - .displayName(o.getDisplayName()) + .pdbName(o.getPdbName()) .externalDatabaseIdentifier(o.getExternalDatabaseIdentifier()) + .characterSet(o.getCharacterSet()) .ncharacterSet(o.getNcharacterSet()) - .pdbName(o.getPdbName()); + .databaseMode(o.getDatabaseMode()) + .databaseEdition(o.getDatabaseEdition()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -188,6 +188,48 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") String availabilityDomain; + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment where this backup should be created. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; + + /** + * A user-friendly name for the backup. This name does not have to be unique. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + /** + * A valid Oracle Database version. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + String dbVersion; + + /** + * The name of the database from which the backup is being taken. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbName") + String dbName; + + /** + * The `DB_UNIQUE_NAME` of the Oracle Database being backed up. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") + String dbUniqueName; + + /** + * The pluggable database name. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("pdbName") + String pdbName; + + /** + * The `DBID` of the Oracle Database being backed up. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("externalDatabaseIdentifier") + Long externalDatabaseIdentifier; + /** * The character set for the database. **/ @@ -195,33 +237,29 @@ public static Builder builder() { String characterSet; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment where this backup should be created. + * The national character set for the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") - String compartmentId; + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") + String ncharacterSet; /** - * The Oracle Database edition to use for creating a database from this standalone backup. - * Note that 2-node RAC DB systems require Enterprise Edition - Extreme Performance. - * + * The mode (single instance or RAC) of the database being backed up. **/ - public enum DatabaseEdition { - StandardEdition("STANDARD_EDITION"), - EnterpriseEdition("ENTERPRISE_EDITION"), - EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), - EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), + public enum DatabaseMode { + Si("SI"), + Rac("RAC"), ; private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (DatabaseEdition v : DatabaseEdition.values()) { + for (DatabaseMode v : DatabaseMode.values()) { map.put(v.getValue(), v); } } - DatabaseEdition(String value) { + DatabaseMode(String value) { this.value = value; } @@ -231,39 +269,41 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static DatabaseEdition create(String key) { + public static DatabaseMode create(String key) { if (map.containsKey(key)) { return map.get(key); } - throw new RuntimeException("Invalid DatabaseEdition: " + key); + throw new RuntimeException("Invalid DatabaseMode: " + key); } }; + /** + * The mode (single instance or RAC) of the database being backed up. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("databaseMode") + DatabaseMode databaseMode; /** * The Oracle Database edition to use for creating a database from this standalone backup. * Note that 2-node RAC DB systems require Enterprise Edition - Extreme Performance. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - DatabaseEdition databaseEdition; - /** - * The mode (single instance or RAC) of the database being backed up. - **/ - public enum DatabaseMode { - Si("SI"), - Rac("RAC"), + public enum DatabaseEdition { + StandardEdition("STANDARD_EDITION"), + EnterpriseEdition("ENTERPRISE_EDITION"), + EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), + EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), ; private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (DatabaseMode v : DatabaseMode.values()) { + for (DatabaseEdition v : DatabaseEdition.values()) { map.put(v.getValue(), v); } } - DatabaseMode(String value) { + DatabaseEdition(String value) { this.value = value; } @@ -273,60 +313,20 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static DatabaseMode create(String key) { + public static DatabaseEdition create(String key) { if (map.containsKey(key)) { return map.get(key); } - throw new RuntimeException("Invalid DatabaseMode: " + key); + throw new RuntimeException("Invalid DatabaseEdition: " + key); } }; /** - * The mode (single instance or RAC) of the database being backed up. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseMode") - DatabaseMode databaseMode; - - /** - * The name of the database from which the backup is being taken. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbName") - String dbName; - - /** - * The `DB_UNIQUE_NAME` of the Oracle Database being backed up. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") - String dbUniqueName; - - /** - * A valid Oracle Database version. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") - String dbVersion; - - /** - * A user-friendly name for the backup. This name does not have to be unique. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; - - /** - * The `DBID` of the Oracle Database being backed up. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("externalDatabaseIdentifier") - Long externalDatabaseIdentifier; - - /** - * The national character set for the database. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") - String ncharacterSet; - - /** - * The pluggable database name. + * The Oracle Database edition to use for creating a database from this standalone backup. + * Note that 2-node RAC DB systems require Enterprise Edition - Extreme Performance. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("pdbName") - String pdbName; + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + DatabaseEdition databaseEdition; @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 d4e314df797..7d930bd1808 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 @@ -4,15 +4,6 @@ package com.oracle.bmc.database.model; /** - * The properties that define a Data Guard association. - *

- * 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). - *

- * For information about endpoints and signing API requests, see - * [About the API](https://docs.us-phoenix-1.oraclecloud.com/Content/API/Concepts/usingapi.htm). For information about available SDKs and tools, see - * [SDKS and Other Tools](https://docs.us-phoenix-1.oraclecloud.com/Content/API/Concepts/sdks.htm). * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -33,21 +24,12 @@ public class DataGuardAssociation { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("applyLag") - private String applyLag; - - public Builder applyLag(String applyLag) { - this.applyLag = applyLag; - this.__explicitlySet__.add("applyLag"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("applyRate") - private String applyRate; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder applyRate(String applyRate) { - this.applyRate = applyRate; - this.__explicitlySet__.add("applyRate"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -60,21 +42,12 @@ public Builder databaseId(String databaseId) { 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("lifecycleDetails") - private String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("role") + private Role role; - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); + public Builder role(Role role) { + this.role = role; + this.__explicitlySet__.add("role"); return this; } @@ -87,21 +60,21 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("peerDataGuardAssociationId") - private String peerDataGuardAssociationId; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder peerDataGuardAssociationId(String peerDataGuardAssociationId) { - this.peerDataGuardAssociationId = peerDataGuardAssociationId; - this.__explicitlySet__.add("peerDataGuardAssociationId"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("peerDatabaseId") - private String peerDatabaseId; + @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") + private String peerDbSystemId; - public Builder peerDatabaseId(String peerDatabaseId) { - this.peerDatabaseId = peerDatabaseId; - this.__explicitlySet__.add("peerDatabaseId"); + public Builder peerDbSystemId(String peerDbSystemId) { + this.peerDbSystemId = peerDbSystemId; + this.__explicitlySet__.add("peerDbSystemId"); return this; } @@ -114,12 +87,21 @@ public Builder peerDbHomeId(String peerDbHomeId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") - private String peerDbSystemId; + @com.fasterxml.jackson.annotation.JsonProperty("peerDatabaseId") + private String peerDatabaseId; - public Builder peerDbSystemId(String peerDbSystemId) { - this.peerDbSystemId = peerDbSystemId; - this.__explicitlySet__.add("peerDbSystemId"); + public Builder peerDatabaseId(String peerDatabaseId) { + this.peerDatabaseId = peerDatabaseId; + this.__explicitlySet__.add("peerDatabaseId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("peerDataGuardAssociationId") + private String peerDataGuardAssociationId; + + public Builder peerDataGuardAssociationId(String peerDataGuardAssociationId) { + this.peerDataGuardAssociationId = peerDataGuardAssociationId; + this.__explicitlySet__.add("peerDataGuardAssociationId"); return this; } @@ -132,6 +114,24 @@ public Builder peerRole(PeerRole peerRole) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("applyLag") + private String applyLag; + + public Builder applyLag(String applyLag) { + this.applyLag = applyLag; + this.__explicitlySet__.add("applyLag"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("applyRate") + private String applyRate; + + public Builder applyRate(String applyRate) { + this.applyRate = applyRate; + this.__explicitlySet__.add("applyRate"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("protectionMode") private ProtectionMode protectionMode; @@ -141,12 +141,12 @@ public Builder protectionMode(ProtectionMode protectionMode) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("role") - private Role role; + @com.fasterxml.jackson.annotation.JsonProperty("transportType") + private TransportType transportType; - public Builder role(Role role) { - this.role = role; - this.__explicitlySet__.add("role"); + public Builder transportType(TransportType transportType) { + this.transportType = transportType; + this.__explicitlySet__.add("transportType"); return this; } @@ -159,36 +159,27 @@ public Builder timeCreated(java.util.Date timeCreated) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("transportType") - private TransportType transportType; - - public Builder transportType(TransportType transportType) { - this.transportType = transportType; - this.__explicitlySet__.add("transportType"); - return this; - } - @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public DataGuardAssociation build() { DataGuardAssociation __instance__ = new DataGuardAssociation( - applyLag, - applyRate, - databaseId, id, - lifecycleDetails, + databaseId, + role, lifecycleState, - peerDataGuardAssociationId, - peerDatabaseId, - peerDbHomeId, + lifecycleDetails, peerDbSystemId, + peerDbHomeId, + peerDatabaseId, + peerDataGuardAssociationId, peerRole, + applyLag, + applyRate, protectionMode, - role, - timeCreated, - transportType); + transportType, + timeCreated); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -196,21 +187,21 @@ public DataGuardAssociation build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DataGuardAssociation o) { Builder copiedBuilder = - applyLag(o.getApplyLag()) - .applyRate(o.getApplyRate()) + id(o.getId()) .databaseId(o.getDatabaseId()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) + .role(o.getRole()) .lifecycleState(o.getLifecycleState()) - .peerDataGuardAssociationId(o.getPeerDataGuardAssociationId()) - .peerDatabaseId(o.getPeerDatabaseId()) - .peerDbHomeId(o.getPeerDbHomeId()) + .lifecycleDetails(o.getLifecycleDetails()) .peerDbSystemId(o.getPeerDbSystemId()) + .peerDbHomeId(o.getPeerDbHomeId()) + .peerDatabaseId(o.getPeerDatabaseId()) + .peerDataGuardAssociationId(o.getPeerDataGuardAssociationId()) .peerRole(o.getPeerRole()) + .applyLag(o.getApplyLag()) + .applyRate(o.getApplyRate()) .protectionMode(o.getProtectionMode()) - .role(o.getRole()) - .timeCreated(o.getTimeCreated()) - .transportType(o.getTransportType()); + .transportType(o.getTransportType()) + .timeCreated(o.getTimeCreated()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -225,42 +216,67 @@ public static Builder builder() { } /** - * The lag time between updates to the primary database and application of the redo data on the standby database, - * as computed by the reporting database. - *

- * Example: `9 seconds` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("applyLag") - String applyLag; - - /** - * The rate at which redo logs are synced between the associated databases. - *

- * Example: `180 Mb per second` - * + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Data Guard association. **/ - @com.fasterxml.jackson.annotation.JsonProperty("applyRate") - String applyRate; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the reporting database. **/ @com.fasterxml.jackson.annotation.JsonProperty("databaseId") String databaseId; - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Data Guard association. + * The role of the reporting database in this Data Guard association. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @lombok.extern.slf4j.Slf4j + public enum Role { + Primary("PRIMARY"), + Standby("STANDBY"), + DisabledStandby("DISABLED_STANDBY"), + /** + * 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 (Role v : Role.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + Role(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Role create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'Role', returning UnknownEnumValue", key); + return UnknownEnumValue; + } + }; /** - * Additional information about the current lifecycleState, if available. - * + * The role of the reporting database in this Data Guard association. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("role") + Role role; /** * The current state of the Data Guard association. **/ @@ -318,16 +334,19 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the peer database's Data Guard association. + * Additional information about the current lifecycleState, if available. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("peerDataGuardAssociationId") - String peerDataGuardAssociationId; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the associated peer database. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system containing the associated + * peer database. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("peerDatabaseId") - String peerDatabaseId; + @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") + String peerDbSystemId; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home containing the associated peer database. @@ -337,12 +356,16 @@ public static LifecycleState create(String key) { String peerDbHomeId; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system containing the associated - * peer database. - * + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the associated peer database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") - String peerDbSystemId; + @com.fasterxml.jackson.annotation.JsonProperty("peerDatabaseId") + String peerDatabaseId; + + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the peer database's Data Guard association. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("peerDataGuardAssociationId") + String peerDataGuardAssociationId; /** * The role of the peer database in this Data Guard association. **/ @@ -395,6 +418,25 @@ public static PeerRole create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("peerRole") PeerRole peerRole; + + /** + * The lag time between updates to the primary database and application of the redo data on the standby database, + * as computed by the reporting database. + *

+ * Example: `9 seconds` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("applyLag") + String applyLag; + + /** + * The rate at which redo logs are synced between the associated databases. + *

+ * Example: `180 Mb per second` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("applyRate") + String applyRate; /** * The protection mode of this Data Guard association. For more information, see * [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) @@ -453,63 +495,6 @@ public static ProtectionMode create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("protectionMode") ProtectionMode protectionMode; - /** - * The role of the reporting database in this Data Guard association. - **/ - @lombok.extern.slf4j.Slf4j - public enum Role { - Primary("PRIMARY"), - Standby("STANDBY"), - DisabledStandby("DISABLED_STANDBY"), - - /** - * 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 (Role v : Role.values()) { - if (v != UnknownEnumValue) { - map.put(v.getValue(), v); - } - } - } - - Role(String value) { - this.value = value; - } - - @com.fasterxml.jackson.annotation.JsonValue - public String getValue() { - return value; - } - - @com.fasterxml.jackson.annotation.JsonCreator - public static Role create(String key) { - if (map.containsKey(key)) { - return map.get(key); - } - LOG.warn( - "Received unknown value '{}' for enum 'Role', returning UnknownEnumValue", key); - return UnknownEnumValue; - } - }; - /** - * The role of the reporting database in this Data Guard association. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("role") - Role role; - - /** - * The date and time the Data Guard Association was created. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; /** * The redo transport type used by this Data Guard association. For more information, see * [Redo Transport Services](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-redo-transport-services.htm#SBYDB00400) @@ -569,6 +554,12 @@ public static TransportType create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("transportType") TransportType transportType; + /** + * The date and time the Data Guard association was created. + **/ + @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-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 27170820c22..90b7ef92a5c 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 @@ -33,21 +33,12 @@ public class DataGuardAssociationSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("applyLag") - private String applyLag; - - public Builder applyLag(String applyLag) { - this.applyLag = applyLag; - this.__explicitlySet__.add("applyLag"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("applyRate") - private String applyRate; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder applyRate(String applyRate) { - this.applyRate = applyRate; - this.__explicitlySet__.add("applyRate"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -60,21 +51,12 @@ public Builder databaseId(String databaseId) { 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("lifecycleDetails") - private String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("role") + private Role role; - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); + public Builder role(Role role) { + this.role = role; + this.__explicitlySet__.add("role"); return this; } @@ -87,21 +69,21 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("peerDataGuardAssociationId") - private String peerDataGuardAssociationId; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder peerDataGuardAssociationId(String peerDataGuardAssociationId) { - this.peerDataGuardAssociationId = peerDataGuardAssociationId; - this.__explicitlySet__.add("peerDataGuardAssociationId"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("peerDatabaseId") - private String peerDatabaseId; + @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") + private String peerDbSystemId; - public Builder peerDatabaseId(String peerDatabaseId) { - this.peerDatabaseId = peerDatabaseId; - this.__explicitlySet__.add("peerDatabaseId"); + public Builder peerDbSystemId(String peerDbSystemId) { + this.peerDbSystemId = peerDbSystemId; + this.__explicitlySet__.add("peerDbSystemId"); return this; } @@ -114,12 +96,21 @@ public Builder peerDbHomeId(String peerDbHomeId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") - private String peerDbSystemId; + @com.fasterxml.jackson.annotation.JsonProperty("peerDatabaseId") + private String peerDatabaseId; - public Builder peerDbSystemId(String peerDbSystemId) { - this.peerDbSystemId = peerDbSystemId; - this.__explicitlySet__.add("peerDbSystemId"); + public Builder peerDatabaseId(String peerDatabaseId) { + this.peerDatabaseId = peerDatabaseId; + this.__explicitlySet__.add("peerDatabaseId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("peerDataGuardAssociationId") + private String peerDataGuardAssociationId; + + public Builder peerDataGuardAssociationId(String peerDataGuardAssociationId) { + this.peerDataGuardAssociationId = peerDataGuardAssociationId; + this.__explicitlySet__.add("peerDataGuardAssociationId"); return this; } @@ -132,6 +123,24 @@ public Builder peerRole(PeerRole peerRole) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("applyLag") + private String applyLag; + + public Builder applyLag(String applyLag) { + this.applyLag = applyLag; + this.__explicitlySet__.add("applyLag"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("applyRate") + private String applyRate; + + public Builder applyRate(String applyRate) { + this.applyRate = applyRate; + this.__explicitlySet__.add("applyRate"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("protectionMode") private ProtectionMode protectionMode; @@ -141,12 +150,12 @@ public Builder protectionMode(ProtectionMode protectionMode) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("role") - private Role role; + @com.fasterxml.jackson.annotation.JsonProperty("transportType") + private TransportType transportType; - public Builder role(Role role) { - this.role = role; - this.__explicitlySet__.add("role"); + public Builder transportType(TransportType transportType) { + this.transportType = transportType; + this.__explicitlySet__.add("transportType"); return this; } @@ -159,36 +168,27 @@ public Builder timeCreated(java.util.Date timeCreated) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("transportType") - private TransportType transportType; - - public Builder transportType(TransportType transportType) { - this.transportType = transportType; - this.__explicitlySet__.add("transportType"); - return this; - } - @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public DataGuardAssociationSummary build() { DataGuardAssociationSummary __instance__ = new DataGuardAssociationSummary( - applyLag, - applyRate, - databaseId, id, - lifecycleDetails, + databaseId, + role, lifecycleState, - peerDataGuardAssociationId, - peerDatabaseId, - peerDbHomeId, + lifecycleDetails, peerDbSystemId, + peerDbHomeId, + peerDatabaseId, + peerDataGuardAssociationId, peerRole, + applyLag, + applyRate, protectionMode, - role, - timeCreated, - transportType); + transportType, + timeCreated); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -196,21 +196,21 @@ public DataGuardAssociationSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DataGuardAssociationSummary o) { Builder copiedBuilder = - applyLag(o.getApplyLag()) - .applyRate(o.getApplyRate()) + id(o.getId()) .databaseId(o.getDatabaseId()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) + .role(o.getRole()) .lifecycleState(o.getLifecycleState()) - .peerDataGuardAssociationId(o.getPeerDataGuardAssociationId()) - .peerDatabaseId(o.getPeerDatabaseId()) - .peerDbHomeId(o.getPeerDbHomeId()) + .lifecycleDetails(o.getLifecycleDetails()) .peerDbSystemId(o.getPeerDbSystemId()) + .peerDbHomeId(o.getPeerDbHomeId()) + .peerDatabaseId(o.getPeerDatabaseId()) + .peerDataGuardAssociationId(o.getPeerDataGuardAssociationId()) .peerRole(o.getPeerRole()) + .applyLag(o.getApplyLag()) + .applyRate(o.getApplyRate()) .protectionMode(o.getProtectionMode()) - .role(o.getRole()) - .timeCreated(o.getTimeCreated()) - .transportType(o.getTransportType()); + .transportType(o.getTransportType()) + .timeCreated(o.getTimeCreated()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -225,42 +225,67 @@ public static Builder builder() { } /** - * The lag time between updates to the primary database and application of the redo data on the standby database, - * as computed by the reporting database. - *

- * Example: `9 seconds` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("applyLag") - String applyLag; - - /** - * The rate at which redo logs are synced between the associated databases. - *

- * Example: `180 Mb per second` - * + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Data Guard association. **/ - @com.fasterxml.jackson.annotation.JsonProperty("applyRate") - String applyRate; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the reporting database. **/ @com.fasterxml.jackson.annotation.JsonProperty("databaseId") String databaseId; - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Data Guard association. + * The role of the reporting database in this Data Guard association. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @lombok.extern.slf4j.Slf4j + public enum Role { + Primary("PRIMARY"), + Standby("STANDBY"), + DisabledStandby("DISABLED_STANDBY"), + /** + * 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 (Role v : Role.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + Role(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Role create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'Role', returning UnknownEnumValue", key); + return UnknownEnumValue; + } + }; /** - * Additional information about the current lifecycleState, if available. - * + * The role of the reporting database in this Data Guard association. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("role") + Role role; /** * The current state of the Data Guard association. **/ @@ -318,16 +343,19 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the peer database's Data Guard association. + * Additional information about the current lifecycleState, if available. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("peerDataGuardAssociationId") - String peerDataGuardAssociationId; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the associated peer database. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system containing the associated + * peer database. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("peerDatabaseId") - String peerDatabaseId; + @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") + String peerDbSystemId; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home containing the associated peer database. @@ -337,12 +365,16 @@ public static LifecycleState create(String key) { String peerDbHomeId; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system containing the associated - * peer database. - * + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the associated peer database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("peerDbSystemId") - String peerDbSystemId; + @com.fasterxml.jackson.annotation.JsonProperty("peerDatabaseId") + String peerDatabaseId; + + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the peer database's Data Guard association. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("peerDataGuardAssociationId") + String peerDataGuardAssociationId; /** * The role of the peer database in this Data Guard association. **/ @@ -395,6 +427,25 @@ public static PeerRole create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("peerRole") PeerRole peerRole; + + /** + * The lag time between updates to the primary database and application of the redo data on the standby database, + * as computed by the reporting database. + *

+ * Example: `9 seconds` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("applyLag") + String applyLag; + + /** + * The rate at which redo logs are synced between the associated databases. + *

+ * Example: `180 Mb per second` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("applyRate") + String applyRate; /** * The protection mode of this Data Guard association. For more information, see * [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) @@ -453,63 +504,6 @@ public static ProtectionMode create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("protectionMode") ProtectionMode protectionMode; - /** - * The role of the reporting database in this Data Guard association. - **/ - @lombok.extern.slf4j.Slf4j - public enum Role { - Primary("PRIMARY"), - Standby("STANDBY"), - DisabledStandby("DISABLED_STANDBY"), - - /** - * 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 (Role v : Role.values()) { - if (v != UnknownEnumValue) { - map.put(v.getValue(), v); - } - } - } - - Role(String value) { - this.value = value; - } - - @com.fasterxml.jackson.annotation.JsonValue - public String getValue() { - return value; - } - - @com.fasterxml.jackson.annotation.JsonCreator - public static Role create(String key) { - if (map.containsKey(key)) { - return map.get(key); - } - LOG.warn( - "Received unknown value '{}' for enum 'Role', returning UnknownEnumValue", key); - return UnknownEnumValue; - } - }; - /** - * The role of the reporting database in this Data Guard association. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("role") - Role role; - - /** - * The date and time the Data Guard Association was created. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; /** * The redo transport type used by this Data Guard association. For more information, see * [Redo Transport Services](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-redo-transport-services.htm#SBYDB00400) @@ -569,6 +563,12 @@ public static TransportType create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("transportType") TransportType transportType; + /** + * The date and time the Data Guard association was created. + **/ + @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-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 5b4522afc2d..a15808f3fb8 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 @@ -4,11 +4,6 @@ package com.oracle.bmc.database.model; /** - * An Oracle database on a bare metal or virtual machine DB system. For more information, see [Bare Metal and Virtual Machine DB Systems](https://docs.us-phoenix-1.oraclecloud.com/Content/Database/Concepts/overview.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). - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -27,12 +22,12 @@ public class Database { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("characterSet") - private String characterSet; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder characterSet(String characterSet) { - this.characterSet = characterSet; - this.__explicitlySet__.add("characterSet"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -45,12 +40,21 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") - private DbBackupConfig dbBackupConfig; + @com.fasterxml.jackson.annotation.JsonProperty("characterSet") + private String characterSet; - public Builder dbBackupConfig(DbBackupConfig dbBackupConfig) { - this.dbBackupConfig = dbBackupConfig; - this.__explicitlySet__.add("dbBackupConfig"); + public Builder characterSet(String characterSet) { + this.characterSet = characterSet; + this.__explicitlySet__.add("characterSet"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") + private String ncharacterSet; + + public Builder ncharacterSet(String ncharacterSet) { + this.ncharacterSet = ncharacterSet; + this.__explicitlySet__.add("ncharacterSet"); return this; } @@ -72,12 +76,12 @@ public Builder dbName(String dbName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") - private String dbUniqueName; + @com.fasterxml.jackson.annotation.JsonProperty("pdbName") + private String pdbName; - public Builder dbUniqueName(String dbUniqueName) { - this.dbUniqueName = dbUniqueName; - this.__explicitlySet__.add("dbUniqueName"); + public Builder pdbName(String pdbName) { + this.pdbName = pdbName; + this.__explicitlySet__.add("pdbName"); return this; } @@ -90,31 +94,12 @@ public Builder dbWorkload(String dbWorkload) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; - - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; - - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") + private String dbUniqueName; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder dbUniqueName(String dbUniqueName) { + this.dbUniqueName = dbUniqueName; + this.__explicitlySet__.add("dbUniqueName"); return this; } @@ -136,30 +121,40 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") - private String ncharacterSet; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; - public Builder ncharacterSet(String ncharacterSet) { - this.ncharacterSet = ncharacterSet; - this.__explicitlySet__.add("ncharacterSet"); + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("pdbName") - private String pdbName; + @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") + private DbBackupConfig dbBackupConfig; - public Builder pdbName(String pdbName) { - this.pdbName = pdbName; - this.__explicitlySet__.add("pdbName"); + public Builder dbBackupConfig(DbBackupConfig dbBackupConfig) { + this.dbBackupConfig = dbBackupConfig; + this.__explicitlySet__.add("dbBackupConfig"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - private java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; - public Builder timeCreated(java.util.Date timeCreated) { - this.timeCreated = timeCreated; - this.__explicitlySet__.add("timeCreated"); + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } @@ -169,21 +164,21 @@ public Builder timeCreated(java.util.Date timeCreated) { public Database build() { Database __instance__ = new Database( - characterSet, + id, compartmentId, - dbBackupConfig, + characterSet, + ncharacterSet, dbHomeId, dbName, - dbUniqueName, + pdbName, dbWorkload, - definedTags, - freeformTags, - id, + dbUniqueName, lifecycleDetails, lifecycleState, - ncharacterSet, - pdbName, - timeCreated); + timeCreated, + dbBackupConfig, + freeformTags, + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -191,21 +186,21 @@ public Database build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Database o) { Builder copiedBuilder = - characterSet(o.getCharacterSet()) + id(o.getId()) .compartmentId(o.getCompartmentId()) - .dbBackupConfig(o.getDbBackupConfig()) + .characterSet(o.getCharacterSet()) + .ncharacterSet(o.getNcharacterSet()) .dbHomeId(o.getDbHomeId()) .dbName(o.getDbName()) - .dbUniqueName(o.getDbUniqueName()) + .pdbName(o.getPdbName()) .dbWorkload(o.getDbWorkload()) - .definedTags(o.getDefinedTags()) - .freeformTags(o.getFreeformTags()) - .id(o.getId()) + .dbUniqueName(o.getDbUniqueName()) .lifecycleDetails(o.getLifecycleDetails()) .lifecycleState(o.getLifecycleState()) - .ncharacterSet(o.getNcharacterSet()) - .pdbName(o.getPdbName()) - .timeCreated(o.getTimeCreated()); + .timeCreated(o.getTimeCreated()) + .dbBackupConfig(o.getDbBackupConfig()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -220,10 +215,10 @@ public static Builder builder() { } /** - * The character set for the database. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("characterSet") - String characterSet; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. @@ -231,8 +226,17 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; - @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") - DbBackupConfig dbBackupConfig; + /** + * The character set for the database. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("characterSet") + String characterSet; + + /** + * The national character set for the database. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") + String ncharacterSet; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home. @@ -247,11 +251,10 @@ public static Builder builder() { String dbName; /** - * A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed. - * + * The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") - String dbUniqueName; + @com.fasterxml.jackson.annotation.JsonProperty("pdbName") + String pdbName; /** * The database workload type. @@ -260,30 +263,11 @@ public static Builder builder() { String dbWorkload; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

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

- * Example: `{\"Department\": \"Finance\"}` + * A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") + String dbUniqueName; /** * Additional information about the current lifecycleState. @@ -349,22 +333,33 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The national character set for the database. + * The date and time the database was created. **/ - @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") - String ncharacterSet; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; + + @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") + DbBackupConfig dbBackupConfig; /** - * The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("pdbName") - String pdbName; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The date and time the database was created. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; @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/DatabaseSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DatabaseSummary.java index c8065a4ec5e..55f204add53 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 @@ -27,12 +27,12 @@ public class DatabaseSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("characterSet") - private String characterSet; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder characterSet(String characterSet) { - this.characterSet = characterSet; - this.__explicitlySet__.add("characterSet"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -45,12 +45,21 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") - private DbBackupConfig dbBackupConfig; + @com.fasterxml.jackson.annotation.JsonProperty("characterSet") + private String characterSet; - public Builder dbBackupConfig(DbBackupConfig dbBackupConfig) { - this.dbBackupConfig = dbBackupConfig; - this.__explicitlySet__.add("dbBackupConfig"); + public Builder characterSet(String characterSet) { + this.characterSet = characterSet; + this.__explicitlySet__.add("characterSet"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") + private String ncharacterSet; + + public Builder ncharacterSet(String ncharacterSet) { + this.ncharacterSet = ncharacterSet; + this.__explicitlySet__.add("ncharacterSet"); return this; } @@ -72,12 +81,12 @@ public Builder dbName(String dbName) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") - private String dbUniqueName; + @com.fasterxml.jackson.annotation.JsonProperty("pdbName") + private String pdbName; - public Builder dbUniqueName(String dbUniqueName) { - this.dbUniqueName = dbUniqueName; - this.__explicitlySet__.add("dbUniqueName"); + public Builder pdbName(String pdbName) { + this.pdbName = pdbName; + this.__explicitlySet__.add("pdbName"); return this; } @@ -90,31 +99,12 @@ public Builder dbWorkload(String dbWorkload) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; - - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; - - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") + private String dbUniqueName; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder dbUniqueName(String dbUniqueName) { + this.dbUniqueName = dbUniqueName; + this.__explicitlySet__.add("dbUniqueName"); return this; } @@ -136,30 +126,40 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") - private String ncharacterSet; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; - public Builder ncharacterSet(String ncharacterSet) { - this.ncharacterSet = ncharacterSet; - this.__explicitlySet__.add("ncharacterSet"); + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("pdbName") - private String pdbName; + @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") + private DbBackupConfig dbBackupConfig; - public Builder pdbName(String pdbName) { - this.pdbName = pdbName; - this.__explicitlySet__.add("pdbName"); + public Builder dbBackupConfig(DbBackupConfig dbBackupConfig) { + this.dbBackupConfig = dbBackupConfig; + this.__explicitlySet__.add("dbBackupConfig"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - private java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; - public Builder timeCreated(java.util.Date timeCreated) { - this.timeCreated = timeCreated; - this.__explicitlySet__.add("timeCreated"); + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } @@ -169,21 +169,21 @@ public Builder timeCreated(java.util.Date timeCreated) { public DatabaseSummary build() { DatabaseSummary __instance__ = new DatabaseSummary( - characterSet, + id, compartmentId, - dbBackupConfig, + characterSet, + ncharacterSet, dbHomeId, dbName, - dbUniqueName, + pdbName, dbWorkload, - definedTags, - freeformTags, - id, + dbUniqueName, lifecycleDetails, lifecycleState, - ncharacterSet, - pdbName, - timeCreated); + timeCreated, + dbBackupConfig, + freeformTags, + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -191,21 +191,21 @@ public DatabaseSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DatabaseSummary o) { Builder copiedBuilder = - characterSet(o.getCharacterSet()) + id(o.getId()) .compartmentId(o.getCompartmentId()) - .dbBackupConfig(o.getDbBackupConfig()) + .characterSet(o.getCharacterSet()) + .ncharacterSet(o.getNcharacterSet()) .dbHomeId(o.getDbHomeId()) .dbName(o.getDbName()) - .dbUniqueName(o.getDbUniqueName()) + .pdbName(o.getPdbName()) .dbWorkload(o.getDbWorkload()) - .definedTags(o.getDefinedTags()) - .freeformTags(o.getFreeformTags()) - .id(o.getId()) + .dbUniqueName(o.getDbUniqueName()) .lifecycleDetails(o.getLifecycleDetails()) .lifecycleState(o.getLifecycleState()) - .ncharacterSet(o.getNcharacterSet()) - .pdbName(o.getPdbName()) - .timeCreated(o.getTimeCreated()); + .timeCreated(o.getTimeCreated()) + .dbBackupConfig(o.getDbBackupConfig()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -220,10 +220,10 @@ public static Builder builder() { } /** - * The character set for the database. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database. **/ - @com.fasterxml.jackson.annotation.JsonProperty("characterSet") - String characterSet; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. @@ -231,8 +231,17 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; - @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") - DbBackupConfig dbBackupConfig; + /** + * The character set for the database. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("characterSet") + String characterSet; + + /** + * The national character set for the database. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") + String ncharacterSet; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home. @@ -247,11 +256,10 @@ public static Builder builder() { String dbName; /** - * A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed. - * + * The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") - String dbUniqueName; + @com.fasterxml.jackson.annotation.JsonProperty("pdbName") + String pdbName; /** * The database workload type. @@ -260,30 +268,11 @@ public static Builder builder() { String dbWorkload; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

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

- * Example: `{\"Department\": \"Finance\"}` + * A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("dbUniqueName") + String dbUniqueName; /** * Additional information about the current lifecycleState. @@ -349,22 +338,33 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The national character set for the database. + * The date and time the database was created. **/ - @com.fasterxml.jackson.annotation.JsonProperty("ncharacterSet") - String ncharacterSet; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; + + @com.fasterxml.jackson.annotation.JsonProperty("dbBackupConfig") + DbBackupConfig dbBackupConfig; /** - * The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of eight alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as database name. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Department\": \"Finance\"}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("pdbName") - String pdbName; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The date and time the database was created. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; @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/DbHome.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbHome.java index 12ee59fec6e..eac3e6e0b4b 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 @@ -4,15 +4,6 @@ package com.oracle.bmc.database.model; /** - * A directory where Oracle Database software is installed. A bare metal DB system can have multiple database homes - * and each database home can run a different supported version of Oracle Database. A virtual machine DB system can have only one database home. - * For more information, see [Bare Metal and Virtual Machine DB Systems](https://docs.us-phoenix-1.oraclecloud.com/Content/Database/Concepts/overview.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). - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -31,6 +22,15 @@ public class DbHome { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @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("compartmentId") private String compartmentId; @@ -40,24 +40,6 @@ public Builder compartmentId(String compartmentId) { return this; } - @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("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; @@ -67,15 +49,6 @@ public Builder displayName(String 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("lastPatchHistoryEntryId") private String lastPatchHistoryEntryId; @@ -94,6 +67,24 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } + @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("dbVersion") + private String dbVersion; + + public Builder dbVersion(String dbVersion) { + this.dbVersion = dbVersion; + this.__explicitlySet__.add("dbVersion"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") private java.util.Date timeCreated; @@ -109,13 +100,13 @@ public Builder timeCreated(java.util.Date timeCreated) { public DbHome build() { DbHome __instance__ = new DbHome( + id, compartmentId, - dbSystemId, - dbVersion, displayName, - id, lastPatchHistoryEntryId, lifecycleState, + dbSystemId, + dbVersion, timeCreated); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; @@ -124,13 +115,13 @@ public DbHome build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbHome o) { Builder copiedBuilder = - compartmentId(o.getCompartmentId()) - .dbSystemId(o.getDbSystemId()) - .dbVersion(o.getDbVersion()) + id(o.getId()) + .compartmentId(o.getCompartmentId()) .displayName(o.getDisplayName()) - .id(o.getId()) .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) .lifecycleState(o.getLifecycleState()) + .dbSystemId(o.getDbSystemId()) + .dbVersion(o.getDbVersion()) .timeCreated(o.getTimeCreated()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); @@ -146,22 +137,16 @@ public static Builder builder() { } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") - String compartmentId; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbSystemId") - String dbSystemId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** - * The Oracle Database version. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") - String dbVersion; + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; /** * The user-provided name for the database home. The name does not need to be unique. @@ -169,12 +154,6 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("displayName") String displayName; - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; - /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation is started. **/ @@ -236,6 +215,18 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbSystemId") + String dbSystemId; + + /** + * The Oracle Database version. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + String dbVersion; + /** * The date and time the database home was created. **/ 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 b39b098b14e..9862dca304a 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 @@ -31,6 +31,15 @@ public class DbHomeSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @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("compartmentId") private String compartmentId; @@ -40,24 +49,6 @@ public Builder compartmentId(String compartmentId) { return this; } - @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("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; @@ -67,15 +58,6 @@ public Builder displayName(String 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("lastPatchHistoryEntryId") private String lastPatchHistoryEntryId; @@ -94,6 +76,24 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } + @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("dbVersion") + private String dbVersion; + + public Builder dbVersion(String dbVersion) { + this.dbVersion = dbVersion; + this.__explicitlySet__.add("dbVersion"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") private java.util.Date timeCreated; @@ -109,13 +109,13 @@ public Builder timeCreated(java.util.Date timeCreated) { public DbHomeSummary build() { DbHomeSummary __instance__ = new DbHomeSummary( + id, compartmentId, - dbSystemId, - dbVersion, displayName, - id, lastPatchHistoryEntryId, lifecycleState, + dbSystemId, + dbVersion, timeCreated); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; @@ -124,13 +124,13 @@ public DbHomeSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbHomeSummary o) { Builder copiedBuilder = - compartmentId(o.getCompartmentId()) - .dbSystemId(o.getDbSystemId()) - .dbVersion(o.getDbVersion()) + id(o.getId()) + .compartmentId(o.getCompartmentId()) .displayName(o.getDisplayName()) - .id(o.getId()) .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) .lifecycleState(o.getLifecycleState()) + .dbSystemId(o.getDbSystemId()) + .dbVersion(o.getDbVersion()) .timeCreated(o.getTimeCreated()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); @@ -146,22 +146,16 @@ public static Builder builder() { } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") - String compartmentId; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbSystemId") - String dbSystemId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** - * The Oracle Database version. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") - String dbVersion; + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; /** * The user-provided name for the database home. The name does not need to be unique. @@ -169,12 +163,6 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("displayName") String displayName; - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database home. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; - /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation is started. **/ @@ -236,6 +224,18 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbSystemId") + String dbSystemId; + + /** + * The Oracle Database version. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("dbVersion") + String dbVersion; + /** * The date and time the database home was created. **/ 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 84952038e92..bf3db3e80f1 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 @@ -4,11 +4,6 @@ package com.oracle.bmc.database.model; /** - * A server where Oracle Database software is running. - *

- * 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). - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -27,12 +22,12 @@ public class DbNode { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("backupVnicId") - private String backupVnicId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder backupVnicId(String backupVnicId) { - this.backupVnicId = backupVnicId; - this.__explicitlySet__.add("backupVnicId"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -45,21 +40,21 @@ public Builder dbSystemId(String dbSystemId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - private String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("vnicId") + private String vnicId; - public Builder hostname(String hostname) { - this.hostname = hostname; - this.__explicitlySet__.add("hostname"); + public Builder vnicId(String vnicId) { + this.vnicId = vnicId; + this.__explicitlySet__.add("vnicId"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("backupVnicId") + private String backupVnicId; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder backupVnicId(String backupVnicId) { + this.backupVnicId = backupVnicId; + this.__explicitlySet__.add("backupVnicId"); return this; } @@ -72,12 +67,12 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("softwareStorageSizeInGB") - private Integer softwareStorageSizeInGB; + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + private String hostname; - public Builder softwareStorageSizeInGB(Integer softwareStorageSizeInGB) { - this.softwareStorageSizeInGB = softwareStorageSizeInGB; - this.__explicitlySet__.add("softwareStorageSizeInGB"); + public Builder hostname(String hostname) { + this.hostname = hostname; + this.__explicitlySet__.add("hostname"); return this; } @@ -90,12 +85,12 @@ public Builder timeCreated(java.util.Date timeCreated) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("vnicId") - private String vnicId; + @com.fasterxml.jackson.annotation.JsonProperty("softwareStorageSizeInGB") + private Integer softwareStorageSizeInGB; - public Builder vnicId(String vnicId) { - this.vnicId = vnicId; - this.__explicitlySet__.add("vnicId"); + public Builder softwareStorageSizeInGB(Integer softwareStorageSizeInGB) { + this.softwareStorageSizeInGB = softwareStorageSizeInGB; + this.__explicitlySet__.add("softwareStorageSizeInGB"); return this; } @@ -105,14 +100,14 @@ public Builder vnicId(String vnicId) { public DbNode build() { DbNode __instance__ = new DbNode( - backupVnicId, - dbSystemId, - hostname, id, + dbSystemId, + vnicId, + backupVnicId, lifecycleState, - softwareStorageSizeInGB, + hostname, timeCreated, - vnicId); + softwareStorageSizeInGB); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -120,14 +115,14 @@ public DbNode build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbNode o) { Builder copiedBuilder = - backupVnicId(o.getBackupVnicId()) + id(o.getId()) .dbSystemId(o.getDbSystemId()) - .hostname(o.getHostname()) - .id(o.getId()) + .vnicId(o.getVnicId()) + .backupVnicId(o.getBackupVnicId()) .lifecycleState(o.getLifecycleState()) - .softwareStorageSizeInGB(o.getSoftwareStorageSizeInGB()) + .hostname(o.getHostname()) .timeCreated(o.getTimeCreated()) - .vnicId(o.getVnicId()); + .softwareStorageSizeInGB(o.getSoftwareStorageSizeInGB()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -142,10 +137,10 @@ public static Builder builder() { } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup VNIC. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database node. **/ - @com.fasterxml.jackson.annotation.JsonProperty("backupVnicId") - String backupVnicId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. @@ -154,16 +149,16 @@ public static Builder builder() { String dbSystemId; /** - * The host name for the database node. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the VNIC. **/ - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("vnicId") + String vnicId; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database node. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup VNIC. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("backupVnicId") + String backupVnicId; /** * The current state of the database node. **/ @@ -224,11 +219,10 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The size (in GB) of the block storage volume allocation for the DB system. This attribute applies only for virtual machine DB systems. - * + * The host name for the database node. **/ - @com.fasterxml.jackson.annotation.JsonProperty("softwareStorageSizeInGB") - Integer softwareStorageSizeInGB; + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + String hostname; /** * The date and time that the database node was created. @@ -237,10 +231,11 @@ public static LifecycleState create(String key) { java.util.Date timeCreated; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the VNIC. + * The size (in GB) of the block storage volume allocation for the DB system. This attribute applies only for virtual machine DB systems. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("vnicId") - String vnicId; + @com.fasterxml.jackson.annotation.JsonProperty("softwareStorageSizeInGB") + Integer softwareStorageSizeInGB; @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/DbNodeSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbNodeSummary.java index 5918e24490a..b8774eed327 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 @@ -27,12 +27,12 @@ public class DbNodeSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("backupVnicId") - private String backupVnicId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder backupVnicId(String backupVnicId) { - this.backupVnicId = backupVnicId; - this.__explicitlySet__.add("backupVnicId"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -45,21 +45,21 @@ public Builder dbSystemId(String dbSystemId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - private String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("vnicId") + private String vnicId; - public Builder hostname(String hostname) { - this.hostname = hostname; - this.__explicitlySet__.add("hostname"); + public Builder vnicId(String vnicId) { + this.vnicId = vnicId; + this.__explicitlySet__.add("vnicId"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("backupVnicId") + private String backupVnicId; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder backupVnicId(String backupVnicId) { + this.backupVnicId = backupVnicId; + this.__explicitlySet__.add("backupVnicId"); return this; } @@ -72,12 +72,12 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("softwareStorageSizeInGB") - private Integer softwareStorageSizeInGB; + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + private String hostname; - public Builder softwareStorageSizeInGB(Integer softwareStorageSizeInGB) { - this.softwareStorageSizeInGB = softwareStorageSizeInGB; - this.__explicitlySet__.add("softwareStorageSizeInGB"); + public Builder hostname(String hostname) { + this.hostname = hostname; + this.__explicitlySet__.add("hostname"); return this; } @@ -90,12 +90,12 @@ public Builder timeCreated(java.util.Date timeCreated) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("vnicId") - private String vnicId; + @com.fasterxml.jackson.annotation.JsonProperty("softwareStorageSizeInGB") + private Integer softwareStorageSizeInGB; - public Builder vnicId(String vnicId) { - this.vnicId = vnicId; - this.__explicitlySet__.add("vnicId"); + public Builder softwareStorageSizeInGB(Integer softwareStorageSizeInGB) { + this.softwareStorageSizeInGB = softwareStorageSizeInGB; + this.__explicitlySet__.add("softwareStorageSizeInGB"); return this; } @@ -105,14 +105,14 @@ public Builder vnicId(String vnicId) { public DbNodeSummary build() { DbNodeSummary __instance__ = new DbNodeSummary( - backupVnicId, - dbSystemId, - hostname, id, + dbSystemId, + vnicId, + backupVnicId, lifecycleState, - softwareStorageSizeInGB, + hostname, timeCreated, - vnicId); + softwareStorageSizeInGB); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -120,14 +120,14 @@ public DbNodeSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbNodeSummary o) { Builder copiedBuilder = - backupVnicId(o.getBackupVnicId()) + id(o.getId()) .dbSystemId(o.getDbSystemId()) - .hostname(o.getHostname()) - .id(o.getId()) + .vnicId(o.getVnicId()) + .backupVnicId(o.getBackupVnicId()) .lifecycleState(o.getLifecycleState()) - .softwareStorageSizeInGB(o.getSoftwareStorageSizeInGB()) + .hostname(o.getHostname()) .timeCreated(o.getTimeCreated()) - .vnicId(o.getVnicId()); + .softwareStorageSizeInGB(o.getSoftwareStorageSizeInGB()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -142,10 +142,10 @@ public static Builder builder() { } /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup VNIC. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database node. **/ - @com.fasterxml.jackson.annotation.JsonProperty("backupVnicId") - String backupVnicId; + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. @@ -154,16 +154,16 @@ public static Builder builder() { String dbSystemId; /** - * The host name for the database node. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the VNIC. **/ - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("vnicId") + String vnicId; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the database node. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup VNIC. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("backupVnicId") + String backupVnicId; /** * The current state of the database node. **/ @@ -224,11 +224,10 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The size (in GB) of the block storage volume allocation for the DB system. This attribute applies only for virtual machine DB systems. - * + * The host name for the database node. **/ - @com.fasterxml.jackson.annotation.JsonProperty("softwareStorageSizeInGB") - Integer softwareStorageSizeInGB; + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + String hostname; /** * The date and time that the database node was created. @@ -237,10 +236,11 @@ public static LifecycleState create(String key) { java.util.Date timeCreated; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the VNIC. + * The size (in GB) of the block storage volume allocation for the DB system. This attribute applies only for virtual machine DB systems. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("vnicId") - String vnicId; + @com.fasterxml.jackson.annotation.JsonProperty("softwareStorageSizeInGB") + Integer softwareStorageSizeInGB; @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/DbSystem.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystem.java index 2ce4c17e1ba..3c98ee76614 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 @@ -4,23 +4,6 @@ package com.oracle.bmc.database.model; /** - * The Database Service supports several types of DB systems, ranging in size, price, and performance. For details about each type of system, see: - *

- * - [Exadata DB Systems](https://docs.us-phoenix-1.oraclecloud.com/Content/Database/Concepts/exaoverview.htm) - * - [Bare Metal and Virtual Machine DB Systems](https://docs.us-phoenix-1.oraclecloud.com/Content/Database/Concepts/overview.htm) - *

- * To use any of the API operations, you must be authorized in an IAM policy. If you are not authorized, talk to an administrator. If you are 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). - * - * For information about access control and compartments, see - * [Overview of the Identity Service](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/overview.htm). - *

- * For information about availability domains, see - * [Regions and Availability Domains](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/regions.htm). - *

- * To get a list of availability domains, use the `ListAvailabilityDomains` operation - * in the Identity Service API. - *

- **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -39,30 +22,12 @@ public class DbSystem { @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("backupSubnetId") - private String backupSubnetId; - - public Builder backupSubnetId(String backupSubnetId) { - this.backupSubnetId = backupSubnetId; - this.__explicitlySet__.add("backupSubnetId"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("clusterName") - private String clusterName; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder clusterName(String clusterName) { - this.clusterName = clusterName; - this.__explicitlySet__.add("clusterName"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -75,67 +40,66 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") - private Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; - public Builder cpuCoreCount(Integer cpuCoreCount) { - this.cpuCoreCount = cpuCoreCount; - this.__explicitlySet__.add("cpuCoreCount"); + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") - private Integer dataStoragePercentage; + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + private String availabilityDomain; - public Builder dataStoragePercentage(Integer dataStoragePercentage) { - this.dataStoragePercentage = dataStoragePercentage; - this.__explicitlySet__.add("dataStoragePercentage"); + public Builder availabilityDomain(String availabilityDomain) { + this.availabilityDomain = availabilityDomain; + this.__explicitlySet__.add("availabilityDomain"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") - private Integer dataStorageSizeInGBs; + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private String subnetId; - public Builder dataStorageSizeInGBs(Integer dataStorageSizeInGBs) { - this.dataStorageSizeInGBs = dataStorageSizeInGBs; - this.__explicitlySet__.add("dataStorageSizeInGBs"); + public Builder subnetId(String subnetId) { + this.subnetId = subnetId; + this.__explicitlySet__.add("subnetId"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - private DatabaseEdition databaseEdition; + @com.fasterxml.jackson.annotation.JsonProperty("backupSubnetId") + private String backupSubnetId; - public Builder databaseEdition(DatabaseEdition databaseEdition) { - this.databaseEdition = databaseEdition; - this.__explicitlySet__.add("databaseEdition"); + public Builder backupSubnetId(String backupSubnetId) { + this.backupSubnetId = backupSubnetId; + this.__explicitlySet__.add("backupSubnetId"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + private String shape; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder shape(String shape) { + this.shape = shape; + this.__explicitlySet__.add("shape"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") - private DiskRedundancy diskRedundancy; + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + private java.util.List sshPublicKeys; - public Builder diskRedundancy(DiskRedundancy diskRedundancy) { - this.diskRedundancy = diskRedundancy; - this.__explicitlySet__.add("diskRedundancy"); + public Builder sshPublicKeys(java.util.List sshPublicKeys) { + this.sshPublicKeys = sshPublicKeys; + this.__explicitlySet__.add("sshPublicKeys"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - private String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + private String hostname; - public Builder displayName(String displayName) { - this.displayName = displayName; - this.__explicitlySet__.add("displayName"); + public Builder hostname(String hostname) { + this.hostname = hostname; + this.__explicitlySet__.add("hostname"); return this; } @@ -148,30 +112,48 @@ public Builder domain(String domain) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("version") + private String version; - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); + public Builder version(String version) { + this.version = version; + this.__explicitlySet__.add("version"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - private String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") + private Integer cpuCoreCount; - public Builder hostname(String hostname) { - this.hostname = hostname; - this.__explicitlySet__.add("hostname"); + public Builder cpuCoreCount(Integer cpuCoreCount) { + this.cpuCoreCount = cpuCoreCount; + this.__explicitlySet__.add("cpuCoreCount"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("clusterName") + private String clusterName; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder clusterName(String clusterName) { + this.clusterName = clusterName; + this.__explicitlySet__.add("clusterName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") + private Integer dataStoragePercentage; + + public Builder dataStoragePercentage(Integer dataStoragePercentage) { + this.dataStoragePercentage = dataStoragePercentage; + this.__explicitlySet__.add("dataStoragePercentage"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + private DatabaseEdition databaseEdition; + + public Builder databaseEdition(DatabaseEdition databaseEdition) { + this.databaseEdition = databaseEdition; + this.__explicitlySet__.add("databaseEdition"); return this; } @@ -184,21 +166,12 @@ public Builder lastPatchHistoryEntryId(String lastPatchHistoryEntryId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") - private LicenseModel licenseModel; - - public Builder licenseModel(LicenseModel licenseModel) { - this.licenseModel = licenseModel; - this.__explicitlySet__.add("licenseModel"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("listenerPort") + private Integer listenerPort; - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); + public Builder listenerPort(Integer listenerPort) { + this.listenerPort = listenerPort; + this.__explicitlySet__.add("listenerPort"); return this; } @@ -211,39 +184,39 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("listenerPort") - private Integer listenerPort; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; - public Builder listenerPort(Integer listenerPort) { - this.listenerPort = listenerPort; - this.__explicitlySet__.add("listenerPort"); + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("nodeCount") - private Integer nodeCount; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder nodeCount(Integer nodeCount) { - this.nodeCount = nodeCount; - this.__explicitlySet__.add("nodeCount"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("recoStorageSizeInGB") - private Integer recoStorageSizeInGB; + @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") + private DiskRedundancy diskRedundancy; - public Builder recoStorageSizeInGB(Integer recoStorageSizeInGB) { - this.recoStorageSizeInGB = recoStorageSizeInGB; - this.__explicitlySet__.add("recoStorageSizeInGB"); + public Builder diskRedundancy(DiskRedundancy diskRedundancy) { + this.diskRedundancy = diskRedundancy; + this.__explicitlySet__.add("diskRedundancy"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("scanDnsRecordId") - private String scanDnsRecordId; + @com.fasterxml.jackson.annotation.JsonProperty("sparseDiskgroup") + private Boolean sparseDiskgroup; - public Builder scanDnsRecordId(String scanDnsRecordId) { - this.scanDnsRecordId = scanDnsRecordId; - this.__explicitlySet__.add("scanDnsRecordId"); + public Builder sparseDiskgroup(Boolean sparseDiskgroup) { + this.sparseDiskgroup = sparseDiskgroup; + this.__explicitlySet__.add("sparseDiskgroup"); return this; } @@ -256,57 +229,76 @@ public Builder scanIpIds(java.util.List scanIpIds) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("shape") - private String shape; + @com.fasterxml.jackson.annotation.JsonProperty("vipIds") + private java.util.List vipIds; - public Builder shape(String shape) { - this.shape = shape; - this.__explicitlySet__.add("shape"); + public Builder vipIds(java.util.List vipIds) { + this.vipIds = vipIds; + this.__explicitlySet__.add("vipIds"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - private java.util.List sshPublicKeys; + @com.fasterxml.jackson.annotation.JsonProperty("scanDnsRecordId") + private String scanDnsRecordId; - public Builder sshPublicKeys(java.util.List sshPublicKeys) { - this.sshPublicKeys = sshPublicKeys; - this.__explicitlySet__.add("sshPublicKeys"); + public Builder scanDnsRecordId(String scanDnsRecordId) { + this.scanDnsRecordId = scanDnsRecordId; + this.__explicitlySet__.add("scanDnsRecordId"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("subnetId") - private String subnetId; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") + private Integer dataStorageSizeInGBs; - public Builder subnetId(String subnetId) { - this.subnetId = subnetId; - this.__explicitlySet__.add("subnetId"); + public Builder dataStorageSizeInGBs(Integer dataStorageSizeInGBs) { + this.dataStorageSizeInGBs = dataStorageSizeInGBs; + this.__explicitlySet__.add("dataStorageSizeInGBs"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - private java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("recoStorageSizeInGB") + private Integer recoStorageSizeInGB; - public Builder timeCreated(java.util.Date timeCreated) { - this.timeCreated = timeCreated; - this.__explicitlySet__.add("timeCreated"); + public Builder recoStorageSizeInGB(Integer recoStorageSizeInGB) { + this.recoStorageSizeInGB = recoStorageSizeInGB; + this.__explicitlySet__.add("recoStorageSizeInGB"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("version") - private String version; + @com.fasterxml.jackson.annotation.JsonProperty("nodeCount") + private Integer nodeCount; - public Builder version(String version) { - this.version = version; - this.__explicitlySet__.add("version"); + public Builder nodeCount(Integer nodeCount) { + this.nodeCount = nodeCount; + this.__explicitlySet__.add("nodeCount"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("vipIds") - private java.util.List vipIds; + @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") + private LicenseModel licenseModel; - public Builder vipIds(java.util.List vipIds) { - this.vipIds = vipIds; - this.__explicitlySet__.add("vipIds"); + public Builder licenseModel(LicenseModel licenseModel) { + this.licenseModel = licenseModel; + this.__explicitlySet__.add("licenseModel"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } @@ -316,36 +308,37 @@ public Builder vipIds(java.util.List vipIds) { public DbSystem build() { DbSystem __instance__ = new DbSystem( + id, + compartmentId, + displayName, availabilityDomain, + subnetId, backupSubnetId, - clusterName, - compartmentId, + shape, + sshPublicKeys, + hostname, + domain, + version, cpuCoreCount, + clusterName, dataStoragePercentage, - dataStorageSizeInGBs, databaseEdition, - definedTags, - diskRedundancy, - displayName, - domain, - freeformTags, - hostname, - id, lastPatchHistoryEntryId, - licenseModel, - lifecycleDetails, - lifecycleState, listenerPort, - nodeCount, - recoStorageSizeInGB, - scanDnsRecordId, - scanIpIds, - shape, - sshPublicKeys, - subnetId, + lifecycleState, timeCreated, - version, - vipIds); + lifecycleDetails, + diskRedundancy, + sparseDiskgroup, + scanIpIds, + vipIds, + scanDnsRecordId, + dataStorageSizeInGBs, + recoStorageSizeInGB, + nodeCount, + licenseModel, + freeformTags, + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -353,36 +346,37 @@ public DbSystem build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbSystem o) { Builder copiedBuilder = - availabilityDomain(o.getAvailabilityDomain()) - .backupSubnetId(o.getBackupSubnetId()) - .clusterName(o.getClusterName()) + id(o.getId()) .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .availabilityDomain(o.getAvailabilityDomain()) + .subnetId(o.getSubnetId()) + .backupSubnetId(o.getBackupSubnetId()) + .shape(o.getShape()) + .sshPublicKeys(o.getSshPublicKeys()) + .hostname(o.getHostname()) + .domain(o.getDomain()) + .version(o.getVersion()) .cpuCoreCount(o.getCpuCoreCount()) + .clusterName(o.getClusterName()) .dataStoragePercentage(o.getDataStoragePercentage()) - .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) .databaseEdition(o.getDatabaseEdition()) - .definedTags(o.getDefinedTags()) - .diskRedundancy(o.getDiskRedundancy()) - .displayName(o.getDisplayName()) - .domain(o.getDomain()) - .freeformTags(o.getFreeformTags()) - .hostname(o.getHostname()) - .id(o.getId()) .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) - .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()) + .lifecycleState(o.getLifecycleState()) .timeCreated(o.getTimeCreated()) - .version(o.getVersion()) - .vipIds(o.getVipIds()); + .lifecycleDetails(o.getLifecycleDetails()) + .diskRedundancy(o.getDiskRedundancy()) + .sparseDiskgroup(o.getSparseDiskgroup()) + .scanIpIds(o.getScanIpIds()) + .vipIds(o.getVipIds()) + .scanDnsRecordId(o.getScanDnsRecordId()) + .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) + .recoStorageSizeInGB(o.getRecoStorageSizeInGB()) + .nodeCount(o.getNodeCount()) + .licenseModel(o.getLicenseModel()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -396,12 +390,45 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; + + /** + * The user-friendly name for the DB system. The name does not have to be unique. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + /** * The name of the availability domain that the DB system is located in. **/ @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") String availabilityDomain; + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the subnet the DB system is associated with. + *

+ **Subnet Restrictions:** + * - For bare metal DB systems and for single node virtual machine DB systems, do not use a subnet that overlaps with 192.168.16.16/28. + * - For Exadata and virtual machine 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.128.0/20. + *

+ * These subnets are used by the Oracle Clusterware private interconnect on the database instance. + * Specifying an overlapping subnet will cause the private interconnect to malfunction. + * This restriction applies to both the client subnet and backup subnet. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + String subnetId; + /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup network subnet the DB system is associated with. Applicable only to Exadata DB systems. *

@@ -412,17 +439,37 @@ public static Builder builder() { String backupSubnetId; /** - * The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster name must begin with an an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The cluster name can be no longer than 11 characters and is not case sensitive. + * The shape of the DB system. The shape determines resources to allocate to the DB system. + * - For virtual machine shapes, the number of CPU cores and memory + * - For bare metal and Exadata shapes, the number of CPU cores, storage, and memory * **/ - @com.fasterxml.jackson.annotation.JsonProperty("clusterName") - String clusterName; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + String shape; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. + * The public key portion of one or more key pairs used for SSH access to the DB system. **/ - @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") - String compartmentId; + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + java.util.List sshPublicKeys; + + /** + * The hostname for the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + String hostname; + + /** + * The domain name for the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("domain") + String domain; + + /** + * The Oracle Database version of the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("version") + String version; /** * The number of CPU cores enabled on the DB system. @@ -430,6 +477,13 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") Integer cpuCoreCount; + /** + * The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster name must begin with an an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The cluster name can be no longer than 11 characters and is not case sensitive. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("clusterName") + String clusterName; + /** * The percentage assigned to DATA storage (user data and database files). * The remaining percentage is assigned to RECO storage (database redo logs, archive logs, and recovery manager backups). Accepted values are 40 and 80. The default is 80 percent assigned to DATA storage. Not applicable for virtual machine DB systems. @@ -437,23 +491,84 @@ public static Builder builder() { **/ @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") Integer dataStoragePercentage; + /** + * The Oracle Database edition that applies to all the databases on the DB system. + * + **/ + @lombok.extern.slf4j.Slf4j + public enum DatabaseEdition { + StandardEdition("STANDARD_EDITION"), + EnterpriseEdition("ENTERPRISE_EDITION"), + EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), + EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), + + /** + * 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 (DatabaseEdition v : DatabaseEdition.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + DatabaseEdition(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static DatabaseEdition create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'DatabaseEdition', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; /** - * The data storage size, in gigabytes, that is currently available to the DB system. Applies only for virtual machine DB systems. + * The Oracle Database edition that applies to all the databases on the DB system. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") - Integer dataStorageSizeInGBs; + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + DatabaseEdition databaseEdition; + + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation starts. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lastPatchHistoryEntryId") + String lastPatchHistoryEntryId; + + /** + * The port number configured for the listener on the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("listenerPort") + Integer listenerPort; /** - * The Oracle Database edition that applies to all the databases on the DB system. - * + * The current state of the DB system. **/ @lombok.extern.slf4j.Slf4j - public enum DatabaseEdition { - StandardEdition("STANDARD_EDITION"), - EnterpriseEdition("ENTERPRISE_EDITION"), - EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), - EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), + public enum LifecycleState { + Provisioning("PROVISIONING"), + Available("AVAILABLE"), + Updating("UPDATING"), + Terminating("TERMINATING"), + Terminated("TERMINATED"), + Failed("FAILED"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -462,18 +577,18 @@ public enum DatabaseEdition { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (DatabaseEdition v : DatabaseEdition.values()) { + for (LifecycleState v : LifecycleState.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - DatabaseEdition(String value) { + LifecycleState(String value) { this.value = value; } @@ -483,32 +598,33 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static DatabaseEdition create(String key) { + public static LifecycleState create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'DatabaseEdition', returning UnknownEnumValue", + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * The Oracle Database edition that applies to all the databases on the DB system. - * + * The current state of the DB system. **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - DatabaseEdition databaseEdition; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * + * The date and time the DB system was created. **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; + + /** + * Additional information about the current lifecycleState. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** * The type of redundancy configured for the DB system. * NORMAL is 2-way redundancy. @@ -568,44 +684,61 @@ public static DiskRedundancy create(String key) { DiskRedundancy diskRedundancy; /** - * The user-friendly name for the DB system. The name does not have to be unique. + * True, if Sparse Diskgroup is configured for Exadata dbsystem, False, if Sparse diskgroup was not configured. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("sparseDiskgroup") + Boolean sparseDiskgroup; /** - * The domain name for the DB system. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Single Client Access Name (SCAN) IP addresses associated with the DB system. + * SCAN IP addresses are typically used for load balancing and are not assigned to any interface. + * Oracle Clusterware directs the requests to the appropriate nodes in the cluster. + *

+ **Note:** For a single-node DB system, this list is empty. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("domain") - String domain; + @com.fasterxml.jackson.annotation.JsonProperty("scanIpIds") + java.util.List scanIpIds; /** - * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the virtual IP (VIP) addresses associated with the DB system. + * The Cluster Ready Services (CRS) creates and maintains one VIP address for each node in the DB system to + * enable failover. If one node fails, the VIP is reassigned to another active node in the cluster. *

- * Example: `{\"Department\": \"Finance\"}` + **Note:** For a single-node DB system, this list is empty. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("vipIds") + java.util.List vipIds; /** - * The hostname for the DB system. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DNS record for the SCAN IP addresses that are associated with the DB system. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("scanDnsRecordId") + String scanDnsRecordId; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. + * The data storage size, in gigabytes, that is currently available to the DB system. Applies only for virtual machine DB systems. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") + Integer dataStorageSizeInGBs; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation starts. + * The RECO/REDO storage size, in gigabytes, that is currently allocated to the DB system. Applies only for virtual machine DB systems. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("lastPatchHistoryEntryId") - String lastPatchHistoryEntryId; + @com.fasterxml.jackson.annotation.JsonProperty("recoStorageSizeInGB") + Integer recoStorageSizeInGB; + + /** + * The number of nodes in the DB system. For RAC DB systems, the value is greater than 1. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("nodeCount") + Integer nodeCount; /** * The Oracle license model that applies to all the databases on the DB system. The default is LICENSE_INCLUDED. * @@ -661,156 +794,24 @@ public static LicenseModel create(String key) { LicenseModel licenseModel; /** - * Additional information about the current lifecycleState. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; - /** - * The current state of the DB system. - **/ - @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Provisioning("PROVISIONING"), - Available("AVAILABLE"), - Updating("UPDATING"), - Terminating("TERMINATING"), - Terminated("TERMINATED"), - Failed("FAILED"), - - /** - * 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 DB system. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; - - /** - * The port number configured for the listener on the DB system. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("listenerPort") - Integer listenerPort; - - /** - * The number of nodes in the DB system. For RAC DB systems, the value is greater than 1. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("nodeCount") - Integer nodeCount; - - /** - * The RECO/REDO storage size, in gigabytes, that is currently allocated to the DB system. Applies only for virtual machine DB systems. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("recoStorageSizeInGB") - Integer recoStorageSizeInGB; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DNS record for the SCAN IP addresses that are associated with the DB system. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("scanDnsRecordId") - String scanDnsRecordId; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Single Client Access Name (SCAN) IP addresses associated with the DB system. - * SCAN IP addresses are typically used for load balancing and are not assigned to any interface. - * Oracle Clusterware directs the requests to the appropriate nodes in the cluster. - *

- **Note:** For a single-node DB system, this list is empty. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("scanIpIds") - java.util.List scanIpIds; - - /** - * The shape of the DB system. The shape determines resources to allocate to the DB system. - * - For virtual machine shapes, the number of CPU cores and memory - * - For bare metal and Exadata shapes, the number of CPU cores, storage, and memory - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("shape") - String shape; - - /** - * The public key portion of one or more key pairs used for SSH access to the DB system. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - java.util.List sshPublicKeys; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the subnet the DB system is associated with. - *

- **Subnet Restrictions:** - * - For bare metal DB systems and for single node virtual machine DB systems, do not use a subnet that overlaps with 192.168.16.16/28. - * - For Exadata and virtual machine 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.128.0/20. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). *

- * These subnets are used by the Oracle Clusterware private interconnect on the database instance. - * Specifying an overlapping subnet will cause the private interconnect to malfunction. - * This restriction applies to both the client subnet and backup subnet. + * Example: `{\"Department\": \"Finance\"}` * **/ - @com.fasterxml.jackson.annotation.JsonProperty("subnetId") - String subnetId; - - /** - * The date and time the DB system was created. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; - - /** - * The Oracle Database version of the DB system. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("version") - String version; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the virtual IP (VIP) addresses associated with the DB system. - * The Cluster Ready Services (CRS) creates and maintains one VIP address for each node in the DB system to - * enable failover. If one node fails, the VIP is reassigned to another active node in the cluster. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). *

- **Note:** For a single-node DB system, this list is empty. + * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` * **/ - @com.fasterxml.jackson.annotation.JsonProperty("vipIds") - java.util.List vipIds; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; @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/DbSystemShapeSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemShapeSummary.java index f4f6b6b2f30..dcbddfc0f2e 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 @@ -29,30 +29,30 @@ public class DbSystemShapeSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("availableCoreCount") - private Integer availableCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("name") + private String name; - public Builder availableCoreCount(Integer availableCoreCount) { - this.availableCoreCount = availableCoreCount; - this.__explicitlySet__.add("availableCoreCount"); + public Builder name(String name) { + this.name = name; + this.__explicitlySet__.add("name"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("coreCountIncrement") - private Integer coreCountIncrement; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + private String shape; - public Builder coreCountIncrement(Integer coreCountIncrement) { - this.coreCountIncrement = coreCountIncrement; - this.__explicitlySet__.add("coreCountIncrement"); + public Builder shape(String shape) { + this.shape = shape; + this.__explicitlySet__.add("shape"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("maximumNodeCount") - private Integer maximumNodeCount; + @com.fasterxml.jackson.annotation.JsonProperty("availableCoreCount") + private Integer availableCoreCount; - public Builder maximumNodeCount(Integer maximumNodeCount) { - this.maximumNodeCount = maximumNodeCount; - this.__explicitlySet__.add("maximumNodeCount"); + public Builder availableCoreCount(Integer availableCoreCount) { + this.availableCoreCount = availableCoreCount; + this.__explicitlySet__.add("availableCoreCount"); return this; } @@ -65,6 +65,15 @@ public Builder minimumCoreCount(Integer minimumCoreCount) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("coreCountIncrement") + private Integer coreCountIncrement; + + public Builder coreCountIncrement(Integer coreCountIncrement) { + this.coreCountIncrement = coreCountIncrement; + this.__explicitlySet__.add("coreCountIncrement"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("minimumNodeCount") private Integer minimumNodeCount; @@ -74,21 +83,12 @@ public Builder minimumNodeCount(Integer minimumNodeCount) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("name") - private String name; - - public Builder name(String name) { - this.name = name; - this.__explicitlySet__.add("name"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("shape") - private String shape; + @com.fasterxml.jackson.annotation.JsonProperty("maximumNodeCount") + private Integer maximumNodeCount; - public Builder shape(String shape) { - this.shape = shape; - this.__explicitlySet__.add("shape"); + public Builder maximumNodeCount(Integer maximumNodeCount) { + this.maximumNodeCount = maximumNodeCount; + this.__explicitlySet__.add("maximumNodeCount"); return this; } @@ -98,13 +98,13 @@ public Builder shape(String shape) { public DbSystemShapeSummary build() { DbSystemShapeSummary __instance__ = new DbSystemShapeSummary( + name, + shape, availableCoreCount, - coreCountIncrement, - maximumNodeCount, minimumCoreCount, + coreCountIncrement, minimumNodeCount, - name, - shape); + maximumNodeCount); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -112,13 +112,13 @@ public DbSystemShapeSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbSystemShapeSummary o) { Builder copiedBuilder = - availableCoreCount(o.getAvailableCoreCount()) - .coreCountIncrement(o.getCoreCountIncrement()) - .maximumNodeCount(o.getMaximumNodeCount()) + name(o.getName()) + .shape(o.getShape()) + .availableCoreCount(o.getAvailableCoreCount()) .minimumCoreCount(o.getMinimumCoreCount()) + .coreCountIncrement(o.getCoreCountIncrement()) .minimumNodeCount(o.getMinimumNodeCount()) - .name(o.getName()) - .shape(o.getShape()); + .maximumNodeCount(o.getMaximumNodeCount()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -133,22 +133,22 @@ public static Builder builder() { } /** - * The maximum number of CPU cores that can be enabled on the DB system for this shape. + * The name of the shape used for the DB system. **/ - @com.fasterxml.jackson.annotation.JsonProperty("availableCoreCount") - Integer availableCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("name") + String name; /** - * The discrete number by which the CPU core count for this shape can be increased or decreased. + * Deprecated. Use `name` instead of `shape`. **/ - @com.fasterxml.jackson.annotation.JsonProperty("coreCountIncrement") - Integer coreCountIncrement; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + String shape; /** - * The maximum number of database nodes available for this shape. + * The maximum number of CPU cores that can be enabled on the DB system for this shape. **/ - @com.fasterxml.jackson.annotation.JsonProperty("maximumNodeCount") - Integer maximumNodeCount; + @com.fasterxml.jackson.annotation.JsonProperty("availableCoreCount") + Integer availableCoreCount; /** * The minimum number of CPU cores that can be enabled on the DB system for this shape. @@ -157,22 +157,22 @@ public static Builder builder() { Integer minimumCoreCount; /** - * The minimum number of database nodes available for this shape. + * The discrete number by which the CPU core count for this shape can be increased or decreased. **/ - @com.fasterxml.jackson.annotation.JsonProperty("minimumNodeCount") - Integer minimumNodeCount; + @com.fasterxml.jackson.annotation.JsonProperty("coreCountIncrement") + Integer coreCountIncrement; /** - * The name of the shape used for the DB system. + * The minimum number of database nodes available for this shape. **/ - @com.fasterxml.jackson.annotation.JsonProperty("name") - String name; + @com.fasterxml.jackson.annotation.JsonProperty("minimumNodeCount") + Integer minimumNodeCount; /** - * Deprecated. Use `name` instead of `shape`. + * The maximum number of database nodes available for this shape. **/ - @com.fasterxml.jackson.annotation.JsonProperty("shape") - String shape; + @com.fasterxml.jackson.annotation.JsonProperty("maximumNodeCount") + Integer maximumNodeCount; @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/DbSystemSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbSystemSummary.java index bda31c40cd2..2c29bfa270b 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 @@ -39,30 +39,12 @@ public class DbSystemSummary { @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("backupSubnetId") - private String backupSubnetId; - - public Builder backupSubnetId(String backupSubnetId) { - this.backupSubnetId = backupSubnetId; - this.__explicitlySet__.add("backupSubnetId"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("clusterName") - private String clusterName; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder clusterName(String clusterName) { - this.clusterName = clusterName; - this.__explicitlySet__.add("clusterName"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -75,67 +57,66 @@ public Builder compartmentId(String compartmentId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") - private Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; - public Builder cpuCoreCount(Integer cpuCoreCount) { - this.cpuCoreCount = cpuCoreCount; - this.__explicitlySet__.add("cpuCoreCount"); + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") - private Integer dataStoragePercentage; + @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") + private String availabilityDomain; - public Builder dataStoragePercentage(Integer dataStoragePercentage) { - this.dataStoragePercentage = dataStoragePercentage; - this.__explicitlySet__.add("dataStoragePercentage"); + public Builder availabilityDomain(String availabilityDomain) { + this.availabilityDomain = availabilityDomain; + this.__explicitlySet__.add("availabilityDomain"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") - private Integer dataStorageSizeInGBs; + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private String subnetId; - public Builder dataStorageSizeInGBs(Integer dataStorageSizeInGBs) { - this.dataStorageSizeInGBs = dataStorageSizeInGBs; - this.__explicitlySet__.add("dataStorageSizeInGBs"); + public Builder subnetId(String subnetId) { + this.subnetId = subnetId; + this.__explicitlySet__.add("subnetId"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - private DatabaseEdition databaseEdition; + @com.fasterxml.jackson.annotation.JsonProperty("backupSubnetId") + private String backupSubnetId; - public Builder databaseEdition(DatabaseEdition databaseEdition) { - this.databaseEdition = databaseEdition; - this.__explicitlySet__.add("databaseEdition"); + public Builder backupSubnetId(String backupSubnetId) { + this.backupSubnetId = backupSubnetId; + this.__explicitlySet__.add("backupSubnetId"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + private String shape; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder shape(String shape) { + this.shape = shape; + this.__explicitlySet__.add("shape"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") - private DiskRedundancy diskRedundancy; + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + private java.util.List sshPublicKeys; - public Builder diskRedundancy(DiskRedundancy diskRedundancy) { - this.diskRedundancy = diskRedundancy; - this.__explicitlySet__.add("diskRedundancy"); + public Builder sshPublicKeys(java.util.List sshPublicKeys) { + this.sshPublicKeys = sshPublicKeys; + this.__explicitlySet__.add("sshPublicKeys"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - private String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + private String hostname; - public Builder displayName(String displayName) { - this.displayName = displayName; - this.__explicitlySet__.add("displayName"); + public Builder hostname(String hostname) { + this.hostname = hostname; + this.__explicitlySet__.add("hostname"); return this; } @@ -148,30 +129,48 @@ public Builder domain(String domain) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("version") + private String version; - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); + public Builder version(String version) { + this.version = version; + this.__explicitlySet__.add("version"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - private String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") + private Integer cpuCoreCount; - public Builder hostname(String hostname) { - this.hostname = hostname; - this.__explicitlySet__.add("hostname"); + public Builder cpuCoreCount(Integer cpuCoreCount) { + this.cpuCoreCount = cpuCoreCount; + this.__explicitlySet__.add("cpuCoreCount"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("id") - private String id; + @com.fasterxml.jackson.annotation.JsonProperty("clusterName") + private String clusterName; - public Builder id(String id) { - this.id = id; - this.__explicitlySet__.add("id"); + public Builder clusterName(String clusterName) { + this.clusterName = clusterName; + this.__explicitlySet__.add("clusterName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") + private Integer dataStoragePercentage; + + public Builder dataStoragePercentage(Integer dataStoragePercentage) { + this.dataStoragePercentage = dataStoragePercentage; + this.__explicitlySet__.add("dataStoragePercentage"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + private DatabaseEdition databaseEdition; + + public Builder databaseEdition(DatabaseEdition databaseEdition) { + this.databaseEdition = databaseEdition; + this.__explicitlySet__.add("databaseEdition"); return this; } @@ -184,21 +183,12 @@ public Builder lastPatchHistoryEntryId(String lastPatchHistoryEntryId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") - private LicenseModel licenseModel; - - public Builder licenseModel(LicenseModel licenseModel) { - this.licenseModel = licenseModel; - this.__explicitlySet__.add("licenseModel"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("listenerPort") + private Integer listenerPort; - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); + public Builder listenerPort(Integer listenerPort) { + this.listenerPort = listenerPort; + this.__explicitlySet__.add("listenerPort"); return this; } @@ -211,39 +201,39 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("listenerPort") - private Integer listenerPort; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + private java.util.Date timeCreated; - public Builder listenerPort(Integer listenerPort) { - this.listenerPort = listenerPort; - this.__explicitlySet__.add("listenerPort"); + public Builder timeCreated(java.util.Date timeCreated) { + this.timeCreated = timeCreated; + this.__explicitlySet__.add("timeCreated"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("nodeCount") - private Integer nodeCount; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder nodeCount(Integer nodeCount) { - this.nodeCount = nodeCount; - this.__explicitlySet__.add("nodeCount"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("recoStorageSizeInGB") - private Integer recoStorageSizeInGB; + @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") + private DiskRedundancy diskRedundancy; - public Builder recoStorageSizeInGB(Integer recoStorageSizeInGB) { - this.recoStorageSizeInGB = recoStorageSizeInGB; - this.__explicitlySet__.add("recoStorageSizeInGB"); + public Builder diskRedundancy(DiskRedundancy diskRedundancy) { + this.diskRedundancy = diskRedundancy; + this.__explicitlySet__.add("diskRedundancy"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("scanDnsRecordId") - private String scanDnsRecordId; + @com.fasterxml.jackson.annotation.JsonProperty("sparseDiskgroup") + private Boolean sparseDiskgroup; - public Builder scanDnsRecordId(String scanDnsRecordId) { - this.scanDnsRecordId = scanDnsRecordId; - this.__explicitlySet__.add("scanDnsRecordId"); + public Builder sparseDiskgroup(Boolean sparseDiskgroup) { + this.sparseDiskgroup = sparseDiskgroup; + this.__explicitlySet__.add("sparseDiskgroup"); return this; } @@ -256,57 +246,76 @@ public Builder scanIpIds(java.util.List scanIpIds) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("shape") - private String shape; + @com.fasterxml.jackson.annotation.JsonProperty("vipIds") + private java.util.List vipIds; - public Builder shape(String shape) { - this.shape = shape; - this.__explicitlySet__.add("shape"); + public Builder vipIds(java.util.List vipIds) { + this.vipIds = vipIds; + this.__explicitlySet__.add("vipIds"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - private java.util.List sshPublicKeys; + @com.fasterxml.jackson.annotation.JsonProperty("scanDnsRecordId") + private String scanDnsRecordId; - public Builder sshPublicKeys(java.util.List sshPublicKeys) { - this.sshPublicKeys = sshPublicKeys; - this.__explicitlySet__.add("sshPublicKeys"); + public Builder scanDnsRecordId(String scanDnsRecordId) { + this.scanDnsRecordId = scanDnsRecordId; + this.__explicitlySet__.add("scanDnsRecordId"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("subnetId") - private String subnetId; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") + private Integer dataStorageSizeInGBs; - public Builder subnetId(String subnetId) { - this.subnetId = subnetId; - this.__explicitlySet__.add("subnetId"); + public Builder dataStorageSizeInGBs(Integer dataStorageSizeInGBs) { + this.dataStorageSizeInGBs = dataStorageSizeInGBs; + this.__explicitlySet__.add("dataStorageSizeInGBs"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - private java.util.Date timeCreated; + @com.fasterxml.jackson.annotation.JsonProperty("recoStorageSizeInGB") + private Integer recoStorageSizeInGB; - public Builder timeCreated(java.util.Date timeCreated) { - this.timeCreated = timeCreated; - this.__explicitlySet__.add("timeCreated"); + public Builder recoStorageSizeInGB(Integer recoStorageSizeInGB) { + this.recoStorageSizeInGB = recoStorageSizeInGB; + this.__explicitlySet__.add("recoStorageSizeInGB"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("version") - private String version; + @com.fasterxml.jackson.annotation.JsonProperty("nodeCount") + private Integer nodeCount; - public Builder version(String version) { - this.version = version; - this.__explicitlySet__.add("version"); + public Builder nodeCount(Integer nodeCount) { + this.nodeCount = nodeCount; + this.__explicitlySet__.add("nodeCount"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("vipIds") - private java.util.List vipIds; + @com.fasterxml.jackson.annotation.JsonProperty("licenseModel") + private LicenseModel licenseModel; - public Builder vipIds(java.util.List vipIds) { - this.vipIds = vipIds; - this.__explicitlySet__.add("vipIds"); + public Builder licenseModel(LicenseModel licenseModel) { + this.licenseModel = licenseModel; + this.__explicitlySet__.add("licenseModel"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } @@ -316,36 +325,37 @@ public Builder vipIds(java.util.List vipIds) { public DbSystemSummary build() { DbSystemSummary __instance__ = new DbSystemSummary( + id, + compartmentId, + displayName, availabilityDomain, + subnetId, backupSubnetId, - clusterName, - compartmentId, + shape, + sshPublicKeys, + hostname, + domain, + version, cpuCoreCount, + clusterName, dataStoragePercentage, - dataStorageSizeInGBs, databaseEdition, - definedTags, - diskRedundancy, - displayName, - domain, - freeformTags, - hostname, - id, lastPatchHistoryEntryId, - licenseModel, - lifecycleDetails, - lifecycleState, listenerPort, - nodeCount, - recoStorageSizeInGB, - scanDnsRecordId, - scanIpIds, - shape, - sshPublicKeys, - subnetId, + lifecycleState, timeCreated, - version, - vipIds); + lifecycleDetails, + diskRedundancy, + sparseDiskgroup, + scanIpIds, + vipIds, + scanDnsRecordId, + dataStorageSizeInGBs, + recoStorageSizeInGB, + nodeCount, + licenseModel, + freeformTags, + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -353,36 +363,37 @@ public DbSystemSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbSystemSummary o) { Builder copiedBuilder = - availabilityDomain(o.getAvailabilityDomain()) - .backupSubnetId(o.getBackupSubnetId()) - .clusterName(o.getClusterName()) + id(o.getId()) .compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .availabilityDomain(o.getAvailabilityDomain()) + .subnetId(o.getSubnetId()) + .backupSubnetId(o.getBackupSubnetId()) + .shape(o.getShape()) + .sshPublicKeys(o.getSshPublicKeys()) + .hostname(o.getHostname()) + .domain(o.getDomain()) + .version(o.getVersion()) .cpuCoreCount(o.getCpuCoreCount()) + .clusterName(o.getClusterName()) .dataStoragePercentage(o.getDataStoragePercentage()) - .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) .databaseEdition(o.getDatabaseEdition()) - .definedTags(o.getDefinedTags()) - .diskRedundancy(o.getDiskRedundancy()) - .displayName(o.getDisplayName()) - .domain(o.getDomain()) - .freeformTags(o.getFreeformTags()) - .hostname(o.getHostname()) - .id(o.getId()) .lastPatchHistoryEntryId(o.getLastPatchHistoryEntryId()) - .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()) + .lifecycleState(o.getLifecycleState()) .timeCreated(o.getTimeCreated()) - .version(o.getVersion()) - .vipIds(o.getVipIds()); + .lifecycleDetails(o.getLifecycleDetails()) + .diskRedundancy(o.getDiskRedundancy()) + .sparseDiskgroup(o.getSparseDiskgroup()) + .scanIpIds(o.getScanIpIds()) + .vipIds(o.getVipIds()) + .scanDnsRecordId(o.getScanDnsRecordId()) + .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) + .recoStorageSizeInGB(o.getRecoStorageSizeInGB()) + .nodeCount(o.getNodeCount()) + .licenseModel(o.getLicenseModel()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -396,12 +407,45 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; + + /** + * The user-friendly name for the DB system. The name does not have to be unique. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + /** * The name of the availability domain that the DB system is located in. **/ @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") String availabilityDomain; + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the subnet the DB system is associated with. + *

+ **Subnet Restrictions:** + * - For bare metal DB systems and for single node virtual machine DB systems, do not use a subnet that overlaps with 192.168.16.16/28. + * - For Exadata and virtual machine 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.128.0/20. + *

+ * These subnets are used by the Oracle Clusterware private interconnect on the database instance. + * Specifying an overlapping subnet will cause the private interconnect to malfunction. + * This restriction applies to both the client subnet and backup subnet. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + String subnetId; + /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup network subnet the DB system is associated with. Applicable only to Exadata DB systems. *

@@ -412,17 +456,37 @@ public static Builder builder() { String backupSubnetId; /** - * The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster name must begin with an an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The cluster name can be no longer than 11 characters and is not case sensitive. + * The shape of the DB system. The shape determines resources to allocate to the DB system. + * - For virtual machine shapes, the number of CPU cores and memory + * - For bare metal and Exadata shapes, the number of CPU cores, storage, and memory * **/ - @com.fasterxml.jackson.annotation.JsonProperty("clusterName") - String clusterName; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + String shape; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment. + * The public key portion of one or more key pairs used for SSH access to the DB system. **/ - @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") - String compartmentId; + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + java.util.List sshPublicKeys; + + /** + * The hostname for the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + String hostname; + + /** + * The domain name for the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("domain") + String domain; + + /** + * The Oracle Database version of the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("version") + String version; /** * The number of CPU cores enabled on the DB system. @@ -430,6 +494,13 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") Integer cpuCoreCount; + /** + * The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster name must begin with an an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The cluster name can be no longer than 11 characters and is not case sensitive. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("clusterName") + String clusterName; + /** * The percentage assigned to DATA storage (user data and database files). * The remaining percentage is assigned to RECO storage (database redo logs, archive logs, and recovery manager backups). Accepted values are 40 and 80. The default is 80 percent assigned to DATA storage. Not applicable for virtual machine DB systems. @@ -437,23 +508,84 @@ public static Builder builder() { **/ @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") Integer dataStoragePercentage; + /** + * The Oracle Database edition that applies to all the databases on the DB system. + * + **/ + @lombok.extern.slf4j.Slf4j + public enum DatabaseEdition { + StandardEdition("STANDARD_EDITION"), + EnterpriseEdition("ENTERPRISE_EDITION"), + EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), + EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), + + /** + * 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 (DatabaseEdition v : DatabaseEdition.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + DatabaseEdition(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static DatabaseEdition create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'DatabaseEdition', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; /** - * The data storage size, in gigabytes, that is currently available to the DB system. Applies only for virtual machine DB systems. + * The Oracle Database edition that applies to all the databases on the DB system. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") - Integer dataStorageSizeInGBs; + @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") + DatabaseEdition databaseEdition; + + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation starts. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lastPatchHistoryEntryId") + String lastPatchHistoryEntryId; + + /** + * The port number configured for the listener on the DB system. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("listenerPort") + Integer listenerPort; /** - * The Oracle Database edition that applies to all the databases on the DB system. - * + * The current state of the DB system. **/ @lombok.extern.slf4j.Slf4j - public enum DatabaseEdition { - StandardEdition("STANDARD_EDITION"), - EnterpriseEdition("ENTERPRISE_EDITION"), - EnterpriseEditionHighPerformance("ENTERPRISE_EDITION_HIGH_PERFORMANCE"), - EnterpriseEditionExtremePerformance("ENTERPRISE_EDITION_EXTREME_PERFORMANCE"), + public enum LifecycleState { + Provisioning("PROVISIONING"), + Available("AVAILABLE"), + Updating("UPDATING"), + Terminating("TERMINATING"), + Terminated("TERMINATED"), + Failed("FAILED"), /** * This value is used if a service returns a value for this enum that is not recognized by this @@ -462,18 +594,18 @@ public enum DatabaseEdition { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (DatabaseEdition v : DatabaseEdition.values()) { + for (LifecycleState v : LifecycleState.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - DatabaseEdition(String value) { + LifecycleState(String value) { this.value = value; } @@ -483,32 +615,33 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static DatabaseEdition create(String key) { + public static LifecycleState create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'DatabaseEdition', returning UnknownEnumValue", + "Received unknown value '{}' for enum 'LifecycleState', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * The Oracle Database edition that applies to all the databases on the DB system. - * + * The current state of the DB system. **/ - @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") - DatabaseEdition databaseEdition; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * + * The date and time the DB system was created. **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") + java.util.Date timeCreated; + + /** + * Additional information about the current lifecycleState. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** * The type of redundancy configured for the DB system. * NORMAL is 2-way redundancy. @@ -568,44 +701,61 @@ public static DiskRedundancy create(String key) { DiskRedundancy diskRedundancy; /** - * The user-friendly name for the DB system. The name does not have to be unique. + * True, if Sparse Diskgroup is configured for Exadata dbsystem, False, if Sparse diskgroup was not configured. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("sparseDiskgroup") + Boolean sparseDiskgroup; /** - * The domain name for the DB system. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Single Client Access Name (SCAN) IP addresses associated with the DB system. + * SCAN IP addresses are typically used for load balancing and are not assigned to any interface. + * Oracle Clusterware directs the requests to the appropriate nodes in the cluster. + *

+ **Note:** For a single-node DB system, this list is empty. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("domain") - String domain; + @com.fasterxml.jackson.annotation.JsonProperty("scanIpIds") + java.util.List scanIpIds; /** - * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the virtual IP (VIP) addresses associated with the DB system. + * The Cluster Ready Services (CRS) creates and maintains one VIP address for each node in the DB system to + * enable failover. If one node fails, the VIP is reassigned to another active node in the cluster. *

- * Example: `{\"Department\": \"Finance\"}` + **Note:** For a single-node DB system, this list is empty. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("vipIds") + java.util.List vipIds; /** - * The hostname for the DB system. + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DNS record for the SCAN IP addresses that are associated with the DB system. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("scanDnsRecordId") + String scanDnsRecordId; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DB system. + * The data storage size, in gigabytes, that is currently available to the DB system. Applies only for virtual machine DB systems. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") + Integer dataStorageSizeInGBs; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation starts. + * The RECO/REDO storage size, in gigabytes, that is currently allocated to the DB system. Applies only for virtual machine DB systems. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("lastPatchHistoryEntryId") - String lastPatchHistoryEntryId; + @com.fasterxml.jackson.annotation.JsonProperty("recoStorageSizeInGB") + Integer recoStorageSizeInGB; + + /** + * The number of nodes in the DB system. For RAC DB systems, the value is greater than 1. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("nodeCount") + Integer nodeCount; /** * The Oracle license model that applies to all the databases on the DB system. The default is LICENSE_INCLUDED. * @@ -661,156 +811,24 @@ public static LicenseModel create(String key) { LicenseModel licenseModel; /** - * Additional information about the current lifecycleState. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; - /** - * The current state of the DB system. - **/ - @lombok.extern.slf4j.Slf4j - public enum LifecycleState { - Provisioning("PROVISIONING"), - Available("AVAILABLE"), - Updating("UPDATING"), - Terminating("TERMINATING"), - Terminated("TERMINATED"), - Failed("FAILED"), - - /** - * 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 DB system. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") - LifecycleState lifecycleState; - - /** - * The port number configured for the listener on the DB system. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("listenerPort") - Integer listenerPort; - - /** - * The number of nodes in the DB system. For RAC DB systems, the value is greater than 1. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("nodeCount") - Integer nodeCount; - - /** - * The RECO/REDO storage size, in gigabytes, that is currently allocated to the DB system. Applies only for virtual machine DB systems. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("recoStorageSizeInGB") - Integer recoStorageSizeInGB; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the DNS record for the SCAN IP addresses that are associated with the DB system. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("scanDnsRecordId") - String scanDnsRecordId; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the Single Client Access Name (SCAN) IP addresses associated with the DB system. - * SCAN IP addresses are typically used for load balancing and are not assigned to any interface. - * Oracle Clusterware directs the requests to the appropriate nodes in the cluster. - *

- **Note:** For a single-node DB system, this list is empty. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("scanIpIds") - java.util.List scanIpIds; - - /** - * The shape of the DB system. The shape determines resources to allocate to the DB system. - * - For virtual machine shapes, the number of CPU cores and memory - * - For bare metal and Exadata shapes, the number of CPU cores, storage, and memory - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("shape") - String shape; - - /** - * The public key portion of one or more key pairs used for SSH access to the DB system. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - java.util.List sshPublicKeys; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the subnet the DB system is associated with. - *

- **Subnet Restrictions:** - * - For bare metal DB systems and for single node virtual machine DB systems, do not use a subnet that overlaps with 192.168.16.16/28. - * - For Exadata and virtual machine 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.128.0/20. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). *

- * These subnets are used by the Oracle Clusterware private interconnect on the database instance. - * Specifying an overlapping subnet will cause the private interconnect to malfunction. - * This restriction applies to both the client subnet and backup subnet. + * Example: `{\"Department\": \"Finance\"}` * **/ - @com.fasterxml.jackson.annotation.JsonProperty("subnetId") - String subnetId; - - /** - * The date and time the DB system was created. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") - java.util.Date timeCreated; - - /** - * The Oracle Database version of the DB system. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("version") - String version; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the virtual IP (VIP) addresses associated with the DB system. - * The Cluster Ready Services (CRS) creates and maintains one VIP address for each node in the DB system to - * enable failover. If one node fails, the VIP is reassigned to another active node in the cluster. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). *

- **Note:** For a single-node DB system, this list is empty. + * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` * **/ - @com.fasterxml.jackson.annotation.JsonProperty("vipIds") - java.util.List vipIds; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; @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/DbVersionSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/DbVersionSummary.java index bc430419282..51485fb698a 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 @@ -25,15 +25,6 @@ public class DbVersionSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("supportsPdb") - private Boolean supportsPdb; - - public Builder supportsPdb(Boolean supportsPdb) { - this.supportsPdb = supportsPdb; - this.__explicitlySet__.add("supportsPdb"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("version") private String version; @@ -43,18 +34,40 @@ public Builder version(String version) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("isLatestForMajorVersion") + private Boolean isLatestForMajorVersion; + + public Builder isLatestForMajorVersion(Boolean isLatestForMajorVersion) { + this.isLatestForMajorVersion = isLatestForMajorVersion; + this.__explicitlySet__.add("isLatestForMajorVersion"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("supportsPdb") + private Boolean supportsPdb; + + public Builder supportsPdb(Boolean supportsPdb) { + this.supportsPdb = supportsPdb; + this.__explicitlySet__.add("supportsPdb"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public DbVersionSummary build() { - DbVersionSummary __instance__ = new DbVersionSummary(supportsPdb, version); + DbVersionSummary __instance__ = + new DbVersionSummary(version, isLatestForMajorVersion, supportsPdb); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(DbVersionSummary o) { - Builder copiedBuilder = supportsPdb(o.getSupportsPdb()).version(o.getVersion()); + Builder copiedBuilder = + version(o.getVersion()) + .isLatestForMajorVersion(o.getIsLatestForMajorVersion()) + .supportsPdb(o.getSupportsPdb()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -68,18 +81,24 @@ public static Builder builder() { return new Builder(); } - /** - * True if this version of the Oracle Database software supports pluggable databases. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("supportsPdb") - Boolean supportsPdb; - /** * A valid Oracle Database version. **/ @com.fasterxml.jackson.annotation.JsonProperty("version") String version; + /** + * True if this version of the Oracle Database software is the latest version for a release. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("isLatestForMajorVersion") + Boolean isLatestForMajorVersion; + + /** + * True if this version of the Oracle Database software supports pluggable databases. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("supportsPdb") + Boolean supportsPdb; + @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/ExternalBackupJob.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/ExternalBackupJob.java index 6d89dab21fc..0bee0733372 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/ExternalBackupJob.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/ExternalBackupJob.java @@ -34,15 +34,6 @@ public Builder backupId(String backupId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("bucketName") - private String bucketName; - - public Builder bucketName(String bucketName) { - this.bucketName = bucketName; - this.__explicitlySet__.add("bucketName"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("provisioning") private Boolean provisioning; @@ -52,15 +43,6 @@ public Builder provisioning(Boolean provisioning) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("swiftPassword") - private String swiftPassword; - - public Builder swiftPassword(String swiftPassword) { - this.swiftPassword = swiftPassword; - this.__explicitlySet__.add("swiftPassword"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("swiftPath") private String swiftPath; @@ -70,6 +52,15 @@ public Builder swiftPath(String swiftPath) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("bucketName") + private String bucketName; + + public Builder bucketName(String bucketName) { + this.bucketName = bucketName; + this.__explicitlySet__.add("bucketName"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("tag") private String tag; @@ -88,6 +79,15 @@ public Builder userName(String userName) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("swiftPassword") + private String swiftPassword; + + public Builder swiftPassword(String swiftPassword) { + this.swiftPassword = swiftPassword; + this.__explicitlySet__.add("swiftPassword"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -95,12 +95,12 @@ public ExternalBackupJob build() { ExternalBackupJob __instance__ = new ExternalBackupJob( backupId, - bucketName, provisioning, - swiftPassword, swiftPath, + bucketName, tag, - userName); + userName, + swiftPassword); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -109,12 +109,12 @@ public ExternalBackupJob build() { public Builder copy(ExternalBackupJob o) { Builder copiedBuilder = backupId(o.getBackupId()) - .bucketName(o.getBucketName()) .provisioning(o.getProvisioning()) - .swiftPassword(o.getSwiftPassword()) .swiftPath(o.getSwiftPath()) + .bucketName(o.getBucketName()) .tag(o.getTag()) - .userName(o.getUserName()); + .userName(o.getUserName()) + .swiftPassword(o.getSwiftPassword()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -134,32 +134,24 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("backupId") String backupId; - /** - * The name of the Swift compartment bucket where the backup should be stored. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("bucketName") - String bucketName; - /** * An indicator for the provisioning state of the resource. If `TRUE`, the resource is still being provisioned. **/ @com.fasterxml.jackson.annotation.JsonProperty("provisioning") Boolean provisioning; - /** - * The auth token to use for access to the Swift compartment bucket that will store the standalone backup. - * For information about auth tokens, see [Working with Auth Tokens](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Tasks/managingcredentials.htm#two). - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("swiftPassword") - String swiftPassword; - /** * The Swift path to use as a destination for the standalone backup. **/ @com.fasterxml.jackson.annotation.JsonProperty("swiftPath") String swiftPath; + /** + * The name of the Swift compartment bucket where the backup should be stored. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("bucketName") + String bucketName; + /** * The tag for RMAN to apply to the backup. **/ @@ -172,6 +164,14 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("userName") String userName; + /** + * The auth token to use for access to the Swift compartment bucket that will store the standalone backup. + * For information about auth tokens, see [Working with Auth Tokens](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Tasks/managingcredentials.htm#two). + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("swiftPassword") + String swiftPassword; + @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/GenerateAutonomousDataWarehouseWalletDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/GenerateAutonomousDataWarehouseWalletDetails.java index fa8700639f7..af1ae19bd43 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/GenerateAutonomousDataWarehouseWalletDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/GenerateAutonomousDataWarehouseWalletDetails.java @@ -61,7 +61,7 @@ public static Builder builder() { } /** - * The password to encrypt the keys inside the wallet. + * The password to encrypt the keys inside the wallet. The password must be at least 8 characters long and must include at least 1 letter and either 1 numeric character or 1 special character. **/ @com.fasterxml.jackson.annotation.JsonProperty("password") String password; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/GenerateAutonomousDatabaseWalletDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/GenerateAutonomousDatabaseWalletDetails.java index eacf2c514e7..21e2f1b913e 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/GenerateAutonomousDatabaseWalletDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/GenerateAutonomousDatabaseWalletDetails.java @@ -61,7 +61,7 @@ public static Builder builder() { } /** - * The password to encrypt the keys inside the wallet. + * The password to encrypt the keys inside the wallet. The password must be at least 8 characters long and must include at least 1 letter and either 1 numeric character or 1 special character. **/ @com.fasterxml.jackson.annotation.JsonProperty("password") String password; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemBase.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemBase.java index 746d57a05ca..f6f0d325785 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemBase.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemBase.java @@ -42,12 +42,39 @@ @com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) public class LaunchDbSystemBase { + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment the DB system belongs in. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + String compartmentId; + + /** + * The user-friendly name for the DB system. The name does not have to be unique. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + /** * The availability domain where the DB system is located. **/ @com.fasterxml.jackson.annotation.JsonProperty("availabilityDomain") String availabilityDomain; + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the subnet the DB system is associated with. + *

+ **Subnet Restrictions:** + * - For bare metal DB systems and for single node virtual machine DB systems, do not use a subnet that overlaps with 192.168.16.16/28. + * - For Exadata and virtual machine 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.128.0/20. + *

+ * These subnets are used by the Oracle Clusterware private interconnect on the database instance. + * Specifying an overlapping subnet will cause the private interconnect to malfunction. + * This restriction applies to both the client subnet and the backup subnet. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + String subnetId; + /** * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the backup network subnet the DB system is associated with. Applicable only to Exadata DB systems. *

@@ -58,17 +85,50 @@ public class LaunchDbSystemBase { String backupSubnetId; /** - * The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster name must begin with an an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The cluster name can be no longer than 11 characters and is not case sensitive. + * The shape of the DB system. The shape determines resources allocated to the DB system. + * - For virtual machine shapes, the number of CPU cores and memory + * - For bare metal and Exadata shapes, the number of CPU cores, memory, and storage + *

+ * To get a list of shapes, use the {@link #listDbSystemShapes(ListDbSystemShapesRequest) listDbSystemShapes} operation. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("clusterName") - String clusterName; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + String shape; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the compartment the DB system belongs in. + * If true, Sparse Diskgroup is configured for Exadata dbsystem. If False, Sparse diskgroup is not configured. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") - String compartmentId; + @com.fasterxml.jackson.annotation.JsonProperty("sparseDiskgroup") + Boolean sparseDiskgroup; + + /** + * The public key portion of the key pair to use for SSH access to the DB system. Multiple public keys can be provided. The length of the combined keys cannot exceed 10,000 characters. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + java.util.List sshPublicKeys; + + /** + * The hostname for the DB system. The hostname must begin with an alphabetic character and + * can contain a maximum of 30 alphanumeric characters, including hyphens (-). + *

+ * The maximum length of the combined hostname and domain is 63 characters. + *

+ **Note:** The hostname must be unique within the subnet. If it is not unique, + * the DB system will fail to provision. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + String hostname; + + /** + * A domain name used for the DB system. If the Oracle-provided Internet and VCN + * Resolver is enabled for the specified subnet, the domain name for the subnet is used + * (do not provide one). Otherwise, provide a valid DNS domain name. Hyphens (-) are not permitted. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("domain") + String domain; /** * The number of CPU cores to enable for a bare metal or Exadata DB system. The valid values depend on the specified shape: @@ -89,6 +149,13 @@ public class LaunchDbSystemBase { @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") Integer cpuCoreCount; + /** + * The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster name must begin with an an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The cluster name can be no longer than 11 characters and is not case sensitive. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("clusterName") + String clusterName; + /** * The percentage assigned to DATA storage (user data and database files). * The remaining percentage is assigned to RECO storage (database redo logs, archive logs, and recovery manager backups). @@ -98,54 +165,6 @@ public class LaunchDbSystemBase { @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") Integer dataStoragePercentage; - /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; - - /** - * The user-friendly name for the DB system. The name does not have to be unique. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - String displayName; - - /** - * A domain name used for the DB system. If the Oracle-provided Internet and VCN - * Resolver is enabled for the specified subnet, the domain name for the subnet is used - * (do not provide one). Otherwise, provide a valid DNS domain name. Hyphens (-) are not permitted. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("domain") - String domain; - - /** - * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Department\": \"Finance\"}` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; - - /** - * The hostname for the DB system. The hostname must begin with an alphabetic character and - * can contain a maximum of 30 alphanumeric characters, including hyphens (-). - *

- * The maximum length of the combined hostname and domain is 63 characters. - *

- **Note:** The hostname must be unique within the subnet. If it is not unique, - * the DB system will fail to provision. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - String hostname; - /** * Size (in GB) of the initial data volume that will be created and attached to a virtual machine DB system. You can scale up storage after provisioning, as needed. Note that the total storage size attached will be more than the amount you specify to allow for REDO/RECO space and software volume. * @@ -161,34 +180,22 @@ public class LaunchDbSystemBase { Integer nodeCount; /** - * The shape of the DB system. The shape determines resources allocated to the DB system. - * - For virtual machine shapes, the number of CPU cores and memory - * - For bare metal and Exadata shapes, the number of CPU cores, memory, and storage + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). *

- * To get a list of shapes, use the {@link #listDbSystemShapes(ListDbSystemShapesRequest) listDbSystemShapes} operation. + * Example: `{\"Department\": \"Finance\"}` * **/ - @com.fasterxml.jackson.annotation.JsonProperty("shape") - String shape; - - /** - * The public key portion of the key pair to use for SSH access to the DB system. Multiple public keys can be provided. The length of the combined keys cannot exceed 10,000 characters. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - java.util.List sshPublicKeys; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the subnet the DB system is associated with. - *

- **Subnet Restrictions:** - * - For bare metal DB systems and for single node virtual machine DB systems, do not use a subnet that overlaps with 192.168.16.16/28. - * - For Exadata and virtual machine 2-node RAC DB systems, do not use a subnet that overlaps with 192.168.128.0/20. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). *

- * These subnets are used by the Oracle Clusterware private interconnect on the database instance. - * Specifying an overlapping subnet will cause the private interconnect to malfunction. - * This restriction applies to both the client subnet and the backup subnet. + * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` * **/ - @com.fasterxml.jackson.annotation.JsonProperty("subnetId") - String subnetId; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; } 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 4f85c37e0e4..d98bf84df95 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 @@ -30,6 +30,24 @@ public class LaunchDbSystemDetails extends LaunchDbSystemBase { @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("availabilityDomain") private String availabilityDomain; @@ -39,6 +57,15 @@ public Builder availabilityDomain(String availabilityDomain) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private String subnetId; + + public Builder subnetId(String subnetId) { + this.subnetId = subnetId; + this.__explicitlySet__.add("subnetId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("backupSubnetId") private String backupSubnetId; @@ -48,58 +75,39 @@ public Builder backupSubnetId(String backupSubnetId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("clusterName") - private String clusterName; - - public Builder clusterName(String clusterName) { - this.clusterName = clusterName; - this.__explicitlySet__.add("clusterName"); - 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("cpuCoreCount") - private Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + private String shape; - public Builder cpuCoreCount(Integer cpuCoreCount) { - this.cpuCoreCount = cpuCoreCount; - this.__explicitlySet__.add("cpuCoreCount"); + public Builder shape(String shape) { + this.shape = shape; + this.__explicitlySet__.add("shape"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") - private Integer dataStoragePercentage; + @com.fasterxml.jackson.annotation.JsonProperty("sparseDiskgroup") + private Boolean sparseDiskgroup; - public Builder dataStoragePercentage(Integer dataStoragePercentage) { - this.dataStoragePercentage = dataStoragePercentage; - this.__explicitlySet__.add("dataStoragePercentage"); + public Builder sparseDiskgroup(Boolean sparseDiskgroup) { + this.sparseDiskgroup = sparseDiskgroup; + this.__explicitlySet__.add("sparseDiskgroup"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + private java.util.List sshPublicKeys; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder sshPublicKeys(java.util.List sshPublicKeys) { + this.sshPublicKeys = sshPublicKeys; + this.__explicitlySet__.add("sshPublicKeys"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - private String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + private String hostname; - public Builder displayName(String displayName) { - this.displayName = displayName; - this.__explicitlySet__.add("displayName"); + public Builder hostname(String hostname) { + this.hostname = hostname; + this.__explicitlySet__.add("hostname"); return this; } @@ -112,21 +120,30 @@ public Builder domain(String domain) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") + private Integer cpuCoreCount; - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); + public Builder cpuCoreCount(Integer cpuCoreCount) { + this.cpuCoreCount = cpuCoreCount; + this.__explicitlySet__.add("cpuCoreCount"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - private String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("clusterName") + private String clusterName; - public Builder hostname(String hostname) { - this.hostname = hostname; - this.__explicitlySet__.add("hostname"); + public Builder clusterName(String clusterName) { + this.clusterName = clusterName; + this.__explicitlySet__.add("clusterName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") + private Integer dataStoragePercentage; + + public Builder dataStoragePercentage(Integer dataStoragePercentage) { + this.dataStoragePercentage = dataStoragePercentage; + this.__explicitlySet__.add("dataStoragePercentage"); return this; } @@ -148,30 +165,31 @@ public Builder nodeCount(Integer nodeCount) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("shape") - private String shape; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; - public Builder shape(String shape) { - this.shape = shape; - this.__explicitlySet__.add("shape"); + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - private java.util.List sshPublicKeys; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder sshPublicKeys(java.util.List sshPublicKeys) { - this.sshPublicKeys = sshPublicKeys; - this.__explicitlySet__.add("sshPublicKeys"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("subnetId") - private String subnetId; + @com.fasterxml.jackson.annotation.JsonProperty("dbHome") + private CreateDbHomeDetails dbHome; - public Builder subnetId(String subnetId) { - this.subnetId = subnetId; - this.__explicitlySet__.add("subnetId"); + public Builder dbHome(CreateDbHomeDetails dbHome) { + this.dbHome = dbHome; + this.__explicitlySet__.add("dbHome"); return this; } @@ -184,15 +202,6 @@ public Builder databaseEdition(DatabaseEdition databaseEdition) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbHome") - private CreateDbHomeDetails dbHome; - - public Builder dbHome(CreateDbHomeDetails dbHome) { - this.dbHome = dbHome; - this.__explicitlySet__.add("dbHome"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") private DiskRedundancy diskRedundancy; @@ -217,24 +226,25 @@ public Builder licenseModel(LicenseModel licenseModel) { public LaunchDbSystemDetails build() { LaunchDbSystemDetails __instance__ = new LaunchDbSystemDetails( + compartmentId, + displayName, availabilityDomain, + subnetId, backupSubnetId, - clusterName, - compartmentId, + shape, + sparseDiskgroup, + sshPublicKeys, + hostname, + domain, cpuCoreCount, + clusterName, dataStoragePercentage, - definedTags, - displayName, - domain, - freeformTags, - hostname, initialDataStorageSizeInGB, nodeCount, - shape, - sshPublicKeys, - subnetId, - databaseEdition, + freeformTags, + definedTags, dbHome, + databaseEdition, diskRedundancy, licenseModel); __instance__.__explicitlySet__.addAll(__explicitlySet__); @@ -244,24 +254,25 @@ public LaunchDbSystemDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LaunchDbSystemDetails o) { Builder copiedBuilder = - availabilityDomain(o.getAvailabilityDomain()) + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .availabilityDomain(o.getAvailabilityDomain()) + .subnetId(o.getSubnetId()) .backupSubnetId(o.getBackupSubnetId()) - .clusterName(o.getClusterName()) - .compartmentId(o.getCompartmentId()) + .shape(o.getShape()) + .sparseDiskgroup(o.getSparseDiskgroup()) + .sshPublicKeys(o.getSshPublicKeys()) + .hostname(o.getHostname()) + .domain(o.getDomain()) .cpuCoreCount(o.getCpuCoreCount()) + .clusterName(o.getClusterName()) .dataStoragePercentage(o.getDataStoragePercentage()) - .definedTags(o.getDefinedTags()) - .displayName(o.getDisplayName()) - .domain(o.getDomain()) - .freeformTags(o.getFreeformTags()) - .hostname(o.getHostname()) .initialDataStorageSizeInGB(o.getInitialDataStorageSizeInGB()) .nodeCount(o.getNodeCount()) - .shape(o.getShape()) - .sshPublicKeys(o.getSshPublicKeys()) - .subnetId(o.getSubnetId()) - .databaseEdition(o.getDatabaseEdition()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) .dbHome(o.getDbHome()) + .databaseEdition(o.getDatabaseEdition()) .diskRedundancy(o.getDiskRedundancy()) .licenseModel(o.getLicenseModel()); @@ -279,49 +290,53 @@ public static Builder builder() { @Deprecated public LaunchDbSystemDetails( + String compartmentId, + String displayName, String availabilityDomain, + String subnetId, String backupSubnetId, - String clusterName, - String compartmentId, + String shape, + Boolean sparseDiskgroup, + java.util.List sshPublicKeys, + String hostname, + String domain, Integer cpuCoreCount, + String clusterName, Integer dataStoragePercentage, - java.util.Map> definedTags, - String displayName, - String domain, - java.util.Map freeformTags, - String hostname, Integer initialDataStorageSizeInGB, Integer nodeCount, - String shape, - java.util.List sshPublicKeys, - String subnetId, - DatabaseEdition databaseEdition, + java.util.Map freeformTags, + java.util.Map> definedTags, CreateDbHomeDetails dbHome, + DatabaseEdition databaseEdition, DiskRedundancy diskRedundancy, LicenseModel licenseModel) { super( + compartmentId, + displayName, availabilityDomain, + subnetId, backupSubnetId, - clusterName, - compartmentId, + shape, + sparseDiskgroup, + sshPublicKeys, + hostname, + domain, cpuCoreCount, + clusterName, dataStoragePercentage, - definedTags, - displayName, - domain, - freeformTags, - hostname, initialDataStorageSizeInGB, nodeCount, - shape, - sshPublicKeys, - subnetId); - this.databaseEdition = databaseEdition; + freeformTags, + definedTags); this.dbHome = dbHome; + this.databaseEdition = databaseEdition; this.diskRedundancy = diskRedundancy; this.licenseModel = licenseModel; } + @com.fasterxml.jackson.annotation.JsonProperty("dbHome") + CreateDbHomeDetails dbHome; /** * The Oracle Database Edition that applies to all the databases on the DB system. * Exadata DB systems and 2-node RAC DB systems require ENTERPRISE_EDITION_EXTREME_PERFORMANCE. @@ -368,9 +383,6 @@ public static DatabaseEdition create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") DatabaseEdition databaseEdition; - - @com.fasterxml.jackson.annotation.JsonProperty("dbHome") - CreateDbHomeDetails dbHome; /** * The type of redundancy configured for the DB system. * Normal is 2-way redundancy, recommended for test and development systems. diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemFromBackupDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemFromBackupDetails.java index 70c9f0619be..d3a9431ff52 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemFromBackupDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/LaunchDbSystemFromBackupDetails.java @@ -30,6 +30,24 @@ public class LaunchDbSystemFromBackupDetails extends LaunchDbSystemBase { @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("availabilityDomain") private String availabilityDomain; @@ -39,6 +57,15 @@ public Builder availabilityDomain(String availabilityDomain) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private String subnetId; + + public Builder subnetId(String subnetId) { + this.subnetId = subnetId; + this.__explicitlySet__.add("subnetId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("backupSubnetId") private String backupSubnetId; @@ -48,58 +75,39 @@ public Builder backupSubnetId(String backupSubnetId) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("clusterName") - private String clusterName; - - public Builder clusterName(String clusterName) { - this.clusterName = clusterName; - this.__explicitlySet__.add("clusterName"); - 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("cpuCoreCount") - private Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("shape") + private String shape; - public Builder cpuCoreCount(Integer cpuCoreCount) { - this.cpuCoreCount = cpuCoreCount; - this.__explicitlySet__.add("cpuCoreCount"); + public Builder shape(String shape) { + this.shape = shape; + this.__explicitlySet__.add("shape"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") - private Integer dataStoragePercentage; + @com.fasterxml.jackson.annotation.JsonProperty("sparseDiskgroup") + private Boolean sparseDiskgroup; - public Builder dataStoragePercentage(Integer dataStoragePercentage) { - this.dataStoragePercentage = dataStoragePercentage; - this.__explicitlySet__.add("dataStoragePercentage"); + public Builder sparseDiskgroup(Boolean sparseDiskgroup) { + this.sparseDiskgroup = sparseDiskgroup; + this.__explicitlySet__.add("sparseDiskgroup"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + private java.util.List sshPublicKeys; - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); + public Builder sshPublicKeys(java.util.List sshPublicKeys) { + this.sshPublicKeys = sshPublicKeys; + this.__explicitlySet__.add("sshPublicKeys"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") - private String displayName; + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + private String hostname; - public Builder displayName(String displayName) { - this.displayName = displayName; - this.__explicitlySet__.add("displayName"); + public Builder hostname(String hostname) { + this.hostname = hostname; + this.__explicitlySet__.add("hostname"); return this; } @@ -112,21 +120,30 @@ public Builder domain(String domain) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") + private Integer cpuCoreCount; - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); + public Builder cpuCoreCount(Integer cpuCoreCount) { + this.cpuCoreCount = cpuCoreCount; + this.__explicitlySet__.add("cpuCoreCount"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("hostname") - private String hostname; + @com.fasterxml.jackson.annotation.JsonProperty("clusterName") + private String clusterName; - public Builder hostname(String hostname) { - this.hostname = hostname; - this.__explicitlySet__.add("hostname"); + public Builder clusterName(String clusterName) { + this.clusterName = clusterName; + this.__explicitlySet__.add("clusterName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("dataStoragePercentage") + private Integer dataStoragePercentage; + + public Builder dataStoragePercentage(Integer dataStoragePercentage) { + this.dataStoragePercentage = dataStoragePercentage; + this.__explicitlySet__.add("dataStoragePercentage"); return this; } @@ -148,30 +165,31 @@ public Builder nodeCount(Integer nodeCount) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("shape") - private String shape; + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; - public Builder shape(String shape) { - this.shape = shape; - this.__explicitlySet__.add("shape"); + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - private java.util.List sshPublicKeys; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder sshPublicKeys(java.util.List sshPublicKeys) { - this.sshPublicKeys = sshPublicKeys; - this.__explicitlySet__.add("sshPublicKeys"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } - @com.fasterxml.jackson.annotation.JsonProperty("subnetId") - private String subnetId; + @com.fasterxml.jackson.annotation.JsonProperty("dbHome") + private CreateDbHomeFromBackupDetails dbHome; - public Builder subnetId(String subnetId) { - this.subnetId = subnetId; - this.__explicitlySet__.add("subnetId"); + public Builder dbHome(CreateDbHomeFromBackupDetails dbHome) { + this.dbHome = dbHome; + this.__explicitlySet__.add("dbHome"); return this; } @@ -184,15 +202,6 @@ public Builder databaseEdition(DatabaseEdition databaseEdition) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("dbHome") - private CreateDbHomeFromBackupDetails dbHome; - - public Builder dbHome(CreateDbHomeFromBackupDetails dbHome) { - this.dbHome = dbHome; - this.__explicitlySet__.add("dbHome"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("diskRedundancy") private DiskRedundancy diskRedundancy; @@ -217,24 +226,25 @@ public Builder licenseModel(LicenseModel licenseModel) { public LaunchDbSystemFromBackupDetails build() { LaunchDbSystemFromBackupDetails __instance__ = new LaunchDbSystemFromBackupDetails( + compartmentId, + displayName, availabilityDomain, + subnetId, backupSubnetId, - clusterName, - compartmentId, + shape, + sparseDiskgroup, + sshPublicKeys, + hostname, + domain, cpuCoreCount, + clusterName, dataStoragePercentage, - definedTags, - displayName, - domain, - freeformTags, - hostname, initialDataStorageSizeInGB, nodeCount, - shape, - sshPublicKeys, - subnetId, - databaseEdition, + freeformTags, + definedTags, dbHome, + databaseEdition, diskRedundancy, licenseModel); __instance__.__explicitlySet__.addAll(__explicitlySet__); @@ -244,24 +254,25 @@ public LaunchDbSystemFromBackupDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(LaunchDbSystemFromBackupDetails o) { Builder copiedBuilder = - availabilityDomain(o.getAvailabilityDomain()) + compartmentId(o.getCompartmentId()) + .displayName(o.getDisplayName()) + .availabilityDomain(o.getAvailabilityDomain()) + .subnetId(o.getSubnetId()) .backupSubnetId(o.getBackupSubnetId()) - .clusterName(o.getClusterName()) - .compartmentId(o.getCompartmentId()) + .shape(o.getShape()) + .sparseDiskgroup(o.getSparseDiskgroup()) + .sshPublicKeys(o.getSshPublicKeys()) + .hostname(o.getHostname()) + .domain(o.getDomain()) .cpuCoreCount(o.getCpuCoreCount()) + .clusterName(o.getClusterName()) .dataStoragePercentage(o.getDataStoragePercentage()) - .definedTags(o.getDefinedTags()) - .displayName(o.getDisplayName()) - .domain(o.getDomain()) - .freeformTags(o.getFreeformTags()) - .hostname(o.getHostname()) .initialDataStorageSizeInGB(o.getInitialDataStorageSizeInGB()) .nodeCount(o.getNodeCount()) - .shape(o.getShape()) - .sshPublicKeys(o.getSshPublicKeys()) - .subnetId(o.getSubnetId()) - .databaseEdition(o.getDatabaseEdition()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) .dbHome(o.getDbHome()) + .databaseEdition(o.getDatabaseEdition()) .diskRedundancy(o.getDiskRedundancy()) .licenseModel(o.getLicenseModel()); @@ -279,49 +290,53 @@ public static Builder builder() { @Deprecated public LaunchDbSystemFromBackupDetails( + String compartmentId, + String displayName, String availabilityDomain, + String subnetId, String backupSubnetId, - String clusterName, - String compartmentId, + String shape, + Boolean sparseDiskgroup, + java.util.List sshPublicKeys, + String hostname, + String domain, Integer cpuCoreCount, + String clusterName, Integer dataStoragePercentage, - java.util.Map> definedTags, - String displayName, - String domain, - java.util.Map freeformTags, - String hostname, Integer initialDataStorageSizeInGB, Integer nodeCount, - String shape, - java.util.List sshPublicKeys, - String subnetId, - DatabaseEdition databaseEdition, + java.util.Map freeformTags, + java.util.Map> definedTags, CreateDbHomeFromBackupDetails dbHome, + DatabaseEdition databaseEdition, DiskRedundancy diskRedundancy, LicenseModel licenseModel) { super( + compartmentId, + displayName, availabilityDomain, + subnetId, backupSubnetId, - clusterName, - compartmentId, + shape, + sparseDiskgroup, + sshPublicKeys, + hostname, + domain, cpuCoreCount, + clusterName, dataStoragePercentage, - definedTags, - displayName, - domain, - freeformTags, - hostname, initialDataStorageSizeInGB, nodeCount, - shape, - sshPublicKeys, - subnetId); - this.databaseEdition = databaseEdition; + freeformTags, + definedTags); this.dbHome = dbHome; + this.databaseEdition = databaseEdition; this.diskRedundancy = diskRedundancy; this.licenseModel = licenseModel; } + @com.fasterxml.jackson.annotation.JsonProperty("dbHome") + CreateDbHomeFromBackupDetails dbHome; /** * The Oracle Database Edition that applies to all the databases on the DB system. * Exadata DB systems and 2-node RAC DB systems require ENTERPRISE_EDITION_EXTREME_PERFORMANCE. @@ -368,9 +383,6 @@ public static DatabaseEdition create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("databaseEdition") DatabaseEdition databaseEdition; - - @com.fasterxml.jackson.annotation.JsonProperty("dbHome") - CreateDbHomeFromBackupDetails dbHome; /** * The type of redundancy configured for the DB system. * NORMAL 2-way redundancy, recommended for test and development systems. 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 d9cb6f7fe16..89bcd86311d 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 @@ -4,11 +4,6 @@ package com.oracle.bmc.database.model; /** - * A Patch for a DB system or DB Home. - *

- * 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). * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -27,12 +22,12 @@ public class Patch { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("availableActions") - private java.util.List availableActions; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder availableActions(java.util.List availableActions) { - this.availableActions = availableActions; - this.__explicitlySet__.add("availableActions"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -45,15 +40,6 @@ public Builder description(String description) { 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("lastAction") private LastAction lastAction; @@ -63,6 +49,15 @@ public Builder lastAction(LastAction lastAction) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("availableActions") + private java.util.List availableActions; + + public Builder availableActions(java.util.List availableActions) { + this.availableActions = availableActions; + this.__explicitlySet__.add("availableActions"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") private String lifecycleDetails; @@ -105,10 +100,10 @@ public Builder version(String version) { public Patch build() { Patch __instance__ = new Patch( - availableActions, - description, id, + description, lastAction, + availableActions, lifecycleDetails, lifecycleState, timeReleased, @@ -120,10 +115,10 @@ public Patch build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(Patch o) { Builder copiedBuilder = - availableActions(o.getAvailableActions()) + id(o.getId()) .description(o.getDescription()) - .id(o.getId()) .lastAction(o.getLastAction()) + .availableActions(o.getAvailableActions()) .lifecycleDetails(o.getLifecycleDetails()) .lifecycleState(o.getLifecycleState()) .timeReleased(o.getTimeReleased()) @@ -142,9 +137,21 @@ public static Builder builder() { } /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The text describing this patch package. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("description") + String description; + /** + * Action that is currently being performed or was completed last. **/ @lombok.extern.slf4j.Slf4j - public enum AvailableActions { + public enum LastAction { Apply("APPLY"), Precheck("PRECHECK"), @@ -155,18 +162,18 @@ public enum AvailableActions { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (AvailableActions v : AvailableActions.values()) { + for (LastAction v : LastAction.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - AvailableActions(String value) { + LastAction(String value) { this.value = value; } @@ -176,38 +183,25 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static AvailableActions create(String key) { + public static LastAction create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'AvailableActions', returning UnknownEnumValue", + "Received unknown value '{}' for enum 'LastAction', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * Actions that can possibly be performed using this patch. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("availableActions") - java.util.List availableActions; - - /** - * The text describing this patch package. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("description") - String description; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. + * Action that is currently being performed or was completed last. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("lastAction") + LastAction lastAction; /** - * Action that is currently being performed or was completed last. **/ @lombok.extern.slf4j.Slf4j - public enum LastAction { + public enum AvailableActions { Apply("APPLY"), Precheck("PRECHECK"), @@ -218,18 +212,18 @@ public enum LastAction { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (LastAction v : LastAction.values()) { + for (AvailableActions v : AvailableActions.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - LastAction(String value) { + AvailableActions(String value) { this.value = value; } @@ -239,21 +233,21 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static LastAction create(String key) { + public static AvailableActions create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'LastAction', returning UnknownEnumValue", + "Received unknown value '{}' for enum 'AvailableActions', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * Action that is currently being performed or was completed last. + * Actions that can possibly be performed using this patch. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lastAction") - LastAction lastAction; + @com.fasterxml.jackson.annotation.JsonProperty("availableActions") + java.util.List availableActions; /** * A descriptive text associated with the lifecycleState. 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 4151a489e7d..1ad6e874d72 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 @@ -25,15 +25,6 @@ public class PatchDetails { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("action") - private Action action; - - public Builder action(Action action) { - this.action = action; - this.__explicitlySet__.add("action"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("patchId") private String patchId; @@ -43,18 +34,27 @@ public Builder patchId(String patchId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("action") + private Action action; + + public Builder action(Action action) { + this.action = action; + this.__explicitlySet__.add("action"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public PatchDetails build() { - PatchDetails __instance__ = new PatchDetails(action, patchId); + PatchDetails __instance__ = new PatchDetails(patchId, action); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PatchDetails o) { - Builder copiedBuilder = action(o.getAction()).patchId(o.getPatchId()); + Builder copiedBuilder = patchId(o.getPatchId()).action(o.getAction()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -68,6 +68,11 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("patchId") + String patchId; /** * The action to perform on the patch. **/ @@ -109,12 +114,6 @@ public static Action create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("action") Action action; - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("patchId") - String patchId; - @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/PatchHistoryEntry.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntry.java index 801032b4145..62f60a13f8b 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 @@ -4,7 +4,7 @@ package com.oracle.bmc.database.model; /** - * The record of a patch action on a specified target. + * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in @@ -24,15 +24,6 @@ public class PatchHistoryEntry { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("action") - private Action action; - - public Builder action(Action action) { - this.action = action; - this.__explicitlySet__.add("action"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("id") private String id; @@ -42,12 +33,21 @@ public Builder id(String id) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("patchId") + private String patchId; - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); + public Builder patchId(String patchId) { + this.patchId = patchId; + this.__explicitlySet__.add("patchId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("action") + private Action action; + + public Builder action(Action action) { + this.action = action; + this.__explicitlySet__.add("action"); return this; } @@ -60,21 +60,12 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("patchId") - private String patchId; - - public Builder patchId(String patchId) { - this.patchId = patchId; - this.__explicitlySet__.add("patchId"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - private java.util.Date timeEnded; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder timeEnded(java.util.Date timeEnded) { - this.timeEnded = timeEnded; - this.__explicitlySet__.add("timeEnded"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } @@ -87,19 +78,28 @@ public Builder timeStarted(java.util.Date timeStarted) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + private java.util.Date timeEnded; + + public Builder timeEnded(java.util.Date timeEnded) { + this.timeEnded = timeEnded; + this.__explicitlySet__.add("timeEnded"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public PatchHistoryEntry build() { PatchHistoryEntry __instance__ = new PatchHistoryEntry( - action, id, - lifecycleDetails, - lifecycleState, patchId, - timeEnded, - timeStarted); + action, + lifecycleState, + lifecycleDetails, + timeStarted, + timeEnded); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -107,13 +107,13 @@ public PatchHistoryEntry build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PatchHistoryEntry o) { Builder copiedBuilder = - action(o.getAction()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) + id(o.getId()) .patchId(o.getPatchId()) - .timeEnded(o.getTimeEnded()) - .timeStarted(o.getTimeStarted()); + .action(o.getAction()) + .lifecycleState(o.getLifecycleState()) + .lifecycleDetails(o.getLifecycleDetails()) + .timeStarted(o.getTimeStarted()) + .timeEnded(o.getTimeEnded()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -127,6 +127,17 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch history entry. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("patchId") + String patchId; /** * The action being performed or was completed. **/ @@ -178,20 +189,6 @@ public static Action create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("action") Action action; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch history entry. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; - - /** - * A descriptive text associated with the lifecycleState. - * Typically contains additional displayable text. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; /** * The current state of the action. **/ @@ -246,16 +243,12 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("patchId") - String patchId; - - /** - * The date and time when the patch action completed. + * A descriptive text associated with the lifecycleState. + * Typically contains additional displayable text. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - java.util.Date timeEnded; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** * The date and time when the patch action started. @@ -263,6 +256,12 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") java.util.Date timeStarted; + /** + * The date and time when the patch action completed. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + java.util.Date timeEnded; + @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/PatchHistoryEntrySummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchHistoryEntrySummary.java index ab45c0828f5..8dc0a48e2ea 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 @@ -24,15 +24,6 @@ public class PatchHistoryEntrySummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("action") - private Action action; - - public Builder action(Action action) { - this.action = action; - this.__explicitlySet__.add("action"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("id") private String id; @@ -42,12 +33,21 @@ public Builder id(String id) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - private String lifecycleDetails; + @com.fasterxml.jackson.annotation.JsonProperty("patchId") + private String patchId; - public Builder lifecycleDetails(String lifecycleDetails) { - this.lifecycleDetails = lifecycleDetails; - this.__explicitlySet__.add("lifecycleDetails"); + public Builder patchId(String patchId) { + this.patchId = patchId; + this.__explicitlySet__.add("patchId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("action") + private Action action; + + public Builder action(Action action) { + this.action = action; + this.__explicitlySet__.add("action"); return this; } @@ -60,21 +60,12 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("patchId") - private String patchId; - - public Builder patchId(String patchId) { - this.patchId = patchId; - this.__explicitlySet__.add("patchId"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - private java.util.Date timeEnded; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + private String lifecycleDetails; - public Builder timeEnded(java.util.Date timeEnded) { - this.timeEnded = timeEnded; - this.__explicitlySet__.add("timeEnded"); + public Builder lifecycleDetails(String lifecycleDetails) { + this.lifecycleDetails = lifecycleDetails; + this.__explicitlySet__.add("lifecycleDetails"); return this; } @@ -87,19 +78,28 @@ public Builder timeStarted(java.util.Date timeStarted) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + private java.util.Date timeEnded; + + public Builder timeEnded(java.util.Date timeEnded) { + this.timeEnded = timeEnded; + this.__explicitlySet__.add("timeEnded"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public PatchHistoryEntrySummary build() { PatchHistoryEntrySummary __instance__ = new PatchHistoryEntrySummary( - action, id, - lifecycleDetails, - lifecycleState, patchId, - timeEnded, - timeStarted); + action, + lifecycleState, + lifecycleDetails, + timeStarted, + timeEnded); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -107,13 +107,13 @@ public PatchHistoryEntrySummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PatchHistoryEntrySummary o) { Builder copiedBuilder = - action(o.getAction()) - .id(o.getId()) - .lifecycleDetails(o.getLifecycleDetails()) - .lifecycleState(o.getLifecycleState()) + id(o.getId()) .patchId(o.getPatchId()) - .timeEnded(o.getTimeEnded()) - .timeStarted(o.getTimeStarted()); + .action(o.getAction()) + .lifecycleState(o.getLifecycleState()) + .lifecycleDetails(o.getLifecycleDetails()) + .timeStarted(o.getTimeStarted()) + .timeEnded(o.getTimeEnded()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -127,6 +127,17 @@ public static Builder builder() { return new Builder(); } + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch history entry. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("patchId") + String patchId; /** * The action being performed or was completed. **/ @@ -178,20 +189,6 @@ public static Action create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("action") Action action; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch history entry. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; - - /** - * A descriptive text associated with the lifecycleState. - * Typically contains additional displayable text. - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") - String lifecycleDetails; /** * The current state of the action. **/ @@ -246,16 +243,12 @@ public static LifecycleState create(String key) { LifecycleState lifecycleState; /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("patchId") - String patchId; - - /** - * The date and time when the patch action completed. + * A descriptive text associated with the lifecycleState. + * Typically contains additional displayable text. + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") - java.util.Date timeEnded; + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") + String lifecycleDetails; /** * The date and time when the patch action started. @@ -263,6 +256,12 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("timeStarted") java.util.Date timeStarted; + /** + * The date and time when the patch action completed. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeEnded") + java.util.Date timeEnded; + @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/PatchSummary.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/PatchSummary.java index 90bc7c09246..5c266410468 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 @@ -27,12 +27,12 @@ public class PatchSummary { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { - @com.fasterxml.jackson.annotation.JsonProperty("availableActions") - private java.util.List availableActions; + @com.fasterxml.jackson.annotation.JsonProperty("id") + private String id; - public Builder availableActions(java.util.List availableActions) { - this.availableActions = availableActions; - this.__explicitlySet__.add("availableActions"); + public Builder id(String id) { + this.id = id; + this.__explicitlySet__.add("id"); return this; } @@ -45,15 +45,6 @@ public Builder description(String description) { 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("lastAction") private LastAction lastAction; @@ -63,6 +54,15 @@ public Builder lastAction(LastAction lastAction) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("availableActions") + private java.util.List availableActions; + + public Builder availableActions(java.util.List availableActions) { + this.availableActions = availableActions; + this.__explicitlySet__.add("availableActions"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleDetails") private String lifecycleDetails; @@ -105,10 +105,10 @@ public Builder version(String version) { public PatchSummary build() { PatchSummary __instance__ = new PatchSummary( - availableActions, - description, id, + description, lastAction, + availableActions, lifecycleDetails, lifecycleState, timeReleased, @@ -120,10 +120,10 @@ public PatchSummary build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PatchSummary o) { Builder copiedBuilder = - availableActions(o.getAvailableActions()) + id(o.getId()) .description(o.getDescription()) - .id(o.getId()) .lastAction(o.getLastAction()) + .availableActions(o.getAvailableActions()) .lifecycleDetails(o.getLifecycleDetails()) .lifecycleState(o.getLifecycleState()) .timeReleased(o.getTimeReleased()) @@ -142,9 +142,21 @@ public static Builder builder() { } /** + * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The text describing this patch package. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("description") + String description; + /** + * Action that is currently being performed or was completed last. **/ @lombok.extern.slf4j.Slf4j - public enum AvailableActions { + public enum LastAction { Apply("APPLY"), Precheck("PRECHECK"), @@ -155,18 +167,18 @@ public enum AvailableActions { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (AvailableActions v : AvailableActions.values()) { + for (LastAction v : LastAction.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - AvailableActions(String value) { + LastAction(String value) { this.value = value; } @@ -176,38 +188,25 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static AvailableActions create(String key) { + public static LastAction create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'AvailableActions', returning UnknownEnumValue", + "Received unknown value '{}' for enum 'LastAction', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * Actions that can possibly be performed using this patch. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("availableActions") - java.util.List availableActions; - - /** - * The text describing this patch package. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("description") - String description; - - /** - * The [OCID](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm) of the patch. + * Action that is currently being performed or was completed last. **/ - @com.fasterxml.jackson.annotation.JsonProperty("id") - String id; + @com.fasterxml.jackson.annotation.JsonProperty("lastAction") + LastAction lastAction; /** - * Action that is currently being performed or was completed last. **/ @lombok.extern.slf4j.Slf4j - public enum LastAction { + public enum AvailableActions { Apply("APPLY"), Precheck("PRECHECK"), @@ -218,18 +217,18 @@ public enum LastAction { UnknownEnumValue(null); private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (LastAction v : LastAction.values()) { + for (AvailableActions v : AvailableActions.values()) { if (v != UnknownEnumValue) { map.put(v.getValue(), v); } } } - LastAction(String value) { + AvailableActions(String value) { this.value = value; } @@ -239,21 +238,21 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static LastAction create(String key) { + public static AvailableActions create(String key) { if (map.containsKey(key)) { return map.get(key); } LOG.warn( - "Received unknown value '{}' for enum 'LastAction', returning UnknownEnumValue", + "Received unknown value '{}' for enum 'AvailableActions', returning UnknownEnumValue", key); return UnknownEnumValue; } }; /** - * Action that is currently being performed or was completed last. + * Actions that can possibly be performed using this patch. **/ - @com.fasterxml.jackson.annotation.JsonProperty("lastAction") - LastAction lastAction; + @com.fasterxml.jackson.annotation.JsonProperty("availableActions") + java.util.List availableActions; /** * A descriptive text associated with the lifecycleState. 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 0e507d7191b..c31c97b1cf5 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 @@ -33,15 +33,6 @@ public Builder databaseSCN(String databaseSCN) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("latest") - private Boolean latest; - - public Builder latest(Boolean latest) { - this.latest = latest; - this.__explicitlySet__.add("latest"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("timestamp") private java.util.Date timestamp; @@ -51,12 +42,21 @@ public Builder timestamp(java.util.Date timestamp) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("latest") + private Boolean latest; + + public Builder latest(Boolean latest) { + this.latest = latest; + this.__explicitlySet__.add("latest"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public RestoreDatabaseDetails build() { RestoreDatabaseDetails __instance__ = - new RestoreDatabaseDetails(databaseSCN, latest, timestamp); + new RestoreDatabaseDetails(databaseSCN, timestamp, latest); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -65,8 +65,8 @@ public RestoreDatabaseDetails build() { public Builder copy(RestoreDatabaseDetails o) { Builder copiedBuilder = databaseSCN(o.getDatabaseSCN()) - .latest(o.getLatest()) - .timestamp(o.getTimestamp()); + .timestamp(o.getTimestamp()) + .latest(o.getLatest()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -88,18 +88,18 @@ public static Builder builder() { String databaseSCN; /** - * Restores to the last known good state with the least possible data loss. + * Restores to the timestamp specified. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("latest") - Boolean latest; + @com.fasterxml.jackson.annotation.JsonProperty("timestamp") + java.util.Date timestamp; /** - * Restores to the timestamp specified. + * Restores to the last known good state with the least possible data loss. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("timestamp") - java.util.Date timestamp; + @com.fasterxml.jackson.annotation.JsonProperty("latest") + Boolean latest; @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/UpdateAutonomousDataWarehouseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateAutonomousDataWarehouseDetails.java index 6fb3b952080..e99affed39a 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateAutonomousDataWarehouseDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateAutonomousDataWarehouseDetails.java @@ -27,15 +27,6 @@ public class UpdateAutonomousDataWarehouseDetails { @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("cpuCoreCount") private Integer cpuCoreCount; @@ -54,16 +45,6 @@ public Builder dataStorageSizeInTBs(Integer dataStorageSizeInTBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; - - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -73,6 +54,15 @@ public Builder displayName(String displayName) { return this; } + @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("freeformTags") private java.util.Map freeformTags; @@ -82,18 +72,28 @@ public Builder freeformTags(java.util.Map freeformTags) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public UpdateAutonomousDataWarehouseDetails build() { UpdateAutonomousDataWarehouseDetails __instance__ = new UpdateAutonomousDataWarehouseDetails( - adminPassword, cpuCoreCount, dataStorageSizeInTBs, - definedTags, displayName, - freeformTags); + adminPassword, + freeformTags, + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -101,12 +101,12 @@ public UpdateAutonomousDataWarehouseDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateAutonomousDataWarehouseDetails o) { Builder copiedBuilder = - adminPassword(o.getAdminPassword()) - .cpuCoreCount(o.getCpuCoreCount()) + cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInTBs(o.getDataStorageSizeInTBs()) - .definedTags(o.getDefinedTags()) .displayName(o.getDisplayName()) - .freeformTags(o.getFreeformTags()); + .adminPassword(o.getAdminPassword()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -120,12 +120,6 @@ public static Builder builder() { return new Builder(); } - /** - * A strong password for Admin. The password must be between 12 and 60 characters long, and must contain at least 1 uppercase, 1 lowercase and 2 numeric characters. It cannot contain the double quote symbol (\"). It must be different than the last 4 passwords. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") - String adminPassword; - /** * The number of CPU cores to be made available to the database. **/ @@ -139,22 +133,18 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") Integer dataStorageSizeInTBs; - /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; - /** * The user-friendly name for the Autonomous Data Warehouse. The name does not have to be unique. **/ @com.fasterxml.jackson.annotation.JsonProperty("displayName") String displayName; + /** + * The password must be between 12 and 30 characters long, and must contain at least 1 uppercase, 1 lowercase, and 1 numeric character. It cannot contain the double quote symbol (\") or the username \"admin\", regardless of casing. It must be different from the last four passwords and it must not be a password used within the last 24 hours. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") + String adminPassword; + /** * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). @@ -165,6 +155,16 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") java.util.Map freeformTags; + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + @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/UpdateAutonomousDatabaseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateAutonomousDatabaseDetails.java index be108343681..854a807aea2 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateAutonomousDatabaseDetails.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateAutonomousDatabaseDetails.java @@ -27,15 +27,6 @@ public class UpdateAutonomousDatabaseDetails { @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("cpuCoreCount") private Integer cpuCoreCount; @@ -54,16 +45,6 @@ public Builder dataStorageSizeInTBs(Integer dataStorageSizeInTBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; - - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("displayName") private String displayName; @@ -73,6 +54,15 @@ public Builder displayName(String displayName) { return this; } + @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("freeformTags") private java.util.Map freeformTags; @@ -82,18 +72,28 @@ public Builder freeformTags(java.util.Map freeformTags) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public UpdateAutonomousDatabaseDetails build() { UpdateAutonomousDatabaseDetails __instance__ = new UpdateAutonomousDatabaseDetails( - adminPassword, cpuCoreCount, dataStorageSizeInTBs, - definedTags, displayName, - freeformTags); + adminPassword, + freeformTags, + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -101,12 +101,12 @@ public UpdateAutonomousDatabaseDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateAutonomousDatabaseDetails o) { Builder copiedBuilder = - adminPassword(o.getAdminPassword()) - .cpuCoreCount(o.getCpuCoreCount()) + cpuCoreCount(o.getCpuCoreCount()) .dataStorageSizeInTBs(o.getDataStorageSizeInTBs()) - .definedTags(o.getDefinedTags()) .displayName(o.getDisplayName()) - .freeformTags(o.getFreeformTags()); + .adminPassword(o.getAdminPassword()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -120,12 +120,6 @@ public static Builder builder() { return new Builder(); } - /** - * A strong password for Admin. The password must be between 12 and 60 characters long, and must contain at least 1 uppercase, 1 lowercase and 2 numeric characters. It cannot contain the double quote symbol (\"). It must be different than the last 4 passwords. - **/ - @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") - String adminPassword; - /** * The number of CPU cores to be made available to the database. **/ @@ -139,22 +133,18 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInTBs") Integer dataStorageSizeInTBs; - /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` - * - **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; - /** * The user-friendly name for the Autonomous Database. The name does not have to be unique. **/ @com.fasterxml.jackson.annotation.JsonProperty("displayName") String displayName; + /** + * The password must be between 12 and 30 characters long, and must contain at least 1 uppercase, 1 lowercase, and 1 numeric character. It cannot contain the double quote symbol (\") or the username \"admin\", regardless of casing. It must be different from the last four passwords and it must not be a password used within the last 24 hours. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("adminPassword") + String adminPassword; + /** * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). @@ -165,6 +155,16 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") java.util.Map freeformTags; + /** + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + @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/UpdateDatabaseDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDatabaseDetails.java index a02260fd9fe..850b1d2c8c6 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 @@ -36,6 +36,15 @@ public Builder dbBackupConfig(DbBackupConfig dbBackupConfig) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") private java.util.Map> definedTags; @@ -46,21 +55,12 @@ public Builder definedTags( return this; } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - private java.util.Map freeformTags; - - public Builder freeformTags(java.util.Map freeformTags) { - this.freeformTags = freeformTags; - this.__explicitlySet__.add("freeformTags"); - return this; - } - @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public UpdateDatabaseDetails build() { UpdateDatabaseDetails __instance__ = - new UpdateDatabaseDetails(dbBackupConfig, definedTags, freeformTags); + new UpdateDatabaseDetails(dbBackupConfig, freeformTags, definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -69,8 +69,8 @@ public UpdateDatabaseDetails build() { public Builder copy(UpdateDatabaseDetails o) { Builder copiedBuilder = dbBackupConfig(o.getDbBackupConfig()) - .definedTags(o.getDefinedTags()) - .freeformTags(o.getFreeformTags()); + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -88,24 +88,24 @@ public static Builder builder() { DbBackupConfig dbBackupConfig; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). *

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

- * Example: `{\"Department\": \"Finance\"}` + * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` * **/ - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") - java.util.Map freeformTags; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbSystemDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/UpdateDbSystemDetails.java index 90134718d88..3ab5b8e5fa0 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 @@ -36,6 +36,24 @@ public Builder cpuCoreCount(Integer cpuCoreCount) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("version") + private PatchDetails version; + + public Builder version(PatchDetails version) { + this.version = version; + this.__explicitlySet__.add("version"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + private java.util.List sshPublicKeys; + + public Builder sshPublicKeys(java.util.List sshPublicKeys) { + this.sshPublicKeys = sshPublicKeys; + this.__explicitlySet__.add("sshPublicKeys"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") private Integer dataStorageSizeInGBs; @@ -45,16 +63,6 @@ public Builder dataStorageSizeInGBs(Integer dataStorageSizeInGBs) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - private java.util.Map> definedTags; - - public Builder definedTags( - java.util.Map> definedTags) { - this.definedTags = definedTags; - this.__explicitlySet__.add("definedTags"); - return this; - } - @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") private java.util.Map freeformTags; @@ -64,21 +72,13 @@ public Builder freeformTags(java.util.Map freeformTags) { return this; } - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - private java.util.List sshPublicKeys; - - public Builder sshPublicKeys(java.util.List sshPublicKeys) { - this.sshPublicKeys = sshPublicKeys; - this.__explicitlySet__.add("sshPublicKeys"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonProperty("version") - private PatchDetails version; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; - public Builder version(PatchDetails version) { - this.version = version; - this.__explicitlySet__.add("version"); + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); return this; } @@ -89,11 +89,11 @@ public UpdateDbSystemDetails build() { UpdateDbSystemDetails __instance__ = new UpdateDbSystemDetails( cpuCoreCount, + version, + sshPublicKeys, dataStorageSizeInGBs, - definedTags, freeformTags, - sshPublicKeys, - version); + definedTags); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -102,11 +102,11 @@ public UpdateDbSystemDetails build() { public Builder copy(UpdateDbSystemDetails o) { Builder copiedBuilder = cpuCoreCount(o.getCpuCoreCount()) + .version(o.getVersion()) + .sshPublicKeys(o.getSshPublicKeys()) .dataStorageSizeInGBs(o.getDataStorageSizeInGBs()) - .definedTags(o.getDefinedTags()) .freeformTags(o.getFreeformTags()) - .sshPublicKeys(o.getSshPublicKeys()) - .version(o.getVersion()); + .definedTags(o.getDefinedTags()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -126,22 +126,21 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("cpuCoreCount") Integer cpuCoreCount; + @com.fasterxml.jackson.annotation.JsonProperty("version") + PatchDetails version; + /** - * The size, in gigabytes, to scale the attached storage up to for this virtual machine DB system. This value must be greater than current storage size. Note that the resulting total storage size attached will be greater than the amount requested to allow for REDO/RECO space and software volume. Applies only to virtual machine DB systems. - * + * The public key portion of the key pair to use for SSH access to the DB system. Multiple public keys can be provided. The length of the combined keys cannot exceed 10,000 characters. **/ - @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") - Integer dataStorageSizeInGBs; + @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") + java.util.List sshPublicKeys; /** - * Defined tags for this resource. Each key is predefined and scoped to a namespace. - * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). - *

- * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * The size, in gigabytes, to scale the attached storage up to for this virtual machine DB system. This value must be greater than current storage size. Note that the resulting total storage size attached will be greater than the amount requested to allow for REDO/RECO space and software volume. Applies only to virtual machine DB systems. * **/ - @com.fasterxml.jackson.annotation.JsonProperty("definedTags") - java.util.Map> definedTags; + @com.fasterxml.jackson.annotation.JsonProperty("dataStorageSizeInGBs") + Integer dataStorageSizeInGBs; /** * Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. @@ -154,13 +153,14 @@ public static Builder builder() { java.util.Map freeformTags; /** - * The public key portion of the key pair to use for SSH access to the DB system. Multiple public keys can be provided. The length of the combined keys cannot exceed 10,000 characters. + * Defined tags for this resource. Each key is predefined and scoped to a namespace. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + *

+ * Example: `{\"Operations\": {\"CostCenter\": \"42\"}}` + * **/ - @com.fasterxml.jackson.annotation.JsonProperty("sshPublicKeys") - java.util.List sshPublicKeys; - - @com.fasterxml.jackson.annotation.JsonProperty("version") - PatchDetails version; + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; @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/responses/GenerateAutonomousDataWarehouseWalletResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/GenerateAutonomousDataWarehouseWalletResponse.java index afca7aa54df..e60dc6d4deb 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/GenerateAutonomousDataWarehouseWalletResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/GenerateAutonomousDataWarehouseWalletResponse.java @@ -10,21 +10,11 @@ @lombok.Getter public class GenerateAutonomousDataWarehouseWalletResponse { - /** - * Size of the file. - */ - private Long contentLength; - /** * For optimistic concurrency control. See `if-match`. */ private String etag; - /** - * The date and time the wallet was created, as described in [RFC 3339](https://tools.ietf.org/rfc/rfc3339), section 14.29. - */ - private java.util.Date lastModified; - /** * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about * a particular request, please provide the request ID. @@ -32,6 +22,16 @@ public class GenerateAutonomousDataWarehouseWalletResponse { */ private String opcRequestId; + /** + * Size of the file. + */ + private Long contentLength; + + /** + * The date and time the wallet was created, as described in [RFC 3339](https://tools.ietf.org/rfc/rfc3339), section 14.29. + */ + private java.util.Date lastModified; + /** * The returned java.io.InputStream instance. */ @@ -43,10 +43,10 @@ public static class Builder { * @return this builder instance */ public Builder copy(GenerateAutonomousDataWarehouseWalletResponse o) { - contentLength(o.getContentLength()); etag(o.getEtag()); - lastModified(o.getLastModified()); opcRequestId(o.getOpcRequestId()); + contentLength(o.getContentLength()); + lastModified(o.getLastModified()); inputStream(o.getInputStream()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/GenerateAutonomousDatabaseWalletResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/GenerateAutonomousDatabaseWalletResponse.java index 1e4ee8c68c4..b622222760b 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/GenerateAutonomousDatabaseWalletResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/GenerateAutonomousDatabaseWalletResponse.java @@ -10,21 +10,11 @@ @lombok.Getter public class GenerateAutonomousDatabaseWalletResponse { - /** - * Size of the file. - */ - private Long contentLength; - /** * For optimistic concurrency control. See `if-match`. */ private String etag; - /** - * The date and time the wallet was created, as described in [RFC 3339](https://tools.ietf.org/rfc/rfc3339), section 14.29. - */ - private java.util.Date lastModified; - /** * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about * a particular request, please provide the request ID. @@ -32,6 +22,16 @@ public class GenerateAutonomousDatabaseWalletResponse { */ private String opcRequestId; + /** + * Size of the file. + */ + private Long contentLength; + + /** + * The date and time the wallet was created, as described in [RFC 3339](https://tools.ietf.org/rfc/rfc3339), section 14.29. + */ + private java.util.Date lastModified; + /** * The returned java.io.InputStream instance. */ @@ -43,10 +43,10 @@ public static class Builder { * @return this builder instance */ public Builder copy(GenerateAutonomousDatabaseWalletResponse o) { - contentLength(o.getContentLength()); etag(o.getEtag()); - lastModified(o.getLastModified()); opcRequestId(o.getOpcRequestId()); + contentLength(o.getContentLength()); + lastModified(o.getLastModified()); inputStream(o.getInputStream()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDataWarehouseBackupsResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDataWarehouseBackupsResponse.java index 6ebc6cc3498..7e97d2c0ee3 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDataWarehouseBackupsResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDataWarehouseBackupsResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListAutonomousDataWarehouseBackupsResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListAutonomousDataWarehouseBackupsResponse { */ 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 AutonomousDataWarehouseBackupSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListAutonomousDataWarehouseBackupsResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDataWarehousesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDataWarehousesResponse.java index bb247ee1ff7..f79d5e319ed 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDataWarehousesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDataWarehousesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListAutonomousDataWarehousesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListAutonomousDataWarehousesResponse { */ 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 AutonomousDataWarehouseSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListAutonomousDataWarehousesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDatabaseBackupsResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDatabaseBackupsResponse.java index c17f1cbe5a7..774c2e176f5 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDatabaseBackupsResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDatabaseBackupsResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListAutonomousDatabaseBackupsResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListAutonomousDatabaseBackupsResponse { */ 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 AutonomousDatabaseBackupSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListAutonomousDatabaseBackupsResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDatabasesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDatabasesResponse.java index 16a1853ebe1..26a74242981 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDatabasesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListAutonomousDatabasesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListAutonomousDatabasesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListAutonomousDatabasesResponse { */ 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 AutonomousDatabaseSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListAutonomousDatabasesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListBackupsResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListBackupsResponse.java index 318ebed16fb..866e91722e8 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListBackupsResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListBackupsResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListBackupsResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListBackupsResponse { */ 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 BackupSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListBackupsResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDataGuardAssociationsResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDataGuardAssociationsResponse.java index 4624dfc358b..a7e200c93ff 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDataGuardAssociationsResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDataGuardAssociationsResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDataGuardAssociationsResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDataGuardAssociationsResponse { */ 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 DataGuardAssociationSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDataGuardAssociationsResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDatabasesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDatabasesResponse.java index 702c63f7d90..dda7cc1c3c6 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDatabasesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDatabasesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDatabasesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDatabasesResponse { */ 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 DatabaseSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDatabasesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomePatchHistoryEntriesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomePatchHistoryEntriesResponse.java index 24c918ba027..5b39faf36c6 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomePatchHistoryEntriesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomePatchHistoryEntriesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbHomePatchHistoryEntriesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbHomePatchHistoryEntriesResponse { */ 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 PatchHistoryEntrySummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbHomePatchHistoryEntriesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomePatchesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomePatchesResponse.java index 42ad6aefac5..a3898d3c366 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomePatchesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomePatchesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbHomePatchesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbHomePatchesResponse { */ 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 PatchSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbHomePatchesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomesResponse.java index 5b12e36d879..e17d1b5f054 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbHomesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbHomesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbHomesResponse { */ 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 DbHomeSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbHomesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbNodesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbNodesResponse.java index 69db2df05d5..4c28c715724 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbNodesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbNodesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbNodesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbNodesResponse { */ 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 DbNodeSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbNodesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemPatchHistoryEntriesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemPatchHistoryEntriesResponse.java index 2c21ab38673..aaa862f6d63 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemPatchHistoryEntriesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemPatchHistoryEntriesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbSystemPatchHistoryEntriesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbSystemPatchHistoryEntriesResponse { */ 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 PatchHistoryEntrySummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbSystemPatchHistoryEntriesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemPatchesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemPatchesResponse.java index 3da2050d666..a08869c6a5e 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemPatchesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemPatchesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbSystemPatchesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbSystemPatchesResponse { */ 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 PatchSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbSystemPatchesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemShapesResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemShapesResponse.java index a585711c46a..64060411efa 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemShapesResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemShapesResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbSystemShapesResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbSystemShapesResponse { */ 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 DbSystemShapeSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbSystemShapesResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemsResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemsResponse.java index 83458a9f0d3..85477090b2b 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemsResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbSystemsResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbSystemsResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbSystemsResponse { */ 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 DbSystemSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbSystemsResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbVersionsResponse.java b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbVersionsResponse.java index 81a02558d09..af61a683be2 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbVersionsResponse.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/responses/ListDbVersionsResponse.java @@ -10,6 +10,13 @@ @lombok.Getter public class ListDbVersionsResponse { + /** + * 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; + /** * For pagination of a list of items. When paging through a list, if this header appears in the response, * then there are additional items still to get. Include this value as the `page` parameter for the @@ -19,13 +26,6 @@ public class ListDbVersionsResponse { */ 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 DbVersionSummary instances. */ @@ -37,8 +37,8 @@ public static class Builder { * @return this builder instance */ public Builder copy(ListDbVersionsResponse o) { - opcNextPage(o.getOpcNextPage()); opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); items(o.getItems()); return this; diff --git a/bmc-dns/pom.xml b/bmc-dns/pom.xml index d3bce4ccee4..35d7118339e 100644 --- a/bmc-dns/pom.xml +++ b/bmc-dns/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/Dns.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/Dns.java index 33b9c68c751..d4a83f4bd66 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/Dns.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/Dns.java @@ -65,8 +65,8 @@ public interface Dns extends AutoCloseable { DeleteRRSetResponse deleteRRSet(DeleteRRSetRequest request); /** - * Deletes the specified zone. A `204` response indicates that zone has been - * successfully deleted. + * Deletes the specified zone. A `204` response indicates that zone has been successfully + * deleted. * * @param request The request object containing the details to send * @return A response object containing details about the completed operation @@ -108,7 +108,7 @@ public interface Dns extends AutoCloseable { /** * Gets all records in the specified zone. The results are * sorted by `domain` in alphabetical order by default. For more - * information about records, please see [Resource Record (RR) TYPEs](https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4). + * information about records, see [Resource Record (RR) TYPEs](https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4). * * @param request The request object containing the details to send * @return A response object containing details about the completed operation @@ -127,7 +127,7 @@ public interface Dns extends AutoCloseable { ListZonesResponse listZones(ListZonesRequest request); /** - * Replaces records in the specified zone at a domain. You can update one record or all records for the specified zone depending on the changes provided in the request body. You can also add or remove records using this function. + * Updates records in the specified zone at a domain. You can update one record or all records for the specified zone depending on the changes provided in the request body. You can also add or remove records using this function. * @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. @@ -179,7 +179,7 @@ public interface Dns extends AutoCloseable { /** * Updates the specified secondary zone with your new external master * server information. For more information about secondary zone, see - * [Manage DNS Service Zone](https://docs.us-phoenix-1.oraclecloud.com/Content/DNS/Tasks/managingdnszones.htm). + * [Manage DNS Service Zone](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/DNS/Tasks/managingdnszones.htm). * * @param request The request object containing the details to send * @return A response object containing details about the completed operation diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsAsync.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsAsync.java index a76d552a34e..4fb75caaf1a 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsAsync.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/DnsAsync.java @@ -85,8 +85,8 @@ java.util.concurrent.Future deleteRRSet( com.oracle.bmc.responses.AsyncHandler handler); /** - * Deletes the specified zone. A `204` response indicates that zone has been - * successfully deleted. + * Deletes the specified zone. A `204` response indicates that zone has been successfully + * deleted. * * * @param request The request object containing the details to send @@ -153,7 +153,7 @@ java.util.concurrent.Future getZone( /** * Gets all records in the specified zone. The results are * sorted by `domain` in alphabetical order by default. For more - * information about records, please see [Resource Record (RR) TYPEs](https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4). + * information about records, see [Resource Record (RR) TYPEs](https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-4). * * * @param request The request object containing the details to send @@ -185,7 +185,7 @@ java.util.concurrent.Future listZones( com.oracle.bmc.responses.AsyncHandler handler); /** - * Replaces records in the specified zone at a domain. You can update one record or all records for the specified zone depending on the changes provided in the request body. You can also add or remove records using this function. + * Updates records in the specified zone at a domain. You can update one record or all records for the specified zone depending on the changes provided in the request body. You can also add or remove records using this function. * * @param request The request object containing the details to send * @param handler The request handler to invoke upon completion, may be null. @@ -272,7 +272,7 @@ java.util.concurrent.Future updateRRSet( /** * Updates the specified secondary zone with your new external master * server information. For more information about secondary zone, see - * [Manage DNS Service Zone](https://docs.us-phoenix-1.oraclecloud.com/Content/DNS/Tasks/managingdnszones.htm). + * [Manage DNS Service Zone](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/DNS/Tasks/managingdnszones.htm). * * * @param request The request object containing the details to send diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/ListZonesConverter.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/ListZonesConverter.java index 56dd71c70e9..790d9c4301b 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/ListZonesConverter.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/internal/http/ListZonesConverter.java @@ -90,6 +90,14 @@ public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( request.getTimeCreatedLessThan())); } + if (request.getLifecycleState() != null) { + target = + target.queryParam( + "lifecycleState", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getLifecycleState().getValue())); + } + if (request.getSortBy() != null) { target = target.queryParam( @@ -106,14 +114,6 @@ public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( request.getSortOrder().getValue())); } - if (request.getLifecycleState() != null) { - target = - target.queryParam( - "lifecycleState", - com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( - request.getLifecycleState().getValue())); - } - com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/CreateZoneDetails.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/CreateZoneDetails.java index 047ddc1a9ec..f2775915e2c 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/CreateZoneDetails.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/CreateZoneDetails.java @@ -5,6 +5,8 @@ /** * The body for defining a new zone. + *

+ *Warning:* Oracle recommends that you avoid using any confidential information when you supply string values using the API. * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields @@ -52,6 +54,25 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("externalMasters") private java.util.List externalMasters; @@ -66,7 +87,13 @@ public Builder externalMasters(java.util.List externalMasters) { public CreateZoneDetails build() { CreateZoneDetails __instance__ = - new CreateZoneDetails(name, zoneType, compartmentId, externalMasters); + new CreateZoneDetails( + name, + zoneType, + compartmentId, + freeformTags, + definedTags, + externalMasters); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -77,6 +104,8 @@ public Builder copy(CreateZoneDetails o) { name(o.getName()) .zoneType(o.getZoneType()) .compartmentId(o.getCompartmentId()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) .externalMasters(o.getExternalMasters()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); @@ -146,7 +175,26 @@ public static ZoneType create(String key) { String compartmentId; /** - * External master servers for the zone. + * Simple key-value pair that is applied without any predefined name, type, or scope. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + * Example: `{\"bar-key\": \"value\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + + /** + * Usage of predefined tag keys. These predefined keys are scoped to a namespace. + * Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + + /** + * External master servers for the zone. `externalMasters` becomes a + * required parameter when the `zoneType` value is `SECONDARY`. + * **/ @com.fasterxml.jackson.annotation.JsonProperty("externalMasters") java.util.List externalMasters; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/ExternalMaster.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/ExternalMaster.java index 0c05060c295..a23982b6edc 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/ExternalMaster.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/ExternalMaster.java @@ -81,7 +81,9 @@ public static Builder builder() { String address; /** - * The server's port. + * The server's port. Port value must be a value of 53, otherwise omit + * the port value. + * **/ @com.fasterxml.jackson.annotation.JsonProperty("port") Integer port; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Nameserver.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Nameserver.java new file mode 100644 index 00000000000..5c9885d417d --- /dev/null +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Nameserver.java @@ -0,0 +1,67 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.dns.model; + +/** + * A server that has been set up to answer DNS queries for a zone. + *
+ * Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields + * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in + * the setter methods of the {@link Builder}, which maintain a set of all explicitly set fields called + * {@link #__explicitlySet__}. The {@link #hashCode()} and {@link #equals(Object)} methods are implemented to take + * {@link #__explicitlySet__} into account. The constructor, on the other hand, does not set {@link #__explicitlySet__} + * (since the constructor cannot distinguish explicit {@code null} from unset {@code null}). + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") +@lombok.AllArgsConstructor(onConstructor = @__({@Deprecated})) +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = Nameserver.Builder.class) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class Nameserver { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + private String hostname; + + public Builder hostname(String hostname) { + this.hostname = hostname; + this.__explicitlySet__.add("hostname"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public Nameserver build() { + Nameserver __instance__ = new Nameserver(hostname); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(Nameserver o) { + Builder copiedBuilder = hostname(o.getHostname()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The hostname of the nameserver. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("hostname") + String hostname; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Record.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Record.java index 7ad6669df1b..301d2e8ea22 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Record.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Record.java @@ -142,7 +142,9 @@ public static Builder builder() { /** * The record's data, as whitespace-delimited tokens in - * type-specific presentation format. + * type-specific presentation format. All RDATA is normalized and the + * returned presentation of your RDATA may differ from its initial input. + * For more information about RDATA, see [Supported DNS Resource Record Types](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/DNS/Reference/supporteddnsresource.htm) * **/ @com.fasterxml.jackson.annotation.JsonProperty("rdata") diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/RecordDetails.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/RecordDetails.java index edc0447f3b1..19717a33d97 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/RecordDetails.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/RecordDetails.java @@ -143,7 +143,9 @@ public static Builder builder() { /** * The record's data, as whitespace-delimited tokens in - * type-specific presentation format. + * type-specific presentation format. All RDATA is normalized and the + * returned presentation of your RDATA may differ from its initial input. + * For more information about RDATA, see [Supported DNS Resource Record Types](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/DNS/Reference/supporteddnsresource.htm) * **/ @com.fasterxml.jackson.annotation.JsonProperty("rdata") diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/RecordOperation.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/RecordOperation.java index dd7d8d6c42d..ad079dee5c4 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/RecordOperation.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/RecordOperation.java @@ -163,7 +163,9 @@ public static Builder builder() { /** * The record's data, as whitespace-delimited tokens in - * type-specific presentation format. + * type-specific presentation format. All RDATA is normalized and the + * returned presentation of your RDATA may differ from its initial input. + * For more information about RDATA, see [Supported DNS Resource Record Types](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/DNS/Reference/supporteddnsresource.htm) * **/ @com.fasterxml.jackson.annotation.JsonProperty("rdata") diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/TSIG.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/TSIG.java index bfdd8a8aad6..ac5e68819df 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/TSIG.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/TSIG.java @@ -89,8 +89,9 @@ public static Builder builder() { /** * TSIG Algorithms are encoded as domain names, but most consist of only one - * non-empty label, which is not required to be explicitly absolute. For a - * full list of TSIG algorithms, see [Secret Key Transaction Authentication for DNS (TSIG) Algorithm Names](http://www.iana.org/assignments/tsig-algorithm-names/tsig-algorithm-names.xhtml#tsig-algorithm-names-1) + * non-empty label, which is not required to be explicitly absolute. + * Applicable algorithms include: hmac-sha1, hmac-sha224, hmac-sha256, + * hmac-sha512. For more information on these algorithms, see [RFC 4635](https://tools.ietf.org/html/rfc4635#section-2). * **/ @com.fasterxml.jackson.annotation.JsonProperty("algorithm") diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/UpdateZoneDetails.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/UpdateZoneDetails.java index 32950d02f2f..471326f559c 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/UpdateZoneDetails.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/UpdateZoneDetails.java @@ -5,6 +5,9 @@ /** * The body for updating a zone. + *

+ *Warning:* Oracle recommends that you avoid using any confidential information when you supply string values using the API. + * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in @@ -24,6 +27,25 @@ public class UpdateZoneDetails { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @lombok.experimental.Accessors(fluent = true) public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("externalMasters") private java.util.List externalMasters; @@ -37,14 +59,18 @@ public Builder externalMasters(java.util.List externalMasters) { private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public UpdateZoneDetails build() { - UpdateZoneDetails __instance__ = new UpdateZoneDetails(externalMasters); + UpdateZoneDetails __instance__ = + new UpdateZoneDetails(freeformTags, definedTags, externalMasters); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(UpdateZoneDetails o) { - Builder copiedBuilder = externalMasters(o.getExternalMasters()); + Builder copiedBuilder = + freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) + .externalMasters(o.getExternalMasters()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -59,7 +85,26 @@ public static Builder builder() { } /** - * External master servers for the zone. + * Simple key-value pair that is applied without any predefined name, type, or scope. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + * Example: `{\"bar-key\": \"value\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + + /** + * Usage of predefined tag keys. These predefined keys are scoped to a namespace. + * Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + + /** + * External master servers for the zone. `externalMasters` becomes a + * required parameter when the `zoneType` value is `SECONDARY`. + * **/ @com.fasterxml.jackson.annotation.JsonProperty("externalMasters") java.util.List externalMasters; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Zone.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Zone.java index 1b9cbbff90a..91c9adb3dbd 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Zone.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/Zone.java @@ -5,6 +5,9 @@ /** * A DNS zone. + *

+ *Warning:* Oracle recommends that you avoid using any confidential information when you supply string values using the API. + * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in @@ -49,6 +52,25 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("externalMasters") private java.util.List externalMasters; @@ -112,6 +134,15 @@ public Builder lifecycleState(LifecycleState lifecycleState) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("nameservers") + private java.util.List nameservers; + + public Builder nameservers(java.util.List nameservers) { + this.nameservers = nameservers; + this.__explicitlySet__.add("nameservers"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -121,13 +152,16 @@ public Zone build() { name, zoneType, compartmentId, + freeformTags, + definedTags, externalMasters, self, id, timeCreated, version, serial, - lifecycleState); + lifecycleState, + nameservers); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -138,13 +172,16 @@ public Builder copy(Zone o) { name(o.getName()) .zoneType(o.getZoneType()) .compartmentId(o.getCompartmentId()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) .externalMasters(o.getExternalMasters()) .self(o.getSelf()) .id(o.getId()) .timeCreated(o.getTimeCreated()) .version(o.getVersion()) .serial(o.getSerial()) - .lifecycleState(o.getLifecycleState()); + .lifecycleState(o.getLifecycleState()) + .nameservers(o.getNameservers()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -224,7 +261,26 @@ public static ZoneType create(String key) { String compartmentId; /** - * External master servers for the zone. + * Simple key-value pair that is applied without any predefined name, type, or scope. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + * Example: `{\"bar-key\": \"value\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + + /** + * Usage of predefined tag keys. These predefined keys are scoped to a namespace. + * Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + + /** + * External master servers for the zone. `externalMasters` becomes a + * required parameter when the `zoneType` value is `SECONDARY`. + * **/ @com.fasterxml.jackson.annotation.JsonProperty("externalMasters") java.util.List externalMasters; @@ -242,7 +298,7 @@ public static ZoneType create(String key) { String id; /** - * The date and time the image was created in \"YYYY-MM-ddThh:mmZ\" format + * The date and time the resource was created in \"YYYY-MM-ddThh:mmZ\" format * with a Z offset, as defined by RFC 3339. *

**Example:** `2016-07-22T17:23:59:60Z` @@ -321,6 +377,12 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") LifecycleState lifecycleState; + /** + * The authoritative nameservers for the zone. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("nameservers") + java.util.List nameservers; + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/ZoneSummary.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/ZoneSummary.java index be37e25bc48..04277854d69 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/model/ZoneSummary.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/model/ZoneSummary.java @@ -5,6 +5,9 @@ /** * A DNS zone. + *

+ *Warning:* Oracle recommends that you avoid using any confidential information when you supply string values using the API. + * *
* Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in @@ -49,6 +52,25 @@ public Builder compartmentId(String compartmentId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + private java.util.Map freeformTags; + + public Builder freeformTags(java.util.Map freeformTags) { + this.freeformTags = freeformTags; + this.__explicitlySet__.add("freeformTags"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + private java.util.Map> definedTags; + + public Builder definedTags( + java.util.Map> definedTags) { + this.definedTags = definedTags; + this.__explicitlySet__.add("definedTags"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("self") private String self; @@ -94,13 +116,32 @@ public Builder serial(Long serial) { 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.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public ZoneSummary build() { ZoneSummary __instance__ = new ZoneSummary( - name, zoneType, compartmentId, self, id, timeCreated, version, serial); + name, + zoneType, + compartmentId, + freeformTags, + definedTags, + self, + id, + timeCreated, + version, + serial, + lifecycleState); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -111,11 +152,14 @@ public Builder copy(ZoneSummary o) { name(o.getName()) .zoneType(o.getZoneType()) .compartmentId(o.getCompartmentId()) + .freeformTags(o.getFreeformTags()) + .definedTags(o.getDefinedTags()) .self(o.getSelf()) .id(o.getId()) .timeCreated(o.getTimeCreated()) .version(o.getVersion()) - .serial(o.getSerial()); + .serial(o.getSerial()) + .lifecycleState(o.getLifecycleState()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -194,6 +238,23 @@ public static ZoneType create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") String compartmentId; + /** + * Simple key-value pair that is applied without any predefined name, type, or scope. + * For more information, see [Resource Tags](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/resourcetags.htm). + * Example: `{\"bar-key\": \"value\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") + java.util.Map freeformTags; + + /** + * Usage of predefined tag keys. These predefined keys are scoped to a namespace. + * Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("definedTags") + java.util.Map> definedTags; + /** * The canonical absolute URL of the resource. **/ @@ -207,7 +268,7 @@ public static ZoneType create(String key) { String id; /** - * The date and time the image was created in \"YYYY-MM-ddThh:mmZ\" format + * The date and time the resource was created in \"YYYY-MM-ddThh:mmZ\" format * with a Z offset, as defined by RFC 3339. *

**Example:** `2016-07-22T17:23:59:60Z` @@ -231,6 +292,60 @@ public static ZoneType create(String key) { **/ @com.fasterxml.jackson.annotation.JsonProperty("serial") Long serial; + /** + * The current state of the zone resource. + **/ + @lombok.extern.slf4j.Slf4j + public enum LifecycleState { + Active("ACTIVE"), + Creating("CREATING"), + Deleted("DELETED"), + Deleting("DELETING"), + Failed("FAILED"), + + /** + * 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 zone resource. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + LifecycleState lifecycleState; @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/ListZonesRequest.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/ListZonesRequest.java index d398a6627ea..8dc4cfcba93 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/ListZonesRequest.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/requests/ListZonesRequest.java @@ -101,30 +101,32 @@ public static ZoneType create(String key) { private java.util.Date timeCreatedLessThan; /** - * The field by which to sort zones. + * The state of a resource. */ - private SortBy sortBy; + private LifecycleState lifecycleState; /** - * The field by which to sort zones. + * The state of a resource. **/ - public enum SortBy { - Name("name"), - ZoneType("zoneType"), - TimeCreated("timeCreated"), + public enum LifecycleState { + Active("ACTIVE"), + Creating("CREATING"), + Deleted("DELETED"), + Deleting("DELETING"), + Failed("FAILED"), ; private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (SortBy v : SortBy.values()) { + for (LifecycleState v : LifecycleState.values()) { map.put(v.getValue(), v); } } - SortBy(String value) { + LifecycleState(String value) { this.value = value; } @@ -134,47 +136,39 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static SortBy create(String key) { + public static LifecycleState create(String key) { if (map.containsKey(key)) { return map.get(key); } - throw new RuntimeException("Invalid SortBy: " + key); + throw new RuntimeException("Invalid LifecycleState: " + key); } }; /** - * The order to sort the resources. - * - */ - private com.oracle.bmc.dns.model.SortOrder sortOrder; - - /** - * The state of a resource. + * The field by which to sort zones. */ - private LifecycleState lifecycleState; + private SortBy sortBy; /** - * The state of a resource. + * The field by which to sort zones. **/ - public enum LifecycleState { - Active("ACTIVE"), - Creating("CREATING"), - Deleted("DELETED"), - Deleting("DELETING"), - Failed("FAILED"), + public enum SortBy { + Name("name"), + ZoneType("zoneType"), + TimeCreated("timeCreated"), ; private final String value; - private static java.util.Map map; + private static java.util.Map map; static { map = new java.util.HashMap<>(); - for (LifecycleState v : LifecycleState.values()) { + for (SortBy v : SortBy.values()) { map.put(v.getValue(), v); } } - LifecycleState(String value) { + SortBy(String value) { this.value = value; } @@ -184,14 +178,20 @@ public String getValue() { } @com.fasterxml.jackson.annotation.JsonCreator - public static LifecycleState create(String key) { + public static SortBy create(String key) { if (map.containsKey(key)) { return map.get(key); } - throw new RuntimeException("Invalid LifecycleState: " + key); + throw new RuntimeException("Invalid SortBy: " + key); } }; + /** + * The order to sort the resources. + * + */ + private com.oracle.bmc.dns.model.SortOrder sortOrder; + public static class Builder { private com.oracle.bmc.util.internal.Consumer invocationCallback = null; @@ -221,9 +221,9 @@ public Builder copy(ListZonesRequest o) { zoneType(o.getZoneType()); timeCreatedGreaterThanOrEqualTo(o.getTimeCreatedGreaterThanOrEqualTo()); timeCreatedLessThan(o.getTimeCreatedLessThan()); + lifecycleState(o.getLifecycleState()); sortBy(o.getSortBy()); sortOrder(o.getSortOrder()); - lifecycleState(o.getLifecycleState()); invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetDomainRecordsResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetDomainRecordsResponse.java index f5ead005ff0..3e66c7715a9 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetDomainRecordsResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetDomainRecordsResponse.java @@ -11,10 +11,9 @@ public class GetDomainRecordsResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetRRSetResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetRRSetResponse.java index 6f0b81841ba..074214eb13b 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetRRSetResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetRRSetResponse.java @@ -11,10 +11,9 @@ public class GetRRSetResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetZoneRecordsResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetZoneRecordsResponse.java index a62e0a37cf9..0d00b99b298 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetZoneRecordsResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/GetZoneRecordsResponse.java @@ -11,10 +11,9 @@ public class GetZoneRecordsResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/ListZonesResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/ListZonesResponse.java index 499a06a9735..914d7a923f4 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/ListZonesResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/ListZonesResponse.java @@ -11,10 +11,9 @@ public class ListZonesResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchDomainRecordsResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchDomainRecordsResponse.java index a39a3c9ad80..59466c0d699 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchDomainRecordsResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchDomainRecordsResponse.java @@ -11,10 +11,9 @@ public class PatchDomainRecordsResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchRRSetResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchRRSetResponse.java index f76152e536e..f13b47dfb9a 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchRRSetResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchRRSetResponse.java @@ -11,10 +11,9 @@ public class PatchRRSetResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchZoneRecordsResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchZoneRecordsResponse.java index eb1b32aed56..86a741f7be5 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchZoneRecordsResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/PatchZoneRecordsResponse.java @@ -11,10 +11,9 @@ public class PatchZoneRecordsResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateDomainRecordsResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateDomainRecordsResponse.java index ebf0214838b..b779778be00 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateDomainRecordsResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateDomainRecordsResponse.java @@ -11,10 +11,9 @@ public class UpdateDomainRecordsResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateRRSetResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateRRSetResponse.java index 806992d1603..419dc494463 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateRRSetResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateRRSetResponse.java @@ -11,10 +11,9 @@ public class UpdateRRSetResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateZoneRecordsResponse.java b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateZoneRecordsResponse.java index a5ea0ce7a3e..82fe5515b49 100644 --- a/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateZoneRecordsResponse.java +++ b/bmc-dns/src/main/java/com/oracle/bmc/dns/responses/UpdateZoneRecordsResponse.java @@ -11,10 +11,9 @@ public class UpdateZoneRecordsResponse { /** - * 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. + * For list pagination. When this header appears in the response, additional pages + * of results remain. For important details about how pagination works, + * see [List Pagination](https://docs.us-phoenix-1.oraclecloud.com/iaas/Content/API/Concepts/usingapi.htm#nine). * */ private String opcNextPage; diff --git a/bmc-email/pom.xml b/bmc-email/pom.xml index 77c3f10e067..82cfce8b878 100644 --- a/bmc-email/pom.xml +++ b/bmc-email/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-examples/pom.xml b/bmc-examples/pom.xml index 29291b86d73..b0d8bc59a12 100644 --- a/bmc-examples/pom.xml +++ b/bmc-examples/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-bom - 1.3.2 + 1.3.3 pom import diff --git a/bmc-examples/src/main/java/DatabaseExampleHelper.java b/bmc-examples/src/main/java/DatabaseExampleHelper.java new file mode 100644 index 00000000000..72a4e3b9e9e --- /dev/null +++ b/bmc-examples/src/main/java/DatabaseExampleHelper.java @@ -0,0 +1,151 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.core.VirtualNetwork; +import com.oracle.bmc.core.model.CreateSubnetDetails; +import com.oracle.bmc.core.model.CreateVcnDetails; +import com.oracle.bmc.core.model.EgressSecurityRule; +import com.oracle.bmc.core.model.IngressSecurityRule; +import com.oracle.bmc.core.model.SecurityList; +import com.oracle.bmc.core.model.Subnet; +import com.oracle.bmc.core.model.UpdateSecurityListDetails; +import com.oracle.bmc.core.model.Vcn; +import com.oracle.bmc.core.requests.CreateSubnetRequest; +import com.oracle.bmc.core.requests.CreateVcnRequest; +import com.oracle.bmc.core.requests.DeleteSubnetRequest; +import com.oracle.bmc.core.requests.DeleteVcnRequest; +import com.oracle.bmc.core.requests.GetSecurityListRequest; +import com.oracle.bmc.core.requests.GetSubnetRequest; +import com.oracle.bmc.core.requests.GetVcnRequest; +import com.oracle.bmc.core.requests.UpdateSecurityListRequest; +import com.oracle.bmc.core.responses.CreateSubnetResponse; +import com.oracle.bmc.core.responses.CreateVcnResponse; +import com.oracle.bmc.core.responses.GetSecurityListResponse; +import com.oracle.bmc.core.responses.UpdateSecurityListResponse; + +import java.util.Random; + +public class DatabaseExampleHelper { + + private static Random rand = new Random(); + + public static Vcn createVcn( + VirtualNetwork virtualNetwork, String compartmentId, String cidrBlock) + throws Exception { + final String vcnName = "JavaSDK.DB.VCN." + System.currentTimeMillis(); + CreateVcnResponse response = + virtualNetwork.createVcn( + CreateVcnRequest.builder() + .createVcnDetails( + CreateVcnDetails.builder() + .cidrBlock(cidrBlock) + .compartmentId(compartmentId) + .displayName(vcnName) + .dnsLabel("javasdkex" + rand.nextInt(999)) + .build()) + .build()); + + virtualNetwork + .getWaiters() + .forVcn( + GetVcnRequest.builder().vcnId(response.getVcn().getId()).build(), + Vcn.LifecycleState.Available) + .execute(); + Vcn vcn = response.getVcn(); + System.out.println("Created VCN: " + vcn.getId()); + + EgressSecurityRule egressRule = + EgressSecurityRule.builder().destination("0.0.0.0/0").protocol("all").build(); + IngressSecurityRule ingressRule = + IngressSecurityRule.builder().source(cidrBlock).protocol("all").build(); + + GetSecurityListRequest getSecurityListRequest = + GetSecurityListRequest.builder() + .securityListId(vcn.getDefaultSecurityListId()) + .build(); + GetSecurityListResponse getSecurityListResponse = + virtualNetwork.getSecurityList(getSecurityListRequest); + + SecurityList securityList = getSecurityListResponse.getSecurityList(); + + securityList.getEgressSecurityRules().add(egressRule); + securityList.getIngressSecurityRules().add(ingressRule); + + UpdateSecurityListDetails updateSecurityListDetails = + UpdateSecurityListDetails.builder() + .egressSecurityRules(securityList.getEgressSecurityRules()) + .ingressSecurityRules(securityList.getIngressSecurityRules()) + .build(); + + UpdateSecurityListRequest updateSecurityListRequest = + UpdateSecurityListRequest.builder() + .securityListId(securityList.getId()) + .updateSecurityListDetails(updateSecurityListDetails) + .build(); + + UpdateSecurityListResponse updateSecurityListResponse = + virtualNetwork.updateSecurityList(updateSecurityListRequest); + + virtualNetwork + .getWaiters() + .forSecurityList( + GetSecurityListRequest.builder() + .securityListId(securityList.getId()) + .build(), + SecurityList.LifecycleState.Available) + .execute(); + + return vcn; + } + + public static void deleteVcn(VirtualNetwork virtualNetwork, Vcn vcn) throws Exception { + virtualNetwork.deleteVcn(DeleteVcnRequest.builder().vcnId(vcn.getId()).build()); + virtualNetwork + .getWaiters() + .forVcn( + GetVcnRequest.builder().vcnId(vcn.getId()).build(), + Vcn.LifecycleState.Terminated) + .execute(); + System.out.println("Deleted VCN: " + vcn.getId()); + } + + public static Subnet createSubnet( + VirtualNetwork virtualNetwork, Vcn vcn, String availabilityDomain, String cidrBlock) + throws Exception { + + final String subnetName = "SubnetFor." + vcn.getDisplayName() + "." + rand.nextInt(999); + CreateSubnetResponse response = + virtualNetwork.createSubnet( + CreateSubnetRequest.builder() + .createSubnetDetails( + CreateSubnetDetails.builder() + .compartmentId(vcn.getCompartmentId()) + .availabilityDomain(availabilityDomain) + .displayName(subnetName) + .vcnId(vcn.getId()) + .cidrBlock(cidrBlock) + .dnsLabel("javasdksubex" + rand.nextInt(999)) + .build()) + .build()); + + virtualNetwork + .getWaiters() + .forSubnet( + GetSubnetRequest.builder().subnetId(response.getSubnet().getId()).build(), + Subnet.LifecycleState.Available) + .execute(); + System.out.println("Created Subnet: " + response.getSubnet().getId()); + return response.getSubnet(); + } + + public static void deleteSubnet(VirtualNetwork virtualNetwork, Subnet subnet) throws Exception { + virtualNetwork.deleteSubnet(DeleteSubnetRequest.builder().subnetId(subnet.getId()).build()); + virtualNetwork + .getWaiters() + .forSubnet( + GetSubnetRequest.builder().subnetId(subnet.getId()).build(), + Subnet.LifecycleState.Terminated) + .execute(); + System.out.println("Deleted Subnet: " + subnet.getId()); + } +} diff --git a/bmc-examples/src/main/java/LaunchExaDbSystemWithSparseExample.java b/bmc-examples/src/main/java/LaunchExaDbSystemWithSparseExample.java new file mode 100644 index 00000000000..0e4738c559e --- /dev/null +++ b/bmc-examples/src/main/java/LaunchExaDbSystemWithSparseExample.java @@ -0,0 +1,199 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.ConfigFileReader; +import com.oracle.bmc.Region; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.core.VirtualNetworkClient; +import com.oracle.bmc.core.model.Subnet; +import com.oracle.bmc.core.model.Vcn; +import com.oracle.bmc.database.DatabaseClient; +import com.oracle.bmc.database.model.CreateDatabaseDetails; +import com.oracle.bmc.database.model.CreateDbHomeDetails; +import com.oracle.bmc.database.model.DbSystem; +import com.oracle.bmc.database.model.LaunchDbSystemDetails; +import com.oracle.bmc.database.requests.GetDbSystemRequest; +import com.oracle.bmc.database.requests.LaunchDbSystemRequest; +import com.oracle.bmc.database.requests.TerminateDbSystemRequest; +import com.oracle.bmc.database.responses.GetDbSystemResponse; +import com.oracle.bmc.database.responses.LaunchDbSystemResponse; +import com.oracle.bmc.waiter.ExponentialBackoffDelayStrategy; +import com.oracle.bmc.waiter.MaxTimeTerminationStrategy; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.List; + +/** + * This class provides a basic example of how to launch a DB system with Exadata shape using the Java SDK. This will cover: + *

+ *
    + *
  • Create a VCN and subnets needed for the DB system and its related resources
    • + *
  • + * Launch a DB system with Exadata shape and sparse disk group option. See: + * overview and + * managing DB systems + * for more information + *
+ *

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

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

+ *
    + *
  • DB system shape
    • + *
  • Core count
    • + *
  • DB edition
    • + *
  • DB version
    • + *
  • CIDR block for VCN
    • + *
+ */ +public class LaunchExaDbSystemWithSparseExample { + private static final String CONFIG_LOCATION = "~/.oci/config"; + private static final String CONFIG_PROFILE = "DEFAULT"; + private static final String DB_SYSTEM_SHAPE = "Exadata.Quarter2.92"; + private static final String DB_VERSION = "12.1.0.2"; + + /** + * The entry point for the example. + * + * @param args Arguments to provide to the example. The following arguments are expected: + *
    + *
  • The OCID of the compartment which owns the DB system
    • + *
  • The availability domain where the DB system will be launched
    • + *
  • Sparse DiskGroup option: True, if Sparse Diskgroup is configured for Exadata dbsystem, False, if Sparse diskgroup was not configured.
    • + *
  • Database admin password
    • + *
  • Full path to SSH public key file
    • + *
+ */ + public static void main(String[] args) throws Exception { + if (args.length != 5) { + throw new IllegalAccessException( + "This example expects five arguments: " + + "a compartment OCID, availability domain, sparseDiskGroup option" + + "Database admin password and Full path to SSH public key file"); + } + final String compartmentId = args[0]; + final String availabilityDomain = args[1]; + final String sparseDiskGroup = args[2]; + final String adminPassword = args[3]; + final String sshKeyfilePath = args[4]; + + final ConfigFileReader.ConfigFile configFile = + ConfigFileReader.parse(CONFIG_LOCATION, CONFIG_PROFILE); + final AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(configFile); + final DatabaseClient databaseClient = new DatabaseClient(provider); + final VirtualNetworkClient virtualNetworkClient = new VirtualNetworkClient(provider); + + Vcn vcn = null; + Subnet subnet = null; + Subnet backupSubnet = null; + + try { + vcn = + DatabaseExampleHelper.createVcn( + virtualNetworkClient, compartmentId, "10.0.0.0/16"); + subnet = + DatabaseExampleHelper.createSubnet( + virtualNetworkClient, vcn, availabilityDomain, "10.0.0.0/24"); + backupSubnet = + DatabaseExampleHelper.createSubnet( + virtualNetworkClient, vcn, availabilityDomain, "10.0.1.0/24"); + + final List sshPublicKeys = + Arrays.asList( + FileUtils.readFileToString( + new File(sshKeyfilePath), Charset.defaultCharset())); + + LaunchDbSystemDetails launchDbSystemDetails = + LaunchDbSystemDetails.builder() + .availabilityDomain(availabilityDomain) + .compartmentId(compartmentId) + .displayName("testdb") + .hostname("javasdk-host") + .shape(DB_SYSTEM_SHAPE) + .cpuCoreCount(2) + .dbHome( + CreateDbHomeDetails.builder() + .dbVersion(DB_VERSION) + .displayName("java sdk example db home") + .database( + CreateDatabaseDetails.builder() + .adminPassword(adminPassword) + .dbName("testdb") + .build()) + .build()) + .databaseEdition( + LaunchDbSystemDetails.DatabaseEdition + .EnterpriseEditionExtremePerformance) + .subnetId(subnet.getId()) + .backupSubnetId(backupSubnet.getId()) + .sparseDiskgroup(sparseDiskGroup.equalsIgnoreCase("true")) + .sshPublicKeys(sshPublicKeys) + .build(); + + LaunchDbSystemResponse launchDbSystemResponse = + databaseClient.launchDbSystem( + LaunchDbSystemRequest.builder() + .launchDbSystemDetails(launchDbSystemDetails) + .build()); + + System.out.println("Launched Exadata DB System"); + System.out.println("==========================="); + System.out.println(launchDbSystemResponse.getDbSystem().toString()); + + GetDbSystemResponse getDbSystemResponse = + databaseClient + .getWaiters() + .forDbSystem( + GetDbSystemRequest.builder() + .dbSystemId( + launchDbSystemResponse.getDbSystem().getId()) + .build(), + DbSystem.LifecycleState.Provisioning, + new MaxTimeTerminationStrategy(21600L * 1000), + new ExponentialBackoffDelayStrategy(900L * 1000)) + .execute(); + + System.out.println("Exadata DB System is in Provisioning state"); + System.out.println("==========================="); + System.out.println(getDbSystemResponse.getDbSystem().toString()); + System.out.println( + "With sparse disk group option: " + + getDbSystemResponse.getDbSystem().getSparseDiskgroup()); + /* + Once we're done with the DB system, we can terminate it and wait for it to be terminated. + */ + databaseClient.terminateDbSystem( + TerminateDbSystemRequest.builder() + .dbSystemId(launchDbSystemResponse.getDbSystem().getId()) + .build()); + databaseClient + .getWaiters() + .forDbSystem( + GetDbSystemRequest.builder() + .dbSystemId(launchDbSystemResponse.getDbSystem().getId()) + .build(), + DbSystem.LifecycleState.Terminated) + .execute(); + + System.out.println("Terminated Exadata DB system"); + } finally { + if (subnet != null) { + DatabaseExampleHelper.deleteSubnet(virtualNetworkClient, subnet); + } + + if (backupSubnet != null) { + DatabaseExampleHelper.deleteSubnet(virtualNetworkClient, backupSubnet); + } + + if (vcn != null) { + DatabaseExampleHelper.deleteVcn(virtualNetworkClient, vcn); + } + } + } +} diff --git a/bmc-examples/src/main/java/ListDBVersionExample.java b/bmc-examples/src/main/java/ListDBVersionExample.java new file mode 100644 index 00000000000..21fdb144aac --- /dev/null +++ b/bmc-examples/src/main/java/ListDBVersionExample.java @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.ConfigFileReader; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.database.DatabaseClient; +import com.oracle.bmc.database.requests.ListDbVersionsRequest; +import com.oracle.bmc.database.responses.ListDbVersionsResponse; + +/* + * Example Class to show the usage of List DB Version DBaaS API. + */ +public class ListDBVersionExample { + + private static final String CONFIG_LOCATION = "~/.oci/config"; + private static final String CONFIG_PROFILE = "DEFAULT"; + + public static void main(String[] args) throws Exception { + + if (args.length != 2) { + throw new Exception( + "This example expects 2 arguments: a compartment OCID, a DB System Shape"); + } + + final ConfigFileReader.ConfigFile configFile = + ConfigFileReader.parse(CONFIG_LOCATION, CONFIG_PROFILE); + final AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(configFile); + + String compartmentId = args[0]; + String dbSystemShape = args[1]; + + DatabaseClient databaseClient = new DatabaseClient(provider); + ListDbVersionsRequest dbVersionsRequest = + ListDbVersionsRequest.builder() + .dbSystemShape(dbSystemShape) + .compartmentId(compartmentId) + .build(); + ListDbVersionsResponse listDbVersionsResponse = + databaseClient.listDbVersions(dbVersionsRequest); + + System.out.printf( + "DB Versions Fetched for Shape %s and compartment ocid: %s\n", + compartmentId, + dbSystemShape); + + System.out.println(listDbVersionsResponse.getItems()); + } +} diff --git a/bmc-examples/src/main/java/UpdateUserCapabilitesExample.java b/bmc-examples/src/main/java/UpdateUserCapabilitesExample.java new file mode 100644 index 00000000000..3651343f646 --- /dev/null +++ b/bmc-examples/src/main/java/UpdateUserCapabilitesExample.java @@ -0,0 +1,128 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.Region; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.identity.Identity; +import com.oracle.bmc.identity.IdentityClient; +import com.oracle.bmc.identity.model.*; +import com.oracle.bmc.identity.requests.*; +import com.oracle.bmc.identity.responses.GetUserResponse; +import com.oracle.bmc.model.BmcException; +import net.jodah.failsafe.Failsafe; +import net.jodah.failsafe.RetryPolicy; +import net.jodah.failsafe.function.Predicate; +import java.util.concurrent.Callable; + +import java.util.concurrent.TimeUnit; + +public class UpdateUserCapabilitesExample { + final static RetryPolicy RETRY_POLICY = + new RetryPolicy() + .retryOn(new RetryPredicate()) + .withDelay(1, TimeUnit.SECONDS) + .withMaxRetries(10); + + public static void main(String[] args) throws Exception { + // TODO: Fill in this value + String configurationFilePath = "~/.oci/config"; + String profile = "DEFAULT"; + + AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(configurationFilePath, profile); + + final String tenantId = provider.getTenantId(); + final Identity identityClient = new IdentityClient(provider); + identityClient.setRegion(Region.US_ASHBURN_1); + + // Create a user. + final User user = + createUser(identityClient, tenantId, "SDK-Sample-User", "SDK sample user"); + System.out.println("Created user with userId:" + user.getId()); + System.out.println(); + + // Get the created user. + final GetUserRequest getUserRequest = GetUserRequest.builder().userId(user.getId()).build(); + + // If we create/update and then try to use compartments straight away, sometimes we can get a 404. + // To try and avoid this, this example uses retries with a short delay. + GetUserResponse getUserResponse = + Failsafe.with(RETRY_POLICY) + .get( + new Callable() { + public GetUserResponse call() { + return identityClient.getUser(getUserRequest); + } + }); + System.out.println("Getting the created user with userId:" + user.getId()); + System.out.println(); + + updateUserCapabilities(identityClient, user.getId(), false); + } + + public static User createUser( + Identity client, String compartmentId, String name, String description) { + CreateUserDetails createUserDetails = + CreateUserDetails.builder() + .compartmentId(compartmentId) + .name(name) + .description(description) + .build(); + + User user = + client.createUser( + CreateUserRequest.builder() + .createUserDetails(createUserDetails) + .build()) + .getUser(); + + if (user == null) { + throw new RuntimeException("User creation fails with " + createUserDetails.toString()); + } + System.out.println("User " + user.getName() + " created successfully"); + return user; + } + + public static User updateUserCapabilities( + Identity client, String userId, boolean canUseAuthTokens) { + + UpdateUserCapabilitiesDetails updateUserCapabilitiesDetails = + UpdateUserCapabilitiesDetails.builder().canUseAuthTokens(canUseAuthTokens).build(); + + try { + User user = + client.updateUserCapabilities( + UpdateUserCapabilitiesRequest.builder() + .userId(userId) + .updateUserCapabilitiesDetails( + updateUserCapabilitiesDetails) + .build()) + .getUser(); + + if (user == null) { + throw new RuntimeException( + "Update user capabilities fails with " + + updateUserCapabilitiesDetails.toString()); + } + + System.out.println("User" + user + " updated successfully with the capabilities"); + return user; + } catch (Exception ex) { + throw new RuntimeException( + "User update capabilities fails with error:" + ex.getMessage()); + } + } + + private static class RetryPredicate implements Predicate { + /** + * Checks if the exception can be retried or not. + * + * @param e Exception object. + * @return Returns true if the exception can be retried otherwise false. + */ + public boolean test(Throwable e) { + return e instanceof BmcException && ((BmcException) e).getStatusCode() == 404; + } + } +} diff --git a/bmc-examples/src/main/java/VmDataGuardExample.java b/bmc-examples/src/main/java/VmDataGuardExample.java new file mode 100644 index 00000000000..40e8e61bb66 --- /dev/null +++ b/bmc-examples/src/main/java/VmDataGuardExample.java @@ -0,0 +1,379 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.ConfigFileReader; +import com.oracle.bmc.Region; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.core.VirtualNetworkClient; +import com.oracle.bmc.core.model.Subnet; +import com.oracle.bmc.core.model.Vcn; +import com.oracle.bmc.database.DatabaseClient; +import com.oracle.bmc.database.DatabaseWaiters; +import com.oracle.bmc.database.model.CreateDataGuardAssociationDetails; +import com.oracle.bmc.database.model.CreateDataGuardAssociationWithNewDbSystemDetails; +import com.oracle.bmc.database.model.CreateDatabaseDetails; +import com.oracle.bmc.database.model.CreateDbHomeDetails; +import com.oracle.bmc.database.model.DataGuardAssociation; +import com.oracle.bmc.database.model.DataGuardAssociationSummary; +import com.oracle.bmc.database.model.DatabaseSummary; +import com.oracle.bmc.database.model.DbHomeSummary; +import com.oracle.bmc.database.model.DbSystem; +import com.oracle.bmc.database.model.FailoverDataGuardAssociationDetails; +import com.oracle.bmc.database.model.LaunchDbSystemDetails; +import com.oracle.bmc.database.model.ReinstateDataGuardAssociationDetails; +import com.oracle.bmc.database.model.SwitchoverDataGuardAssociationDetails; +import com.oracle.bmc.database.requests.CreateDataGuardAssociationRequest; +import com.oracle.bmc.database.requests.FailoverDataGuardAssociationRequest; +import com.oracle.bmc.database.requests.GetDataGuardAssociationRequest; +import com.oracle.bmc.database.requests.GetDbSystemRequest; +import com.oracle.bmc.database.requests.LaunchDbSystemRequest; +import com.oracle.bmc.database.requests.ListDataGuardAssociationsRequest; +import com.oracle.bmc.database.requests.ListDatabasesRequest; +import com.oracle.bmc.database.requests.ListDbHomesRequest; +import com.oracle.bmc.database.requests.ReinstateDataGuardAssociationRequest; +import com.oracle.bmc.database.requests.SwitchoverDataGuardAssociationRequest; +import com.oracle.bmc.database.requests.TerminateDbSystemRequest; +import com.oracle.bmc.database.responses.CreateDataGuardAssociationResponse; +import com.oracle.bmc.database.responses.FailoverDataGuardAssociationResponse; +import com.oracle.bmc.database.responses.GetDataGuardAssociationResponse; +import com.oracle.bmc.database.responses.GetDbSystemResponse; +import com.oracle.bmc.database.responses.LaunchDbSystemResponse; +import com.oracle.bmc.database.responses.ReinstateDataGuardAssociationResponse; +import com.oracle.bmc.database.responses.SwitchoverDataGuardAssociationResponse; +import com.oracle.bmc.waiter.ExponentialBackoffDelayStrategy; +import com.oracle.bmc.waiter.MaxTimeTerminationStrategy; +import org.apache.commons.lang3.StringUtils; + +import java.util.Arrays; +import java.util.List; +import java.util.Random; + +public class VmDataGuardExample { + + private static final String CONFIG_LOCATION = "~/.oci/config"; + private static final String CONFIG_PROFILE = "DEFAULT"; + private static final String DATABASE_ADMIN_PASSWORD = "DBaaS12345_#"; + private static final String vcnCidrBlock = "10.0.0.0/16"; + private static final String subnetCidrBlock = "10.0.1.0/24"; + private static int randomId = new Random().nextInt(999); + + private static final long MAX_WAIT_IN_MINS = 4 * 60; + private static final long DELAY_INTERVAL_IN_MINS = 1; + + private static DatabaseClient databaseClient = null; + private static VirtualNetworkClient virtualNetworkClient = null; + private static String regionId; + private static String compartmentId; + private static String availabilityDomain; + + public static void main(String[] args) throws Exception { + + if (args.length != 3) { + throw new Exception( + "This example expects 3 arguments: a region ID, a compartment OCID, availability domain for the VCN"); + } + + regionId = args[0]; + compartmentId = args[1]; + availabilityDomain = args[2]; + + Region targetRegion = Region.fromRegionId(regionId); + + final ConfigFileReader.ConfigFile configFile = + ConfigFileReader.parse(CONFIG_LOCATION, CONFIG_PROFILE); + final AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(configFile); + databaseClient = new DatabaseClient(provider); + virtualNetworkClient = new VirtualNetworkClient(provider); + + databaseClient.setRegion(targetRegion); + virtualNetworkClient.setRegion(targetRegion); + + Vcn vcn = null; + Subnet subnet = null; + String firstDbSystemId = null; + String secondDbSystemId = null; + try { + + vcn = + DatabaseExampleHelper.createVcn( + virtualNetworkClient, compartmentId, vcnCidrBlock); + subnet = + DatabaseExampleHelper.createSubnet( + virtualNetworkClient, vcn, availabilityDomain, subnetCidrBlock); + + // 1. Launch Primary DbSystem + LaunchDbSystemDetails primaryDbSystem = createLaunchVMDbSystemRequest(subnet.getId()); + LaunchDbSystemResponse launchDbSystemResponse = + databaseClient.launchDbSystem( + LaunchDbSystemRequest.builder() + .launchDbSystemDetails(primaryDbSystem) + .build()); + DatabaseWaiters waiter = databaseClient.getWaiters(); + GetDbSystemResponse getDbSystemResponse = + waiter.forDbSystem( + GetDbSystemRequest.builder() + .dbSystemId( + launchDbSystemResponse.getDbSystem().getId()) + .build(), + DbSystem.LifecycleState.Available, + new MaxTimeTerminationStrategy( + minutesToMillis(MAX_WAIT_IN_MINS)), + new ExponentialBackoffDelayStrategy( + minutesToMillis(DELAY_INTERVAL_IN_MINS))) + .execute(); + firstDbSystemId = getDbSystemResponse.getDbSystem().getId(); + String firstDbHomeId = getDbHome(firstDbSystemId).getId(); + String firstDatabaseId = getDatabase(firstDbHomeId).getId(); + System.out.println("Launched Primary DB System " + firstDbSystemId); + + // 2. Setup DataGuard + CreateDataGuardAssociationDetails dataGuardRequest = + CreateDataGuardAssociationWithNewDbSystemDetails.builder() + .databaseAdminPassword(DATABASE_ADMIN_PASSWORD) + .displayName("dbsPeer" + randomId) + .availabilityDomain(availabilityDomain) + .hostname("hostPeer" + randomId) + .subnetId(subnet.getId()) + .protectionMode( + CreateDataGuardAssociationDetails.ProtectionMode + .MaximumPerformance) + .transportType(CreateDataGuardAssociationDetails.TransportType.Async) + .build(); + CreateDataGuardAssociationResponse createDataGuardAssociationResponse = + databaseClient.createDataGuardAssociation( + CreateDataGuardAssociationRequest.builder() + .createDataGuardAssociationDetails(dataGuardRequest) + .databaseId(firstDatabaseId) + .build()); + GetDataGuardAssociationResponse getDataGuardAssociationResponse = + waitAndGetDataGuardAssociationResponse( + waiter, + firstDatabaseId, + createDataGuardAssociationResponse.getDataGuardAssociation()); + System.out.println( + "Created DataGuard " + + getDataGuardAssociationResponse.getDataGuardAssociation()); + + String dataguardAssociationId = + getDataGuardAssociationResponse.getDataGuardAssociation().getId(); + secondDbSystemId = + getDataGuardAssociationResponse.getDataGuardAssociation().getPeerDbSystemId(); + + // 3. Switch over on current primary + SwitchoverDataGuardAssociationRequest switchOverRequest = + SwitchoverDataGuardAssociationRequest.builder() + .databaseId(firstDatabaseId) + .dataGuardAssociationId(dataguardAssociationId) + .switchoverDataGuardAssociationDetails( + SwitchoverDataGuardAssociationDetails.builder() + .databaseAdminPassword(DATABASE_ADMIN_PASSWORD) + .build()) + .build(); + SwitchoverDataGuardAssociationResponse switchoverResponse = + databaseClient.switchoverDataGuardAssociation(switchOverRequest); + getDataGuardAssociationResponse = + waitAndGetDataGuardAssociationResponse( + waiter, firstDatabaseId, switchoverResponse.getDataGuardAssociation()); + System.out.println( + "Completed Switchover DataGuard " + + getDataGuardAssociationResponse.getDataGuardAssociation()); + + // 4. After switch over old primary will become standby and we should be able to fail-over to it. + FailoverDataGuardAssociationRequest failOverRequest = + FailoverDataGuardAssociationRequest.builder() + .databaseId(firstDatabaseId) + .dataGuardAssociationId(dataguardAssociationId) + .failoverDataGuardAssociationDetails( + FailoverDataGuardAssociationDetails.builder() + .databaseAdminPassword(DATABASE_ADMIN_PASSWORD) + .build()) + .build(); + FailoverDataGuardAssociationResponse failoverResponse = + databaseClient.failoverDataGuardAssociation(failOverRequest); + getDataGuardAssociationResponse = + waitAndGetDataGuardAssociationResponse( + waiter, firstDatabaseId, failoverResponse.getDataGuardAssociation()); + System.out.println( + "Completed Failover DataGuard " + + getDataGuardAssociationResponse.getDataGuardAssociation()); + + // 5. Reinstate current primary. + ReinstateDataGuardAssociationRequest reinstateRequest = + ReinstateDataGuardAssociationRequest.builder() + .databaseId(firstDatabaseId) + .dataGuardAssociationId(dataguardAssociationId) + .reinstateDataGuardAssociationDetails( + ReinstateDataGuardAssociationDetails.builder() + .databaseAdminPassword(DATABASE_ADMIN_PASSWORD) + .build()) + .build(); + ReinstateDataGuardAssociationResponse reinstateResponse = + databaseClient.reinstateDataGuardAssociation(reinstateRequest); + getDataGuardAssociationResponse = + waitAndGetDataGuardAssociationResponse( + waiter, firstDatabaseId, reinstateResponse.getDataGuardAssociation()); + System.out.println( + "Completed Reinstate DataGuard " + + getDataGuardAssociationResponse.getDataGuardAssociation()); + + } finally { + System.out.println("Begin terminating DbSystems"); + terminateDbSystems(firstDbSystemId, secondDbSystemId); + + if (subnet != null) { + DatabaseExampleHelper.deleteSubnet(virtualNetworkClient, subnet); + } + if (vcn != null) { + DatabaseExampleHelper.deleteVcn(virtualNetworkClient, vcn); + } + } + + databaseClient.close(); + virtualNetworkClient.close(); + } + + private static LaunchDbSystemDetails createLaunchVMDbSystemRequest(String subnetId) { + return LaunchDbSystemDetails.builder() + .dbHome(createDbHomeRequest()) + .cpuCoreCount(4) + .nodeCount(1) + .initialDataStorageSizeInGB(512) + .availabilityDomain(availabilityDomain) + .compartmentId(compartmentId) + .databaseEdition( + LaunchDbSystemDetails.DatabaseEdition.EnterpriseEditionExtremePerformance) + .displayName("dbs" + randomId) + .shape("VM.Standard2.1") + .subnetId(subnetId) + .hostname("host" + randomId) + .licenseModel(LaunchDbSystemDetails.LicenseModel.LicenseIncluded) + .sshPublicKeys( + Arrays.asList( + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDokoG4lDsCN/E9F7KsaVZmYYKZMdljJwxjwsoyFdTTQop0TH0lMSDiZeZ3w/8wsZ5esR5uiW/WS5RMBxrfy1/z12qHbOP8vTLCZ19X33UDS8yhEarDldmBbeQ5penrjHM54+lLBTKolGfXvszbUP8ohsN/If7nfn2caUNRiE9Ep9T+xIr/ElmSyq9qrBbUdg0ltz3yIbkmv7SwgxW+NZSD2mhmfYJJDWq5QpJqc3lcNSCU/0f1mQGm754qI7wJKGEhSEOJkBvS7YrfDRINtNABaKGIDUCijwp+dl7btRaxBDwiF/+zHrX43ZEypVcbgVnOcxtz3E/CgxRHZ1plfEpd dhshshah@dhshshah-Mac")) + .build(); + } + + private static CreateDbHomeDetails createDbHomeRequest() { + return CreateDbHomeDetails.builder() + .database(createDatabaseRequest()) + .dbVersion("12.2.0.1") + .displayName("dbh" + randomId) + .build(); + } + + private static CreateDatabaseDetails createDatabaseRequest() { + return CreateDatabaseDetails.builder() + .adminPassword(DATABASE_ADMIN_PASSWORD) + .dbName("db" + randomId) + .build(); + } + + private static void terminateDbSystems(String firstDbSystemId, String secondDbSystemId) + throws Exception { + DataGuardAssociationSummary dataGuardAssociation = + getDataGuardAssociationByDbSystem(firstDbSystemId); + // Always delete Primary after Standby + if (null != dataGuardAssociation + && DataGuardAssociationSummary.Role.Primary.equals( + dataGuardAssociation.getRole())) { + System.out.println("Terminating StandBy DB System " + secondDbSystemId); + terminateDBSystem(secondDbSystemId); + System.out.println("Terminating Primary DB System " + firstDbSystemId); + terminateDBSystem(firstDbSystemId); + } else { + System.out.println("Terminating StandBy DB System " + firstDbSystemId); + terminateDBSystem(firstDbSystemId); + System.out.println("Terminating Primary DB System " + secondDbSystemId); + terminateDBSystem(secondDbSystemId); + } + } + + private static void terminateDBSystem(String dbSystemId) throws Exception { + if (StringUtils.isNotEmpty(dbSystemId)) { + TerminateDbSystemRequest terminateDbSystemRequest = + TerminateDbSystemRequest.builder().dbSystemId(dbSystemId).build(); + databaseClient.terminateDbSystem(terminateDbSystemRequest); + databaseClient + .getWaiters() + .forDbSystem( + GetDbSystemRequest.builder().dbSystemId(dbSystemId).build(), + DbSystem.LifecycleState.Terminated) + .execute(); + } + } + + private static GetDataGuardAssociationResponse waitAndGetDataGuardAssociationResponse( + DatabaseWaiters waiter, String databaseId, DataGuardAssociation dataGuardAssociation) + throws Exception { + return waiter.forDataGuardAssociation( + GetDataGuardAssociationRequest.builder() + .dataGuardAssociationId(dataGuardAssociation.getId()) + .databaseId(databaseId) + .build(), + DataGuardAssociation.LifecycleState.Available, + new MaxTimeTerminationStrategy(minutesToMillis(MAX_WAIT_IN_MINS)), + new ExponentialBackoffDelayStrategy( + minutesToMillis(DELAY_INTERVAL_IN_MINS))) + .execute(); + } + + private static DbHomeSummary getDbHome(String dbSystemId) { + if (StringUtils.isEmpty(dbSystemId)) return null; + + ListDbHomesRequest listDbHomesRequest = + ListDbHomesRequest.builder() + .compartmentId(compartmentId) + .dbSystemId(dbSystemId) + .build(); + List dbHomeList = databaseClient.listDbHomes(listDbHomesRequest).getItems(); + return (null != dbHomeList && !dbHomeList.isEmpty()) ? dbHomeList.get(0) : null; + } + + private static DatabaseSummary getDatabase(String dbHomeId) { + if (StringUtils.isEmpty(dbHomeId)) return null; + + ListDatabasesRequest listDatabasesRequest = + ListDatabasesRequest.builder() + .compartmentId(compartmentId) + .dbHomeId(dbHomeId) + .build(); + List databaseList = + databaseClient.listDatabases(listDatabasesRequest).getItems(); + return (null != databaseList && !databaseList.isEmpty()) ? databaseList.get(0) : null; + } + + private static DataGuardAssociationSummary getDataGuardAssociationByDbSystem( + String dbSystemId) { + if (StringUtils.isEmpty(dbSystemId)) return null; + + DbHomeSummary dbHome = getDbHome(dbSystemId); + if (null != dbHome) { + DatabaseSummary database = getDatabase(dbHome.getId()); + if (null != database) { + return getDataGuardAssociationByDatabase(database.getId()); + } + } + return null; + } + + private static DataGuardAssociationSummary getDataGuardAssociationByDatabase( + String databaseId) { + if (StringUtils.isEmpty(databaseId)) return null; + + ListDataGuardAssociationsRequest listDataGuardAssociationsRequest = + ListDataGuardAssociationsRequest.builder().databaseId(databaseId).build(); + List dataGuardAssociationList = + databaseClient + .listDataGuardAssociations(listDataGuardAssociationsRequest) + .getItems(); + return (null != dataGuardAssociationList && !dataGuardAssociationList.isEmpty()) + ? dataGuardAssociationList.get(0) + : null; + } + + private static long minutesToMillis(long minutes) { + return minutes * 60 * 1000L; + } +} diff --git a/bmc-examples/src/main/java/VolumeAttachmentExample.java b/bmc-examples/src/main/java/VolumeAttachmentExample.java index ef370522142..9b050fe8702 100644 --- a/bmc-examples/src/main/java/VolumeAttachmentExample.java +++ b/bmc-examples/src/main/java/VolumeAttachmentExample.java @@ -85,16 +85,16 @@ public class VolumeAttachmentExample { private static final String SUBNET_DISPLAY_NAME = "java_sdk_vol_example_subnet"; private static final String CIDR_BLOCK = "10.0.0.0/16"; - private static final String CONFIG_LOCATION = "~/.oci/config"; - private static final String CONFIG_PROFILE = "DEFAULT"; + protected static final String CONFIG_LOCATION = "~/.oci/config"; + protected static final String CONFIG_PROFILE = "DEFAULT"; private static final String VOL_ONE_DISPLAY_NAME = "VolumeAttachExample1"; private static final String VOL_TWO_DISPLAY_NAME = "VolumeAttachExample2"; - private static final String INSTANCE_SHAPE = "VM.Standard1.1"; - private static final String INSTANCE_OS = "Oracle Linux"; - private static final String INSTANCE_OS_VERSION = "7.5"; - private static final String INSTANCE_DISPLAY_NAME = "VolAttachExampleInstance"; + protected static final String INSTANCE_SHAPE = "VM.Standard1.1"; + protected static final String INSTANCE_OS = "Oracle Linux"; + protected static final String INSTANCE_OS_VERSION = "7.5"; + protected static final String INSTANCE_DISPLAY_NAME = "VolAttachExampleInstance"; /** * The entry point for the example. @@ -221,7 +221,7 @@ public static void main(String[] args) throws Exception { * * @throws Exception if there is an error waiting on the volume to become available */ - private static Volume createVolume( + protected static Volume createVolume( final BlockstorageClient blockStorageClient, final String compartmentId, final AvailabilityDomain availabilityDomain, @@ -259,7 +259,7 @@ private static Volume createVolume( return getResponse.getVolume(); } - private static CreateVolumeDetails getCreateVolumeDetails( + protected static CreateVolumeDetails getCreateVolumeDetails( final String compartmentId, final AvailabilityDomain availabilityDomain, final String displayName, @@ -288,7 +288,7 @@ private static CreateVolumeDetails getCreateVolumeDetails( * * @throws Exception if there was an error waiting for the volume to be deleted */ - private static void deleteVolume( + protected static void deleteVolume( final BlockstorageClient blockStorageClient, final Volume volume) throws Exception { blockStorageClient.deleteVolume( @@ -314,7 +314,7 @@ private static void deleteVolume( * * @throws Exception if there was an error waiting for the volume attachment */ - private static VolumeAttachment attachIscsiVolume( + protected static VolumeAttachment attachIscsiVolume( final ComputeClient computeClient, final Volume volume, final Instance instance) throws Exception { @@ -342,7 +342,7 @@ private static VolumeAttachment attachIscsiVolume( * * @throws Exception if there was an error waiting for the volume attachment */ - private static VolumeAttachment attachParavirtualizedVolume( + protected static VolumeAttachment attachParavirtualizedVolume( final ComputeClient computeClient, final Volume volume, final Instance instance) throws Exception { @@ -368,7 +368,7 @@ private static VolumeAttachment attachParavirtualizedVolume( * * @throws Exception if there was an error waiting for the volume attachment */ - private static VolumeAttachment attachVolume( + protected static VolumeAttachment attachVolume( final ComputeClient computeClient, final AttachVolumeDetails attachVolumeDetails) throws Exception { @@ -408,7 +408,7 @@ private static VolumeAttachment attachVolume( * * @throws Exception if there was an error waiting for the volume to detach */ - private static void detachVolume( + protected static void detachVolume( final ComputeClient computeClient, final VolumeAttachment volumeAttachment) throws Exception { @@ -431,7 +431,7 @@ private static void detachVolume( * @param computeClient the client used to communicate with the service * @param instance the instance we'll list volume attachments for */ - private static void listVolumeAttachmentsOnInstance( + protected static void listVolumeAttachmentsOnInstance( final ComputeClient computeClient, final Instance instance) { System.out.println("Listing volume attachments for instance"); System.out.println("========================================"); @@ -466,7 +466,7 @@ private static void listVolumeAttachmentsOnInstance( * * @throws Exception if there is an error waiting on the VCN to become available to use */ - private static Vcn createVcn(final VirtualNetworkClient vcnClient, final String compartmentId) + protected static Vcn createVcn(final VirtualNetworkClient vcnClient, final String compartmentId) throws Exception { final CreateVcnResponse createVcnResponse = vcnClient.createVcn( @@ -500,7 +500,7 @@ private static Vcn createVcn(final VirtualNetworkClient vcnClient, final String * * @throws Exception if there is an error waiting on the VCN to be deleted */ - private static void deleteVcn(final VirtualNetworkClient vcnClient, final Vcn vcn) + protected static void deleteVcn(final VirtualNetworkClient vcnClient, final Vcn vcn) throws Exception { vcnClient.deleteVcn(DeleteVcnRequest.builder().vcnId(vcn.getId()).build()); @@ -525,7 +525,7 @@ private static void deleteVcn(final VirtualNetworkClient vcnClient, final Vcn vc * * @throws Exception if there is an error waiting on the subnet to become available to use */ - private static Subnet createSubnet( + protected static Subnet createSubnet( final VirtualNetworkClient vcnClient, final String compartmentId, final AvailabilityDomain availabilityDomain, @@ -566,7 +566,7 @@ private static Subnet createSubnet( * * @throws Exception if there is an error waiting on the subnet to be deleted */ - private static void deleteSubnet(final VirtualNetworkClient vcnClient, final Subnet subnet) + protected static void deleteSubnet(final VirtualNetworkClient vcnClient, final Subnet subnet) throws Exception { vcnClient.deleteSubnet(DeleteSubnetRequest.builder().subnetId(subnet.getId()).build()); @@ -587,7 +587,7 @@ private static void deleteSubnet(final VirtualNetworkClient vcnClient, final Sub * * @return a list of all availability domains in a compartment */ - private static List getAvailabilityDomains( + protected static List getAvailabilityDomains( final IdentityClient identityClient, final String compartmentId) { ListAvailabilityDomainsResponse listAvailabilityDomainsResponse = @@ -611,7 +611,7 @@ private static List getAvailabilityDomains( * @return an Image which is can be used to launch an instance with the specified operating system, version * and shape */ - private static Image getImageForOsAndShape( + protected static Image getImageForOsAndShape( final ComputeClient computeClient, final String compartmentId, final String operatingSystem, @@ -659,7 +659,7 @@ private static Image getImageForOsAndShape( * * @throws Exception if an error was encountered while waiting for the instance to become running/available */ - private static Instance launchInstance( + protected static Instance launchInstance( final ComputeClient computeClient, final Subnet subnet, final String compartmentId, @@ -708,7 +708,7 @@ private static Instance launchInstance( * * @throws Exception if an error occurred while waiting for the instance to be terminated */ - private static void terminateInstance( + protected static void terminateInstance( final ComputeClient computeClient, final Instance instance) throws Exception { computeClient.terminateInstance( diff --git a/bmc-examples/src/main/java/VolumeAttachmentWithPvEncryptionInTransitExample.java b/bmc-examples/src/main/java/VolumeAttachmentWithPvEncryptionInTransitExample.java new file mode 100644 index 00000000000..5edb2c066cc --- /dev/null +++ b/bmc-examples/src/main/java/VolumeAttachmentWithPvEncryptionInTransitExample.java @@ -0,0 +1,255 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +import com.oracle.bmc.Region; +import com.oracle.bmc.auth.AuthenticationDetailsProvider; +import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider; +import com.oracle.bmc.core.BlockstorageClient; +import com.oracle.bmc.core.ComputeClient; +import com.oracle.bmc.core.VirtualNetworkClient; +import com.oracle.bmc.core.model.AttachParavirtualizedVolumeDetails; +import com.oracle.bmc.core.model.Image; +import com.oracle.bmc.core.model.Instance; +import com.oracle.bmc.core.model.InstanceSourceViaImageDetails; +import com.oracle.bmc.core.model.LaunchInstanceDetails; +import com.oracle.bmc.core.model.Subnet; +import com.oracle.bmc.core.model.Vcn; +import com.oracle.bmc.core.model.Volume; +import com.oracle.bmc.core.model.VolumeAttachment; +import com.oracle.bmc.core.requests.GetInstanceRequest; +import com.oracle.bmc.core.requests.LaunchInstanceRequest; +import com.oracle.bmc.core.responses.GetInstanceResponse; +import com.oracle.bmc.core.responses.LaunchInstanceResponse; +import com.oracle.bmc.identity.IdentityClient; +import com.oracle.bmc.identity.model.AvailabilityDomain; + +import java.util.List; + +/** + * This class provides an example of how to perform PV Volume Attachments with pvEncryptionInTransit on in the Java SDK. + * It is built on top of the class VolumeAttachmentExample. + * + * In order to demonstrate functionality, this script will create a VCN and subnet, one block volumes and an instance. + * These will be deleted at the end of the script. . This script also makes some assumptions about + * the resources it will create: + * + *
    + *
  • The VCN created by this example will have a display name of java_sdk_vol_example_vcn
    • + *
  • The subnet created by this example will have a display name of: java_sdk_vol_example_subnet
    • + *
  • The VCN and subnet will have a private IP CIDR block of 10.0.0.0/16
    • + *
  • The volumes created will have hardcoded display names of VolumeAttachExample3
    • + *
  • An instance will be created with shape VM.Standard.1.1
    • + *
  • The instance will have a display name of VolAttachExampleInstance
    • + *
  • + * The configuration file used by service clients will be sourced from the default + * location (~/.oci/config) and the DEFAULT profile will be used + *
    • + *
  • Resources will be created in us-phoenix-1
    • + *
  • Resources will be created in the first AD returned from the ListAvailabilityDomains call
    • + *
      + */ +public class VolumeAttachmentWithPvEncryptionInTransitExample extends VolumeAttachmentExample { + private static final String VOL_THREE_DISPLAY_NAME = "VolumeAttachExample3"; + + /** + * The entry point for the example. + * + * @param args Arguments to provide to the example. The following arguments are expected: + *
        + *
      • The OCID of the compartment where the volumes and associated resources will be created
        • + *
      • The OCID of the KMS key used to generated volume's data encryption key.
        • + *
      + */ + public static void main(String[] args) throws Exception { + if (args.length != 2) { + throw new IllegalArgumentException( + "This example expects the arguments of the compartment OCID and KMS Key ID"); + } + + final String compartmentId = args[0]; + final String kmsKeyId = args.length == 1 ? null : args[1]; + final AuthenticationDetailsProvider provider = + new ConfigFileAuthenticationDetailsProvider(CONFIG_LOCATION, CONFIG_PROFILE); + final BlockstorageClient blockStorageClient = new BlockstorageClient(provider); + final ComputeClient computeClient = new ComputeClient(provider); + final VirtualNetworkClient vcnClient = new VirtualNetworkClient(provider); + final IdentityClient identityClient = new IdentityClient(provider); + + blockStorageClient.setRegion(Region.US_PHOENIX_1); + computeClient.setRegion(Region.US_PHOENIX_1); + vcnClient.setRegion(Region.US_PHOENIX_1); + identityClient.setRegion(Region.US_PHOENIX_1); + + Vcn vcn = null; + Subnet subnet = null; + Volume volume = null; + Instance instance = null; + try { + final List availabilityDomains = + getAvailabilityDomains(identityClient, compartmentId); + final AvailabilityDomain adToUse = availabilityDomains.get(0); + + // A VCN and subnet is required to create a mount target + vcn = createVcn(vcnClient, compartmentId); + subnet = createSubnet(vcnClient, compartmentId, adToUse, vcn.getId()); + System.out.println("Created VCN and subnet"); + System.out.println(); + + instance = + launchInstance( + computeClient, subnet, compartmentId, kmsKeyId, INSTANCE_DISPLAY_NAME); + System.out.println("Launched instance"); + System.out.println(); + + volume = + createVolume( + blockStorageClient, + compartmentId, + adToUse, + kmsKeyId, + VOL_THREE_DISPLAY_NAME); + + VolumeAttachment pvEncryptionInTransitAttachment = null; + // IsPvEncryptionInTransitEnabled is supported for PV volume attachment when it's enabled in the instance launch options. + if (instance.getLaunchOptions().getIsPvEncryptionInTransitEnabled()) { + pvEncryptionInTransitAttachment = + attachParavirtualizedVolume(computeClient, volume, instance, Boolean.TRUE); + } + + // Note here that in the returned results, each record is actually a subtype of VolumeAttachment corresponding to what type was specified when attaching + listVolumeAttachmentsOnInstance(computeClient, instance); + + if (pvEncryptionInTransitAttachment != null) { + detachVolume(computeClient, pvEncryptionInTransitAttachment); + } + } catch (Exception ex) { + System.out.println(ex.toString()); + } finally { + System.out.println("Clean Up"); + System.out.println("=========="); + + if (volume != null) { + deleteVolume(blockStorageClient, volume); + System.out.println("Deleted volume three"); + } + + if (instance != null) { + terminateInstance(computeClient, instance); + System.out.println("Terminated instance"); + } + + if (subnet != null) { + deleteSubnet(vcnClient, subnet); + System.out.println("Deleted subnet"); + } + + if (vcn != null) { + deleteVcn(vcnClient, vcn); + System.out.println("Deleted VCN"); + } + + blockStorageClient.close(); + computeClient.close(); + vcnClient.close(); + identityClient.close(); + } + } + + /** + * Launches an instance and waits for it to become available/running + * + * @param computeClient the client used to communicate with the service + * @param subnet the subnet where the instance will be launched + * @param compartmentId the OCID of the compartment where the instance will be launched + * @param kmsKeyId the OCID of the KMS key in the tenant + * @param displayName the display name of the instance + * @return the created instance + * + * @throws Exception if an error was encountered while waiting for the instance to become running/available + */ + protected static Instance launchInstance( + final ComputeClient computeClient, + final Subnet subnet, + final String compartmentId, + final String kmsKeyId, + final String displayName) + throws Exception { + + Image image = + getImageForOsAndShape( + computeClient, + compartmentId, + INSTANCE_OS, + INSTANCE_OS_VERSION, + INSTANCE_SHAPE); + + // IsPvEncryptionInTransitEnabled is supported for launching instance when it's enabled in the image launch options. + System.out.println( + "The image's IsPvEncryptionInTransitEnabled flag: " + + image.getLaunchOptions().getIsPvEncryptionInTransitEnabled()); + + InstanceSourceViaImageDetails instanceSourceViaImageDetails = + InstanceSourceViaImageDetails.builder() + .imageId(image.getId()) + .kmsKeyId(kmsKeyId) + .build(); + + final LaunchInstanceResponse launchResponse = + computeClient.launchInstance( + LaunchInstanceRequest.builder() + .launchInstanceDetails( + LaunchInstanceDetails.builder() + .availabilityDomain(subnet.getAvailabilityDomain()) + .compartmentId(compartmentId) + .displayName(INSTANCE_DISPLAY_NAME) + .shape(INSTANCE_SHAPE) + .subnetId(subnet.getId()) + .sourceDetails(instanceSourceViaImageDetails) + .isPvEncryptionInTransitEnabled( + image.getLaunchOptions() + .getIsPvEncryptionInTransitEnabled()) + .build()) + .build()); + + final GetInstanceResponse getResponse = + computeClient + .getWaiters() + .forInstance( + GetInstanceRequest.builder() + .instanceId(launchResponse.getInstance().getId()) + .build(), + Instance.LifecycleState.Running) + .execute(); + + return getResponse.getInstance(); + } + + /** + * Attaches a volume to an instance as a paravirtualized volume and waits for the attachment to complete + * + * @param computeClient the client used to communicate with the service + * @param volume the volume to attach + * @param instance the instance to attach the volume to + * @param isPvEncryptionInTransitEnabled if the PvEncryptionInTransit is Enabled for the PV volume attachment + * + * @return the volume attachment. Note that this is actually an {@link com.oracle.bmc.core.models.ParavirtualizedVolumeAttachment}, which is a subclass + * of {@link com.oracle.bmc.core.models.VolumeAttachment} + * + * @throws Exception if there was an error waiting for the volume attachment + */ + private static VolumeAttachment attachParavirtualizedVolume( + final ComputeClient computeClient, + final Volume volume, + final Instance instance, + Boolean isPvEncryptionInTransitEnabled) + throws Exception { + + return attachVolume( + computeClient, + AttachParavirtualizedVolumeDetails.builder() + .volumeId(volume.getId()) + .instanceId(instance.getId()) + .isPvEncryptionInTransitEnabled(isPvEncryptionInTransitEnabled) + .build()); + } +} diff --git a/bmc-filestorage/pom.xml b/bmc-filestorage/pom.xml index 5e83314927e..5ce27090808 100644 --- a/bmc-filestorage/pom.xml +++ b/bmc-filestorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-full/pom.xml b/bmc-full/pom.xml index aa05a27e684..61fe00b9670 100644 --- a/bmc-full/pom.xml +++ b/bmc-full/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml oci-java-sdk-full @@ -16,7 +16,7 @@ com.oracle.oci.sdk oci-java-sdk-bom - 1.3.2 + 1.3.3 pom import diff --git a/bmc-identity/pom.xml b/bmc-identity/pom.xml index 8f4780d81fe..83cfcbc5b9a 100644 --- a/bmc-identity/pom.xml +++ b/bmc-identity/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/Identity.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/Identity.java index ca61adbe1f1..27a40f46c4c 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/Identity.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/Identity.java @@ -717,6 +717,15 @@ CreateRegionSubscriptionResponse createRegionSubscription( */ ListGroupsResponse listGroups(ListGroupsRequest request); + /** + * Lists the identity provider groups. + * @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. + */ + ListIdentityProviderGroupsResponse listIdentityProviderGroups( + ListIdentityProviderGroupsRequest request); + /** * Lists all the identity providers in your tenancy. You must specify the identity provider type (e.g., `SAML2` for * identity providers using the SAML2.0 protocol). You must specify your tenancy's OCID as the value for the @@ -854,6 +863,15 @@ ListUserGroupMembershipsResponse listUserGroupMemberships( */ RemoveUserFromGroupResponse removeUserFromGroup(RemoveUserFromGroupRequest request); + /** + * Resets the OAuth2 client credentials for the SCIM client associated with this identity provider. + * + * @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. + */ + ResetIdpScimClientResponse resetIdpScimClient(ResetIdpScimClientRequest request); + /** * Updates the specified auth token's description. * @@ -977,6 +995,15 @@ ListUserGroupMembershipsResponse listUserGroupMemberships( */ UpdateUserResponse updateUser(UpdateUserRequest request); + /** + * Updates the capabilities of the specified user. + * + * @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. + */ + UpdateUserCapabilitiesResponse updateUserCapabilities(UpdateUserCapabilitiesRequest request); + /** * Updates the state of the specified user. * diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java index e6954b7eb8c..f4964d2bf1e 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java @@ -1071,6 +1071,22 @@ java.util.concurrent.Future listGroups( ListGroupsRequest request, com.oracle.bmc.responses.AsyncHandler handler); + /** + * Lists the identity provider groups. + * + * @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 listIdentityProviderGroups( + ListIdentityProviderGroupsRequest request, + com.oracle.bmc.responses.AsyncHandler< + ListIdentityProviderGroupsRequest, ListIdentityProviderGroupsResponse> + handler); + /** * Lists all the identity providers in your tenancy. You must specify the identity provider type (e.g., `SAML2` for * identity providers using the SAML2.0 protocol). You must specify your tenancy's OCID as the value for the @@ -1303,6 +1319,23 @@ java.util.concurrent.Future removeUserFromGroup( RemoveUserFromGroupRequest, RemoveUserFromGroupResponse> handler); + /** + * Resets the OAuth2 client credentials for the SCIM client associated with this identity provider. + * + * + * @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 resetIdpScimClient( + ResetIdpScimClientRequest request, + com.oracle.bmc.responses.AsyncHandler< + ResetIdpScimClientRequest, ResetIdpScimClientResponse> + handler); + /** * Updates the specified auth token's description. * @@ -1522,6 +1555,23 @@ java.util.concurrent.Future updateUser( UpdateUserRequest request, com.oracle.bmc.responses.AsyncHandler handler); + /** + * Updates the capabilities of the specified user. + * + * + * @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 updateUserCapabilities( + UpdateUserCapabilitiesRequest request, + com.oracle.bmc.responses.AsyncHandler< + UpdateUserCapabilitiesRequest, UpdateUserCapabilitiesResponse> + handler); + /** * Updates the state of the specified user. * 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 7ca8f8bb782..e0c88bf29ea 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 @@ -3901,6 +3901,79 @@ public java.util.concurrent.Future get() { } } + @Override + public java.util.concurrent.Future + listIdentityProviderGroups( + final ListIdentityProviderGroupsRequest request, + final com.oracle.bmc.responses.AsyncHandler< + ListIdentityProviderGroupsRequest, + ListIdentityProviderGroupsResponse> + handler) { + LOG.trace("Called async listIdentityProviderGroups"); + final ListIdentityProviderGroupsRequest interceptedRequest = + ListIdentityProviderGroupsConverter.interceptRequest(request); + final com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ListIdentityProviderGroupsConverter.fromRequest(client, interceptedRequest); + final com.google.common.base.Function< + javax.ws.rs.core.Response, ListIdentityProviderGroupsResponse> + transformer = ListIdentityProviderGroupsConverter.fromResponse(); + + com.oracle.bmc.responses.AsyncHandler< + ListIdentityProviderGroupsRequest, ListIdentityProviderGroupsResponse> + handlerToUse = handler; + if (handler != null + && this.authenticationDetailsProvider + instanceof com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) { + handlerToUse = + new com.oracle.bmc.util.internal.RefreshAuthTokenWrappingAsyncHandler< + ListIdentityProviderGroupsRequest, ListIdentityProviderGroupsResponse>( + (com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) + this.authenticationDetailsProvider, + handler) { + @Override + public void retryCall() { + final com.oracle.bmc.util.internal.Consumer + onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>( + this, transformer, interceptedRequest); + final com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>( + this, interceptedRequest); + client.get(ib, interceptedRequest, onSuccess, onError); + } + }; + } + + final com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>( + handlerToUse, transformer, interceptedRequest); + final com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handlerToUse, interceptedRequest); + + java.util.concurrent.Future responseFuture = + client.get(ib, interceptedRequest, onSuccess, onError); + + if (this.authenticationDetailsProvider + instanceof com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) { + return new com.oracle.bmc.util.internal.RefreshAuthTokenTransformingFuture< + javax.ws.rs.core.Response, ListIdentityProviderGroupsResponse>( + responseFuture, + transformer, + (com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) + this.authenticationDetailsProvider, + new com.google.common.base.Supplier< + java.util.concurrent.Future>() { + @Override + public java.util.concurrent.Future get() { + return client.get(ib, interceptedRequest, onSuccess, onError); + } + }); + } else { + return new com.oracle.bmc.util.internal.TransformingFuture<>( + responseFuture, transformer); + } + } + @Override public java.util.concurrent.Future listIdentityProviders( final ListIdentityProvidersRequest request, @@ -4804,6 +4877,75 @@ public java.util.concurrent.Future get() { } } + @Override + public java.util.concurrent.Future resetIdpScimClient( + final ResetIdpScimClientRequest request, + final com.oracle.bmc.responses.AsyncHandler< + ResetIdpScimClientRequest, ResetIdpScimClientResponse> + handler) { + LOG.trace("Called async resetIdpScimClient"); + final ResetIdpScimClientRequest interceptedRequest = + ResetIdpScimClientConverter.interceptRequest(request); + final com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ResetIdpScimClientConverter.fromRequest(client, interceptedRequest); + final com.google.common.base.Function + transformer = ResetIdpScimClientConverter.fromResponse(); + + com.oracle.bmc.responses.AsyncHandler + handlerToUse = handler; + if (handler != null + && this.authenticationDetailsProvider + instanceof com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) { + handlerToUse = + new com.oracle.bmc.util.internal.RefreshAuthTokenWrappingAsyncHandler< + ResetIdpScimClientRequest, ResetIdpScimClientResponse>( + (com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) + this.authenticationDetailsProvider, + handler) { + @Override + public void retryCall() { + final com.oracle.bmc.util.internal.Consumer + onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>( + this, transformer, interceptedRequest); + final com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>( + this, interceptedRequest); + client.post(ib, interceptedRequest, onSuccess, onError); + } + }; + } + + final com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>( + handlerToUse, transformer, interceptedRequest); + final com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handlerToUse, interceptedRequest); + + java.util.concurrent.Future responseFuture = + client.post(ib, interceptedRequest, onSuccess, onError); + + if (this.authenticationDetailsProvider + instanceof com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) { + return new com.oracle.bmc.util.internal.RefreshAuthTokenTransformingFuture< + javax.ws.rs.core.Response, ResetIdpScimClientResponse>( + responseFuture, + transformer, + (com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) + this.authenticationDetailsProvider, + new com.google.common.base.Supplier< + java.util.concurrent.Future>() { + @Override + public java.util.concurrent.Future get() { + return client.post(ib, interceptedRequest, onSuccess, onError); + } + }); + } else { + return new com.oracle.bmc.util.internal.TransformingFuture<>( + responseFuture, transformer); + } + } + @Override public java.util.concurrent.Future updateAuthToken( final UpdateAuthTokenRequest request, @@ -5900,6 +6042,92 @@ public java.util.concurrent.Future get() { } } + @Override + public java.util.concurrent.Future updateUserCapabilities( + final UpdateUserCapabilitiesRequest request, + final com.oracle.bmc.responses.AsyncHandler< + UpdateUserCapabilitiesRequest, UpdateUserCapabilitiesResponse> + handler) { + LOG.trace("Called async updateUserCapabilities"); + final UpdateUserCapabilitiesRequest interceptedRequest = + UpdateUserCapabilitiesConverter.interceptRequest(request); + final com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + UpdateUserCapabilitiesConverter.fromRequest(client, interceptedRequest); + final com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateUserCapabilitiesResponse> + transformer = UpdateUserCapabilitiesConverter.fromResponse(); + + com.oracle.bmc.responses.AsyncHandler< + UpdateUserCapabilitiesRequest, UpdateUserCapabilitiesResponse> + handlerToUse = handler; + if (handler != null + && this.authenticationDetailsProvider + instanceof com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) { + handlerToUse = + new com.oracle.bmc.util.internal.RefreshAuthTokenWrappingAsyncHandler< + UpdateUserCapabilitiesRequest, UpdateUserCapabilitiesResponse>( + (com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) + this.authenticationDetailsProvider, + handler) { + @Override + public void retryCall() { + final com.oracle.bmc.util.internal.Consumer + onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>( + this, transformer, interceptedRequest); + final com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>( + this, interceptedRequest); + client.put( + ib, + interceptedRequest.getUpdateUserCapabilitiesDetails(), + interceptedRequest, + onSuccess, + onError); + } + }; + } + + final com.oracle.bmc.util.internal.Consumer onSuccess = + new com.oracle.bmc.http.internal.SuccessConsumer<>( + handlerToUse, transformer, interceptedRequest); + final com.oracle.bmc.util.internal.Consumer onError = + new com.oracle.bmc.http.internal.ErrorConsumer<>(handlerToUse, interceptedRequest); + + java.util.concurrent.Future responseFuture = + client.put( + ib, + interceptedRequest.getUpdateUserCapabilitiesDetails(), + interceptedRequest, + onSuccess, + onError); + + if (this.authenticationDetailsProvider + instanceof com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) { + return new com.oracle.bmc.util.internal.RefreshAuthTokenTransformingFuture< + javax.ws.rs.core.Response, UpdateUserCapabilitiesResponse>( + responseFuture, + transformer, + (com.oracle.bmc.auth.RefreshableOnNotAuthenticatedProvider) + this.authenticationDetailsProvider, + new com.google.common.base.Supplier< + java.util.concurrent.Future>() { + @Override + public java.util.concurrent.Future get() { + return client.put( + ib, + interceptedRequest.getUpdateUserCapabilitiesDetails(), + interceptedRequest, + onSuccess, + onError); + } + }); + } else { + return new com.oracle.bmc.util.internal.TransformingFuture<>( + responseFuture, transformer); + } + } + @Override public java.util.concurrent.Future updateUserState( final UpdateUserStateRequest request, 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 f747c1890c9..2a7b255c269 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 @@ -1562,6 +1562,33 @@ && canRetryRequestIfRefreshableAuthTokenUsed(e)) { } } + @Override + public ListIdentityProviderGroupsResponse listIdentityProviderGroups( + ListIdentityProviderGroupsRequest request) { + LOG.trace("Called listIdentityProviderGroups"); + request = ListIdentityProviderGroupsConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ListIdentityProviderGroupsConverter.fromRequest(client, request); + com.google.common.base.Function< + javax.ws.rs.core.Response, ListIdentityProviderGroupsResponse> + transformer = ListIdentityProviderGroupsConverter.fromResponse(); + + int attempts = 0; + while (true) { + try { + javax.ws.rs.core.Response response = client.get(ib, request); + return transformer.apply(response); + } catch (com.oracle.bmc.model.BmcException e) { + if (++attempts < MAX_IMMEDIATE_RETRIES_IF_USING_INSTANCE_PRINCIPALS + && canRetryRequestIfRefreshableAuthTokenUsed(e)) { + continue; + } else { + throw e; + } + } + } + } + @Override public ListIdentityProvidersResponse listIdentityProviders( ListIdentityProvidersRequest request) { @@ -1890,6 +1917,31 @@ && canRetryRequestIfRefreshableAuthTokenUsed(e)) { } } + @Override + public ResetIdpScimClientResponse resetIdpScimClient(ResetIdpScimClientRequest request) { + LOG.trace("Called resetIdpScimClient"); + request = ResetIdpScimClientConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + ResetIdpScimClientConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = ResetIdpScimClientConverter.fromResponse(); + + int attempts = 0; + while (true) { + try { + javax.ws.rs.core.Response response = client.post(ib, request); + return transformer.apply(response); + } catch (com.oracle.bmc.model.BmcException e) { + if (++attempts < MAX_IMMEDIATE_RETRIES_IF_USING_INSTANCE_PRINCIPALS + && canRetryRequestIfRefreshableAuthTokenUsed(e)) { + continue; + } else { + throw e; + } + } + } + } + @Override public UpdateAuthTokenResponse updateAuthToken(UpdateAuthTokenRequest request) { LOG.trace("Called updateAuthToken"); @@ -2231,6 +2283,33 @@ && canRetryRequestIfRefreshableAuthTokenUsed(e)) { } } + @Override + public UpdateUserCapabilitiesResponse updateUserCapabilities( + UpdateUserCapabilitiesRequest request) { + LOG.trace("Called updateUserCapabilities"); + request = UpdateUserCapabilitiesConverter.interceptRequest(request); + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = + UpdateUserCapabilitiesConverter.fromRequest(client, request); + com.google.common.base.Function + transformer = UpdateUserCapabilitiesConverter.fromResponse(); + + int attempts = 0; + while (true) { + try { + javax.ws.rs.core.Response response = + client.put(ib, request.getUpdateUserCapabilitiesDetails(), request); + return transformer.apply(response); + } catch (com.oracle.bmc.model.BmcException e) { + if (++attempts < MAX_IMMEDIATE_RETRIES_IF_USING_INSTANCE_PRINCIPALS + && canRetryRequestIfRefreshableAuthTokenUsed(e)) { + continue; + } else { + throw e; + } + } + } + } + @Override public UpdateUserStateResponse updateUserState(UpdateUserStateRequest request) { LOG.trace("Called updateUserState"); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityPaginators.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityPaginators.java index af298a360df..c2b675f03cd 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityPaginators.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityPaginators.java @@ -363,6 +363,125 @@ public java.util.List apply( }); } + /** + * Creates a new iterable which will iterate over the responses received from the listIdentityProviderGroups operation. This iterable + * will fetch more data from the server as needed. + * + * @param request a request which can be sent to the service operation + * @return an {@link java.lang.Iterable} which can be used to iterate over the responses received from the service. + */ + public Iterable listIdentityProviderGroupsResponseIterator( + final ListIdentityProviderGroupsRequest request) { + return new com.oracle.bmc.paginator.internal.ResponseIterable< + ListIdentityProviderGroupsRequest.Builder, ListIdentityProviderGroupsRequest, + ListIdentityProviderGroupsResponse>( + new com.google.common.base.Supplier() { + @Override + public ListIdentityProviderGroupsRequest.Builder get() { + return ListIdentityProviderGroupsRequest.builder().copy(request); + } + }, + new com.google.common.base.Function() { + @Override + public String apply(ListIdentityProviderGroupsResponse response) { + return response.getOpcNextPage(); + } + }, + new com.google.common.base.Function< + com.oracle.bmc.paginator.internal.RequestBuilderAndToken< + ListIdentityProviderGroupsRequest.Builder>, + ListIdentityProviderGroupsRequest>() { + @Override + public ListIdentityProviderGroupsRequest apply( + com.oracle.bmc.paginator.internal.RequestBuilderAndToken< + ListIdentityProviderGroupsRequest.Builder> + input) { + if (input.getToken() == null) { + return input.getRequestBuilder().build(); + } else { + return input.getRequestBuilder() + .page(input.getToken().orNull()) + .build(); + } + } + }, + new com.google.common.base.Function< + ListIdentityProviderGroupsRequest, ListIdentityProviderGroupsResponse>() { + @Override + public ListIdentityProviderGroupsResponse apply( + ListIdentityProviderGroupsRequest request) { + return client.listIdentityProviderGroups(request); + } + }); + } + + /** + * Creates a new iterable which will iterate over the {@link com.oracle.bmc.identity.model.IdentityProviderGroupSummary} objects + * contained in responses from the listIdentityProviderGroups operation. This iterable will fetch more data from the + * server as needed. + * + * @param request a request which can be sent to the service operation + * @return an {@link java.lang.Iterable} which can be used to iterate over the {@link com.oracle.bmc.identity.model.IdentityProviderGroupSummary} objects + * contained in responses received from the service. + */ + public Iterable + listIdentityProviderGroupsRecordIterator( + final ListIdentityProviderGroupsRequest request) { + return new com.oracle.bmc.paginator.internal.ResponseRecordIterable< + ListIdentityProviderGroupsRequest.Builder, ListIdentityProviderGroupsRequest, + ListIdentityProviderGroupsResponse, + com.oracle.bmc.identity.model.IdentityProviderGroupSummary>( + new com.google.common.base.Supplier() { + @Override + public ListIdentityProviderGroupsRequest.Builder get() { + return ListIdentityProviderGroupsRequest.builder().copy(request); + } + }, + new com.google.common.base.Function() { + @Override + public String apply(ListIdentityProviderGroupsResponse response) { + return response.getOpcNextPage(); + } + }, + new com.google.common.base.Function< + com.oracle.bmc.paginator.internal.RequestBuilderAndToken< + ListIdentityProviderGroupsRequest.Builder>, + ListIdentityProviderGroupsRequest>() { + @Override + public ListIdentityProviderGroupsRequest apply( + com.oracle.bmc.paginator.internal.RequestBuilderAndToken< + ListIdentityProviderGroupsRequest.Builder> + input) { + if (input.getToken() == null) { + return input.getRequestBuilder().build(); + } else { + return input.getRequestBuilder() + .page(input.getToken().orNull()) + .build(); + } + } + }, + new com.google.common.base.Function< + ListIdentityProviderGroupsRequest, ListIdentityProviderGroupsResponse>() { + @Override + public ListIdentityProviderGroupsResponse apply( + ListIdentityProviderGroupsRequest request) { + return client.listIdentityProviderGroups(request); + } + }, + new com.google.common.base.Function< + ListIdentityProviderGroupsResponse, + java.util.List< + com.oracle.bmc.identity.model.IdentityProviderGroupSummary>>() { + @Override + public java.util.List< + com.oracle.bmc.identity.model.IdentityProviderGroupSummary> + apply(ListIdentityProviderGroupsResponse response) { + return response.getItems(); + } + }); + } + /** * Creates a new iterable which will iterate over the responses received from the listIdentityProviders operation. This iterable * will fetch more data from the server as needed. diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdentityProviderGroupsConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdentityProviderGroupsConverter.java new file mode 100644 index 00000000000..228c5a527e8 --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListIdentityProviderGroupsConverter.java @@ -0,0 +1,129 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.internal.http; + +import com.oracle.bmc.identity.model.*; +import com.oracle.bmc.identity.requests.*; +import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class ListIdentityProviderGroupsConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static ListIdentityProviderGroupsRequest interceptRequest( + ListIdentityProviderGroupsRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, + ListIdentityProviderGroupsRequest request) { + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("identityProviders") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getIdentityProviderId())) + .path("groups"); + + if (request.getPage() != null) { + target = + target.queryParam( + "page", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getPage())); + } + + if (request.getLimit() != null) { + target = + target.queryParam( + "limit", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getLimit())); + } + + 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, ListIdentityProviderGroupsResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, ListIdentityProviderGroupsResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, ListIdentityProviderGroupsResponse>() { + @Override + public ListIdentityProviderGroupsResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for ListIdentityProviderGroupsResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + java.util.List< + IdentityProviderGroupSummary>>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + new javax.ws.rs.core.GenericType< + java.util.List< + IdentityProviderGroupSummary>>() {}); + + com.oracle.bmc.http.internal.WithHeaders< + java.util.List> + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + ListIdentityProviderGroupsResponse.Builder builder = + ListIdentityProviderGroupsResponse.builder(); + + builder.items(response.getItem()); + + 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)); + } + + 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)); + } + + ListIdentityProviderGroupsResponse responseWrapper = + builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java index 6a884962d6c..1d72f719edf 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ListUsersConverter.java @@ -50,6 +50,22 @@ public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( request.getLimit())); } + if (request.getIdentityProviderId() != null) { + target = + target.queryParam( + "identityProviderId", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getIdentityProviderId())); + } + + if (request.getExternalIdentifier() != null) { + target = + target.queryParam( + "externalIdentifier", + com.oracle.bmc.util.internal.HttpUtils.attemptEncodeQueryParam( + request.getExternalIdentifier())); + } + com.oracle.bmc.http.internal.WrappedInvocationBuilder ib = target.request(); ib.accept(javax.ws.rs.core.MediaType.APPLICATION_JSON); diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ResetIdpScimClientConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ResetIdpScimClientConverter.java new file mode 100644 index 00000000000..7cba40894c3 --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/ResetIdpScimClientConverter.java @@ -0,0 +1,94 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.internal.http; + +import com.oracle.bmc.identity.model.*; +import com.oracle.bmc.identity.requests.*; +import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class ResetIdpScimClientConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static ResetIdpScimClientRequest interceptRequest(ResetIdpScimClientRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, ResetIdpScimClientRequest request) { + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getIdentityProviderId(), "identityProviderId must not be blank"); + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("identityProviders") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getIdentityProviderId())) + .path("actions") + .path("resetScimClient"); + + 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, ResetIdpScimClientResponse> + fromResponse() { + final com.google.common.base.Function + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, ResetIdpScimClientResponse>() { + @Override + public ResetIdpScimClientResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for ResetIdpScimClientResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders< + ScimClientCredentials>> + responseFn = + RESPONSE_CONVERSION_FACTORY.create( + ScimClientCredentials.class); + + com.oracle.bmc.http.internal.WithHeaders + response = responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + ResetIdpScimClientResponse.Builder builder = + ResetIdpScimClientResponse.builder(); + + builder.scimClientCredentials(response.getItem()); + + 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)); + } + + ResetIdpScimClientResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserCapabilitiesConverter.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserCapabilitiesConverter.java new file mode 100644 index 00000000000..8c66b2f884c --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/internal/http/UpdateUserCapabilitiesConverter.java @@ -0,0 +1,108 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.internal.http; + +import com.oracle.bmc.identity.model.*; +import com.oracle.bmc.identity.requests.*; +import com.oracle.bmc.identity.responses.*; +import org.apache.commons.lang3.Validate; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.extern.slf4j.Slf4j +public class UpdateUserCapabilitiesConverter { + private static final com.oracle.bmc.http.internal.ResponseConversionFunctionFactory + RESPONSE_CONVERSION_FACTORY = + new com.oracle.bmc.http.internal.ResponseConversionFunctionFactory(); + + public static UpdateUserCapabilitiesRequest interceptRequest( + UpdateUserCapabilitiesRequest request) { + + return request; + } + + public static com.oracle.bmc.http.internal.WrappedInvocationBuilder fromRequest( + com.oracle.bmc.http.internal.RestClient client, UpdateUserCapabilitiesRequest request) { + Validate.notNull(request, "request instance is required"); + Validate.notBlank(request.getUserId(), "userId must not be blank"); + Validate.notNull( + request.getUpdateUserCapabilitiesDetails(), + "updateUserCapabilitiesDetails is required"); + + com.oracle.bmc.http.internal.WrappedWebTarget target = + client.getBaseTarget() + .path("/20160918") + .path("users") + .path( + com.oracle.bmc.util.internal.HttpUtils.encodePathSegment( + request.getUserId())) + .path("capabilities"); + + 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, UpdateUserCapabilitiesResponse> + fromResponse() { + final com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateUserCapabilitiesResponse> + transformer = + new com.google.common.base.Function< + javax.ws.rs.core.Response, UpdateUserCapabilitiesResponse>() { + @Override + public UpdateUserCapabilitiesResponse apply( + javax.ws.rs.core.Response rawResponse) { + LOG.trace( + "Transform function invoked for UpdateUserCapabilitiesResponse"); + com.google.common.base.Function< + javax.ws.rs.core.Response, + com.oracle.bmc.http.internal.WithHeaders> + responseFn = RESPONSE_CONVERSION_FACTORY.create(User.class); + + com.oracle.bmc.http.internal.WithHeaders response = + responseFn.apply(rawResponse); + javax.ws.rs.core.MultivaluedMap headers = + response.getHeaders(); + + UpdateUserCapabilitiesResponse.Builder builder = + UpdateUserCapabilitiesResponse.builder(); + + builder.user(response.getItem()); + + 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)); + } + + 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)); + } + + UpdateUserCapabilitiesResponse responseWrapper = builder.build(); + + return responseWrapper; + } + }; + return transformer; + } +} 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 545660d8898..22405527fc9 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 @@ -103,6 +103,15 @@ public Builder metadata(String metadata) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformAttributes") + private java.util.Map freeformAttributes; + + public Builder freeformAttributes(java.util.Map freeformAttributes) { + this.freeformAttributes = freeformAttributes; + this.__explicitlySet__.add("freeformAttributes"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -116,7 +125,8 @@ public CreateSaml2IdentityProviderDetails build() { freeformTags, definedTags, metadataUrl, - metadata); + metadata, + freeformAttributes); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -131,7 +141,8 @@ public Builder copy(CreateSaml2IdentityProviderDetails o) { .freeformTags(o.getFreeformTags()) .definedTags(o.getDefinedTags()) .metadataUrl(o.getMetadataUrl()) - .metadata(o.getMetadata()); + .metadata(o.getMetadata()) + .freeformAttributes(o.getFreeformAttributes()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -154,10 +165,12 @@ public CreateSaml2IdentityProviderDetails( java.util.Map freeformTags, java.util.Map> definedTags, String metadataUrl, - String metadata) { + String metadata, + java.util.Map freeformAttributes) { super(compartmentId, name, description, productType, freeformTags, definedTags); this.metadataUrl = metadataUrl; this.metadata = metadata; + this.freeformAttributes = freeformAttributes; } /** @@ -175,6 +188,14 @@ public CreateSaml2IdentityProviderDetails( @com.fasterxml.jackson.annotation.JsonProperty("metadata") String metadata; + /** + * Extra name value pairs associated with this identity provider. + * Example: `{\"clientId\": \"app_sf3kdjf3\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformAttributes") + java.util.Map freeformAttributes; + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/IdentityProviderGroupSummary.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/IdentityProviderGroupSummary.java new file mode 100644 index 00000000000..fed40afc541 --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/IdentityProviderGroupSummary.java @@ -0,0 +1,164 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.model; + +/** + * A group created in an identity provider that can be mapped to a group in OCI + * + *
      + * Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields + * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in + * the setter methods of the {@link Builder}, which maintain a set of all explicitly set fields called + * {@link #__explicitlySet__}. The {@link #hashCode()} and {@link #equals(Object)} methods are implemented to take + * {@link #__explicitlySet__} into account. The constructor, on the other hand, does not set {@link #__explicitlySet__} + * (since the constructor cannot distinguish explicit {@code null} from unset {@code null}). + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.AllArgsConstructor(onConstructor = @__({@Deprecated})) +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = IdentityProviderGroupSummary.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class IdentityProviderGroupSummary { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @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("identityProviderId") + private String identityProviderId; + + public Builder identityProviderId(String identityProviderId) { + this.identityProviderId = identityProviderId; + this.__explicitlySet__.add("identityProviderId"); + 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("externalIdentifier") + private String externalIdentifier; + + public Builder externalIdentifier(String externalIdentifier) { + this.externalIdentifier = externalIdentifier; + this.__explicitlySet__.add("externalIdentifier"); + 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("timeModified") + private java.util.Date timeModified; + + public Builder timeModified(java.util.Date timeModified) { + this.timeModified = timeModified; + this.__explicitlySet__.add("timeModified"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public IdentityProviderGroupSummary build() { + IdentityProviderGroupSummary __instance__ = + new IdentityProviderGroupSummary( + id, + identityProviderId, + displayName, + externalIdentifier, + timeCreated, + timeModified); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(IdentityProviderGroupSummary o) { + Builder copiedBuilder = + id(o.getId()) + .identityProviderId(o.getIdentityProviderId()) + .displayName(o.getDisplayName()) + .externalIdentifier(o.getExternalIdentifier()) + .timeCreated(o.getTimeCreated()) + .timeModified(o.getTimeModified()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The OCID of the `IdentityProviderGroup`. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("id") + String id; + + /** + * The OCID of the `IdentityProvider` this group belongs to. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("identityProviderId") + String identityProviderId; + + /** + * Display name of the group + **/ + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + String displayName; + + /** + * Identifier of the group in the identity provider + **/ + @com.fasterxml.jackson.annotation.JsonProperty("externalIdentifier") + String externalIdentifier; + + /** + * Date and time the `IdentityProviderGroup` 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; + + /** + * Date and time the `IdentityProviderGroup` was last modified, in the format defined by RFC3339. + *

      + * Example: `2016-08-25T21:10:29.600Z` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("timeModified") + java.util.Date timeModified; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} 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 3f8ed7884d0..abed97e315e 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 @@ -151,6 +151,15 @@ public Builder redirectUrl(String redirectUrl) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformAttributes") + private java.util.Map freeformAttributes; + + public Builder freeformAttributes(java.util.Map freeformAttributes) { + this.freeformAttributes = freeformAttributes; + this.__explicitlySet__.add("freeformAttributes"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -169,7 +178,8 @@ public Saml2IdentityProvider build() { definedTags, metadataUrl, signingCertificate, - redirectUrl); + redirectUrl, + freeformAttributes); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -189,7 +199,8 @@ public Builder copy(Saml2IdentityProvider o) { .definedTags(o.getDefinedTags()) .metadataUrl(o.getMetadataUrl()) .signingCertificate(o.getSigningCertificate()) - .redirectUrl(o.getRedirectUrl()); + .redirectUrl(o.getRedirectUrl()) + .freeformAttributes(o.getFreeformAttributes()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -217,7 +228,8 @@ public Saml2IdentityProvider( java.util.Map> definedTags, String metadataUrl, String signingCertificate, - String redirectUrl) { + String redirectUrl, + java.util.Map freeformAttributes) { super( id, compartmentId, @@ -232,6 +244,7 @@ public Saml2IdentityProvider( this.metadataUrl = metadataUrl; this.signingCertificate = signingCertificate; this.redirectUrl = redirectUrl; + this.freeformAttributes = freeformAttributes; } /** @@ -258,6 +271,14 @@ public Saml2IdentityProvider( @com.fasterxml.jackson.annotation.JsonProperty("redirectUrl") String redirectUrl; + /** + * Extra name value pairs associated with this identity provider. + * Example: `{\"clientId\": \"app_sf3kdjf3\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformAttributes") + java.util.Map freeformAttributes; + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ScimClientCredentials.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ScimClientCredentials.java new file mode 100644 index 00000000000..24d94efbb52 --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/ScimClientCredentials.java @@ -0,0 +1,85 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.model; + +/** + * The OAuth2 client credentials. + * + *
      + * Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields + * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in + * the setter methods of the {@link Builder}, which maintain a set of all explicitly set fields called + * {@link #__explicitlySet__}. The {@link #hashCode()} and {@link #equals(Object)} methods are implemented to take + * {@link #__explicitlySet__} into account. The constructor, on the other hand, does not set {@link #__explicitlySet__} + * (since the constructor cannot distinguish explicit {@code null} from unset {@code null}). + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.AllArgsConstructor(onConstructor = @__({@Deprecated})) +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = ScimClientCredentials.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class ScimClientCredentials { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("clientId") + private String clientId; + + public Builder clientId(String clientId) { + this.clientId = clientId; + this.__explicitlySet__.add("clientId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("clientSecret") + private String clientSecret; + + public Builder clientSecret(String clientSecret) { + this.clientSecret = clientSecret; + this.__explicitlySet__.add("clientSecret"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public ScimClientCredentials build() { + ScimClientCredentials __instance__ = new ScimClientCredentials(clientId, clientSecret); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(ScimClientCredentials o) { + Builder copiedBuilder = clientId(o.getClientId()).clientSecret(o.getClientSecret()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * The client identifier. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("clientId") + String clientId; + + /** + * The client secret. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("clientSecret") + String clientSecret; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} 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 fd5cec9cdcb..0adf27855b3 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 @@ -76,13 +76,27 @@ public Builder metadata(String metadata) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("freeformAttributes") + private java.util.Map freeformAttributes; + + public Builder freeformAttributes(java.util.Map freeformAttributes) { + this.freeformAttributes = freeformAttributes; + this.__explicitlySet__.add("freeformAttributes"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public UpdateSaml2IdentityProviderDetails build() { UpdateSaml2IdentityProviderDetails __instance__ = new UpdateSaml2IdentityProviderDetails( - description, freeformTags, definedTags, metadataUrl, metadata); + description, + freeformTags, + definedTags, + metadataUrl, + metadata, + freeformAttributes); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -94,7 +108,8 @@ public Builder copy(UpdateSaml2IdentityProviderDetails o) { .freeformTags(o.getFreeformTags()) .definedTags(o.getDefinedTags()) .metadataUrl(o.getMetadataUrl()) - .metadata(o.getMetadata()); + .metadata(o.getMetadata()) + .freeformAttributes(o.getFreeformAttributes()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -114,10 +129,12 @@ public UpdateSaml2IdentityProviderDetails( java.util.Map freeformTags, java.util.Map> definedTags, String metadataUrl, - String metadata) { + String metadata, + java.util.Map freeformAttributes) { super(description, freeformTags, definedTags); this.metadataUrl = metadataUrl; this.metadata = metadata; + this.freeformAttributes = freeformAttributes; } /** @@ -135,6 +152,14 @@ public UpdateSaml2IdentityProviderDetails( @com.fasterxml.jackson.annotation.JsonProperty("metadata") String metadata; + /** + * Extra name value pairs associated with this identity provider. + * Example: `{\"clientId\": \"app_sf3kdjf3\"}` + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("freeformAttributes") + java.util.Map freeformAttributes; + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserCapabilitiesDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserCapabilitiesDetails.java new file mode 100644 index 00000000000..177e41e71ed --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateUserCapabilitiesDetails.java @@ -0,0 +1,145 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.model; + +/** + * + *
      + * Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields + * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in + * the setter methods of the {@link Builder}, which maintain a set of all explicitly set fields called + * {@link #__explicitlySet__}. The {@link #hashCode()} and {@link #equals(Object)} methods are implemented to take + * {@link #__explicitlySet__} into account. The constructor, on the other hand, does not set {@link #__explicitlySet__} + * (since the constructor cannot distinguish explicit {@code null} from unset {@code null}). + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.AllArgsConstructor(onConstructor = @__({@Deprecated})) +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = UpdateUserCapabilitiesDetails.Builder.class +) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class UpdateUserCapabilitiesDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("canUseConsolePassword") + private Boolean canUseConsolePassword; + + public Builder canUseConsolePassword(Boolean canUseConsolePassword) { + this.canUseConsolePassword = canUseConsolePassword; + this.__explicitlySet__.add("canUseConsolePassword"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("canUseApiKeys") + private Boolean canUseApiKeys; + + public Builder canUseApiKeys(Boolean canUseApiKeys) { + this.canUseApiKeys = canUseApiKeys; + this.__explicitlySet__.add("canUseApiKeys"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("canUseAuthTokens") + private Boolean canUseAuthTokens; + + public Builder canUseAuthTokens(Boolean canUseAuthTokens) { + this.canUseAuthTokens = canUseAuthTokens; + this.__explicitlySet__.add("canUseAuthTokens"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("canUseSmtpCredentials") + private Boolean canUseSmtpCredentials; + + public Builder canUseSmtpCredentials(Boolean canUseSmtpCredentials) { + this.canUseSmtpCredentials = canUseSmtpCredentials; + this.__explicitlySet__.add("canUseSmtpCredentials"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("canUseCustomerSecretKeys") + private Boolean canUseCustomerSecretKeys; + + public Builder canUseCustomerSecretKeys(Boolean canUseCustomerSecretKeys) { + this.canUseCustomerSecretKeys = canUseCustomerSecretKeys; + this.__explicitlySet__.add("canUseCustomerSecretKeys"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public UpdateUserCapabilitiesDetails build() { + UpdateUserCapabilitiesDetails __instance__ = + new UpdateUserCapabilitiesDetails( + canUseConsolePassword, + canUseApiKeys, + canUseAuthTokens, + canUseSmtpCredentials, + canUseCustomerSecretKeys); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(UpdateUserCapabilitiesDetails o) { + Builder copiedBuilder = + canUseConsolePassword(o.getCanUseConsolePassword()) + .canUseApiKeys(o.getCanUseApiKeys()) + .canUseAuthTokens(o.getCanUseAuthTokens()) + .canUseSmtpCredentials(o.getCanUseSmtpCredentials()) + .canUseCustomerSecretKeys(o.getCanUseCustomerSecretKeys()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * Indicates if the user can log in to the console. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseConsolePassword") + Boolean canUseConsolePassword; + + /** + * Indicates if the user can use API keys. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseApiKeys") + Boolean canUseApiKeys; + + /** + * Indicates if the user can use SWIFT passwords / auth tokens. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseAuthTokens") + Boolean canUseAuthTokens; + + /** + * Indicates if the user can use SMTP passwords. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseSmtpCredentials") + Boolean canUseSmtpCredentials; + + /** + * Indicates if the user can use SigV4 symmetric keys. + * + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseCustomerSecretKeys") + Boolean canUseCustomerSecretKeys; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} 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 67f8b8c2783..03818c49b27 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 @@ -75,6 +75,24 @@ public Builder description(String description) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("identityProviderId") + private String identityProviderId; + + public Builder identityProviderId(String identityProviderId) { + this.identityProviderId = identityProviderId; + this.__explicitlySet__.add("identityProviderId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("externalIdentifier") + private String externalIdentifier; + + public Builder externalIdentifier(String externalIdentifier) { + this.externalIdentifier = externalIdentifier; + this.__explicitlySet__.add("externalIdentifier"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("timeCreated") private java.util.Date timeCreated; @@ -121,6 +139,15 @@ public Builder definedTags( return this; } + @com.fasterxml.jackson.annotation.JsonProperty("capabilities") + private UserCapabilities capabilities; + + public Builder capabilities(UserCapabilities capabilities) { + this.capabilities = capabilities; + this.__explicitlySet__.add("capabilities"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -131,11 +158,14 @@ public User build() { compartmentId, name, description, + identityProviderId, + externalIdentifier, timeCreated, lifecycleState, inactiveStatus, freeformTags, - definedTags); + definedTags, + capabilities); __instance__.__explicitlySet__.addAll(__explicitlySet__); return __instance__; } @@ -147,11 +177,14 @@ public Builder copy(User o) { .compartmentId(o.getCompartmentId()) .name(o.getName()) .description(o.getDescription()) + .identityProviderId(o.getIdentityProviderId()) + .externalIdentifier(o.getExternalIdentifier()) .timeCreated(o.getTimeCreated()) .lifecycleState(o.getLifecycleState()) .inactiveStatus(o.getInactiveStatus()) .freeformTags(o.getFreeformTags()) - .definedTags(o.getDefinedTags()); + .definedTags(o.getDefinedTags()) + .capabilities(o.getCapabilities()); copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); return copiedBuilder; @@ -191,6 +224,18 @@ public static Builder builder() { @com.fasterxml.jackson.annotation.JsonProperty("description") String description; + /** + * The OCID of the `IdentityProvider` this user belongs to. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("identityProviderId") + String identityProviderId; + + /** + * Identifier of the user in the identity provider + **/ + @com.fasterxml.jackson.annotation.JsonProperty("externalIdentifier") + String externalIdentifier; + /** * Date and time the user was created, in the format defined by RFC3339. *

      @@ -288,6 +333,12 @@ public static LifecycleState create(String key) { @com.fasterxml.jackson.annotation.JsonProperty("definedTags") java.util.Map> definedTags; + /** + * Properties indicating how the user is allowed to authenticate. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("capabilities") + UserCapabilities capabilities; + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserCapabilities.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserCapabilities.java new file mode 100644 index 00000000000..8ab4771b1f9 --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UserCapabilities.java @@ -0,0 +1,138 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.model; + +/** + * Properties indicating how the user is allowed to authenticate. + *
      + * Note: Objects should always be created or deserialized using the {@link Builder}. This model distinguishes fields + * that are {@code null} because they are unset from fields that are explicitly set to {@code null}. This is done in + * the setter methods of the {@link Builder}, which maintain a set of all explicitly set fields called + * {@link #__explicitlySet__}. The {@link #hashCode()} and {@link #equals(Object)} methods are implemented to take + * {@link #__explicitlySet__} into account. The constructor, on the other hand, does not set {@link #__explicitlySet__} + * (since the constructor cannot distinguish explicit {@code null} from unset {@code null}). + **/ +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.AllArgsConstructor(onConstructor = @__({@Deprecated})) +@lombok.Value +@com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = UserCapabilities.Builder.class) +@com.fasterxml.jackson.annotation.JsonFilter(com.oracle.bmc.http.internal.ExplicitlySetFilter.NAME) +public class UserCapabilities { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + @lombok.experimental.Accessors(fluent = true) + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("canUseConsolePassword") + private Boolean canUseConsolePassword; + + public Builder canUseConsolePassword(Boolean canUseConsolePassword) { + this.canUseConsolePassword = canUseConsolePassword; + this.__explicitlySet__.add("canUseConsolePassword"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("canUseApiKeys") + private Boolean canUseApiKeys; + + public Builder canUseApiKeys(Boolean canUseApiKeys) { + this.canUseApiKeys = canUseApiKeys; + this.__explicitlySet__.add("canUseApiKeys"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("canUseAuthTokens") + private Boolean canUseAuthTokens; + + public Builder canUseAuthTokens(Boolean canUseAuthTokens) { + this.canUseAuthTokens = canUseAuthTokens; + this.__explicitlySet__.add("canUseAuthTokens"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("canUseSmtpCredentials") + private Boolean canUseSmtpCredentials; + + public Builder canUseSmtpCredentials(Boolean canUseSmtpCredentials) { + this.canUseSmtpCredentials = canUseSmtpCredentials; + this.__explicitlySet__.add("canUseSmtpCredentials"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("canUseCustomerSecretKeys") + private Boolean canUseCustomerSecretKeys; + + public Builder canUseCustomerSecretKeys(Boolean canUseCustomerSecretKeys) { + this.canUseCustomerSecretKeys = canUseCustomerSecretKeys; + this.__explicitlySet__.add("canUseCustomerSecretKeys"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public UserCapabilities build() { + UserCapabilities __instance__ = + new UserCapabilities( + canUseConsolePassword, + canUseApiKeys, + canUseAuthTokens, + canUseSmtpCredentials, + canUseCustomerSecretKeys); + __instance__.__explicitlySet__.addAll(__explicitlySet__); + return __instance__; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(UserCapabilities o) { + Builder copiedBuilder = + canUseConsolePassword(o.getCanUseConsolePassword()) + .canUseApiKeys(o.getCanUseApiKeys()) + .canUseAuthTokens(o.getCanUseAuthTokens()) + .canUseSmtpCredentials(o.getCanUseSmtpCredentials()) + .canUseCustomerSecretKeys(o.getCanUseCustomerSecretKeys()); + + copiedBuilder.__explicitlySet__.retainAll(o.__explicitlySet__); + return copiedBuilder; + } + } + + /** + * Create a new builder. + */ + public static Builder builder() { + return new Builder(); + } + + /** + * Indicates if the user can log in to the console. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseConsolePassword") + Boolean canUseConsolePassword; + + /** + * Indicates if the user can use API keys. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseApiKeys") + Boolean canUseApiKeys; + + /** + * Indicates if the user can use SWIFT passwords / auth tokens. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseAuthTokens") + Boolean canUseAuthTokens; + + /** + * Indicates if the user can use SMTP passwords. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseSmtpCredentials") + Boolean canUseSmtpCredentials; + + /** + * Indicates if the user can use SigV4 symmetric keys. + **/ + @com.fasterxml.jackson.annotation.JsonProperty("canUseCustomerSecretKeys") + Boolean canUseCustomerSecretKeys; + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); +} diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdentityProviderGroupsRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdentityProviderGroupsRequest.java new file mode 100644 index 00000000000..1db9524f777 --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListIdentityProviderGroupsRequest.java @@ -0,0 +1,74 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.requests; + +import com.oracle.bmc.identity.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class ListIdentityProviderGroupsRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the identity provider. + */ + private String identityProviderId; + + /** + * The value of the `opc-next-page` response header from the previous \"List\" call. + * + */ + private String page; + + /** + * The maximum number of items to return in a paginated \"List\" call. + * + */ + private Integer limit; + + 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(ListIdentityProviderGroupsRequest o) { + identityProviderId(o.getIdentityProviderId()); + page(o.getPage()); + limit(o.getLimit()); + invocationCallback(o.getInvocationCallback()); + return this; + } + + /** + * Build the instance of ListIdentityProviderGroupsRequest 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 ListIdentityProviderGroupsRequest + */ + public ListIdentityProviderGroupsRequest build() { + ListIdentityProviderGroupsRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java index 8c952082238..fa3471299a0 100644 --- a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListUsersRequest.java @@ -28,6 +28,18 @@ public class ListUsersRequest extends com.oracle.bmc.requests.BmcRequest { */ private Integer limit; + /** + * The id of the identity provider. + * + */ + private String identityProviderId; + + /** + * The id of a user in the identity provider. + * + */ + private String externalIdentifier; + public static class Builder { private com.oracle.bmc.util.internal.Consumer invocationCallback = null; @@ -52,6 +64,8 @@ public Builder copy(ListUsersRequest o) { compartmentId(o.getCompartmentId()); page(o.getPage()); limit(o.getLimit()); + identityProviderId(o.getIdentityProviderId()); + externalIdentifier(o.getExternalIdentifier()); invocationCallback(o.getInvocationCallback()); return this; } diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ResetIdpScimClientRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ResetIdpScimClientRequest.java new file mode 100644 index 00000000000..043e3b999bb --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ResetIdpScimClientRequest.java @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.requests; + +import com.oracle.bmc.identity.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class ResetIdpScimClientRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the identity provider. + */ + private String identityProviderId; + + 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(ResetIdpScimClientRequest o) { + identityProviderId(o.getIdentityProviderId()); + invocationCallback(o.getInvocationCallback()); + return this; + } + + /** + * Build the instance of ResetIdpScimClientRequest 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 ResetIdpScimClientRequest + */ + public ResetIdpScimClientRequest build() { + ResetIdpScimClientRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserCapabilitiesRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserCapabilitiesRequest.java new file mode 100644 index 00000000000..270bfdaaf7d --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateUserCapabilitiesRequest.java @@ -0,0 +1,75 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.requests; + +import com.oracle.bmc.identity.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder", buildMethodName = "buildWithoutInvocationCallback") +@lombok.Getter +public class UpdateUserCapabilitiesRequest extends com.oracle.bmc.requests.BmcRequest { + + /** + * The OCID of the user. + */ + private String userId; + + /** + * Request object for updating user capabilities. + */ + private UpdateUserCapabilitiesDetails updateUserCapabilitiesDetails; + + /** + * 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(UpdateUserCapabilitiesRequest o) { + userId(o.getUserId()); + updateUserCapabilitiesDetails(o.getUpdateUserCapabilitiesDetails()); + ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); + return this; + } + + /** + * Build the instance of UpdateUserCapabilitiesRequest 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 UpdateUserCapabilitiesRequest + */ + public UpdateUserCapabilitiesRequest build() { + UpdateUserCapabilitiesRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + return request; + } + } +} diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListIdentityProviderGroupsResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListIdentityProviderGroupsResponse.java new file mode 100644 index 00000000000..d4318971ff0 --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListIdentityProviderGroupsResponse.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.responses; + +import com.oracle.bmc.identity.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class ListIdentityProviderGroupsResponse { + + /** + * 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; + + /** + * 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; + + /** + * A list of IdentityProviderGroupSummary 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(ListIdentityProviderGroupsResponse o) { + opcRequestId(o.getOpcRequestId()); + opcNextPage(o.getOpcNextPage()); + items(o.getItems()); + + return this; + } + } +} diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ResetIdpScimClientResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ResetIdpScimClientResponse.java new file mode 100644 index 00000000000..702b3ce63ff --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ResetIdpScimClientResponse.java @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.responses; + +import com.oracle.bmc.identity.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class ResetIdpScimClientResponse { + + /** + * 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 ScimClientCredentials instance. + */ + private ScimClientCredentials scimClientCredentials; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(ResetIdpScimClientResponse o) { + opcRequestId(o.getOpcRequestId()); + scimClientCredentials(o.getScimClientCredentials()); + + return this; + } + } +} diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserCapabilitiesResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserCapabilitiesResponse.java new file mode 100644 index 00000000000..d94d89731bd --- /dev/null +++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/UpdateUserCapabilitiesResponse.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. + */ +package com.oracle.bmc.identity.responses; + +import com.oracle.bmc.identity.model.*; + +@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@lombok.Builder(builderClassName = "Builder") +@lombok.Getter +public class UpdateUserCapabilitiesResponse { + + /** + * 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; + + /** + * For optimistic concurrency control. See `if-match`. + */ + private String etag; + + /** + * The returned User instance. + */ + private User user; + + public static class Builder { + /** + * Copy method to populate the builder with values from the given instance. + * @return this builder instance + */ + public Builder copy(UpdateUserCapabilitiesResponse o) { + opcRequestId(o.getOpcRequestId()); + etag(o.getEtag()); + user(o.getUser()); + + return this; + } + } +} diff --git a/bmc-keymanagement/pom.xml b/bmc-keymanagement/pom.xml index e8b1f090c62..b0862cb7f4b 100644 --- a/bmc-keymanagement/pom.xml +++ b/bmc-keymanagement/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml oci-java-sdk-keymanagement @@ -17,7 +17,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-loadbalancer/pom.xml b/bmc-loadbalancer/pom.xml index 1a081040bde..1d51bac2cdb 100644 --- a/bmc-loadbalancer/pom.xml +++ b/bmc-loadbalancer/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-objectstorage/bmc-objectstorage-combined/pom.xml b/bmc-objectstorage/bmc-objectstorage-combined/pom.xml index b32c216cfe2..93ad57bf85a 100644 --- a/bmc-objectstorage/bmc-objectstorage-combined/pom.xml +++ b/bmc-objectstorage/bmc-objectstorage-combined/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-parent - 1.3.2 + 1.3.3 ../pom.xml @@ -18,12 +18,12 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-generated - 1.3.2 + 1.3.3 com.oracle.oci.sdk oci-java-sdk-objectstorage-extensions - 1.3.2 + 1.3.3 diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml b/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml index cc528274b1b..868f552507e 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml +++ b/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-parent - 1.3.2 + 1.3.3 ../pom.xml @@ -19,12 +19,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 com.oracle.oci.sdk oci-java-sdk-objectstorage-generated - 1.3.2 + 1.3.3 diff --git a/bmc-objectstorage/bmc-objectstorage-generated/pom.xml b/bmc-objectstorage/bmc-objectstorage-generated/pom.xml index 3a4d0f3980e..7c92c7ea11b 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/pom.xml +++ b/bmc-objectstorage/bmc-objectstorage-generated/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-parent - 1.3.2 + 1.3.3 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-objectstorage/pom.xml b/bmc-objectstorage/pom.xml index 65ddf2a7e22..70089aea78e 100644 --- a/bmc-objectstorage/pom.xml +++ b/bmc-objectstorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml diff --git a/bmc-resourcesearch/pom.xml b/bmc-resourcesearch/pom.xml index ecd3fef20ca..6afb25a2491 100644 --- a/bmc-resourcesearch/pom.xml +++ b/bmc-resourcesearch/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml oci-java-sdk-resourcesearch @@ -17,7 +17,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 1.3.2 + 1.3.3 diff --git a/bmc-shaded/bmc-shaded-full/pom.xml b/bmc-shaded/bmc-shaded-full/pom.xml index d98c5289e17..043698795a9 100644 --- a/bmc-shaded/bmc-shaded-full/pom.xml +++ b/bmc-shaded/bmc-shaded-full/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk-shaded - 1.3.2 + 1.3.3 ../pom.xml oci-java-sdk-shaded-full diff --git a/bmc-shaded/pom.xml b/bmc-shaded/pom.xml index 89d3aa8020a..07d620177a3 100644 --- a/bmc-shaded/pom.xml +++ b/bmc-shaded/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 ../pom.xml diff --git a/pom.xml b/pom.xml index fef46c9ea91..4b7f66d3f75 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oracle.oci.sdk oci-java-sdk - 1.3.2 + 1.3.3 pom Oracle Cloud Infrastructure SDK This project contains the SDK used for Oracle Cloud Infrastructure