diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ae62f5bf1..903d7231169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/). +## 3.55.0 - 2024-12-10 +### Added +- Support for Bring Your Own Key (BYOK) in the Database service +- Support for refreshing disaster recovery plans in the Disaster Recovery service +- Support for private access to service instances in the Visual Builder service +- Support for exadata fleet update and rollback maintenance cycle in the Fleet Application Management service +- Support for Bring Your Own License (BYOL) for windows virtual machines in the Compute service +- Support for cascading deletion of applications and runs in the Data Flow service +- Support for on-demand translation and auto language detection during file translation in the AI Language service +- Support for alias for endpoints in custom model flow and custom anonymization in the AI Language service +- Removed fallback to the deprecated Instance Metadata service (IMDS) V1 endpoint + +### Breaking Changes +- Method `public java.util.List getAttachments()` has been removed from model `com.oracle.bmc.visualbuilder.model.VbInstance` in the the Visual Builder service +- Method `public com.oracle.bmc.visualbuilder.model.IdcsInfoDetails getIdcsInfo()` has been removed from `com.oracle.bmc.visualbuilder.model.VbInstance` in the the Visual Builder service +- Class `com.oracle.bmc.visualbuilder.model.AttachmentDetails` has been removed in the the Visual Builder service +- Class `com.oracle.bmc.visualbuilder.model.IdcsInfoDetails` has been removed in the the Visual Builder service + ## 3.54.0 - 2024-11-19 ### Added - Support for optional parameters for unified auditing in the Database service diff --git a/bmc-accessgovernancecp/pom.xml b/bmc-accessgovernancecp/pom.xml index 97dc5808da0..d91af6b08bb 100644 --- a/bmc-accessgovernancecp/pom.xml +++ b/bmc-accessgovernancecp/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-accessgovernancecp @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-accessgovernancecp/src/main/resources/com/oracle/bmc/accessgovernancecp/client.properties b/bmc-accessgovernancecp/src/main/resources/com/oracle/bmc/accessgovernancecp/client.properties index 991315edd30..0693d179979 100644 --- a/bmc-accessgovernancecp/src/main/resources/com/oracle/bmc/accessgovernancecp/client.properties +++ b/bmc-accessgovernancecp/src/main/resources/com/oracle/bmc/accessgovernancecp/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220518") \ No newline at end of file diff --git a/bmc-addons/bmc-aispeech-realtime/pom.xml b/bmc-addons/bmc-aispeech-realtime/pom.xml index 1dc239ae00b..fe1ce53abad 100644 --- a/bmc-addons/bmc-aispeech-realtime/pom.xml +++ b/bmc-addons/bmc-aispeech-realtime/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-addons - 3.54.0 + 3.55.0 ../pom.xml 4.0.0 @@ -53,12 +53,12 @@ com.oracle.oci.sdk oci-java-sdk-aispeech - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 compile diff --git a/bmc-addons/bmc-apache-configurator-jersey-addon/pom.xml b/bmc-addons/bmc-apache-configurator-jersey-addon/pom.xml index bf4a7032ce2..523ae2bd3c4 100644 --- a/bmc-addons/bmc-apache-configurator-jersey-addon/pom.xml +++ b/bmc-addons/bmc-apache-configurator-jersey-addon/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk-addons - 3.54.0 + 3.55.0 ../pom.xml @@ -17,14 +17,14 @@ com.oracle.oci.sdk oci-java-sdk-bom - 3.54.0 + 3.55.0 pom import com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 pom import diff --git a/bmc-addons/bmc-apache-configurator-jersey3-addon/pom.xml b/bmc-addons/bmc-apache-configurator-jersey3-addon/pom.xml index 4d19c3f891b..207ae156fc1 100644 --- a/bmc-addons/bmc-apache-configurator-jersey3-addon/pom.xml +++ b/bmc-addons/bmc-apache-configurator-jersey3-addon/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk-addons - 3.54.0 + 3.55.0 ../pom.xml @@ -17,14 +17,14 @@ com.oracle.oci.sdk oci-java-sdk-bom - 3.54.0 + 3.55.0 pom import com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey3 - 3.54.0 + 3.55.0 pom import diff --git a/bmc-addons/bmc-apache-connector-provider/pom.xml b/bmc-addons/bmc-apache-connector-provider/pom.xml index 848c6400cea..5de8f284ffd 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 - 3.54.0 + 3.55.0 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-addons/bmc-oke-workload-identity/pom.xml b/bmc-addons/bmc-oke-workload-identity/pom.xml index fb150b5e8a8..2e78f0b8da7 100644 --- a/bmc-addons/bmc-oke-workload-identity/pom.xml +++ b/bmc-addons/bmc-oke-workload-identity/pom.xml @@ -4,7 +4,7 @@ oci-java-sdk-addons com.oracle.oci.sdk - 3.54.0 + 3.55.0 4.0.0 @@ -38,25 +38,25 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 compile com.oracle.oci.sdk oci-java-sdk-core - 3.54.0 + 3.55.0 test com.oracle.oci.sdk oci-java-sdk-identity - 3.54.0 + 3.55.0 test com.oracle.oci.sdk oci-java-sdk-keymanagement - 3.54.0 + 3.55.0 test diff --git a/bmc-addons/bmc-resteasy-client-configurator/pom.xml b/bmc-addons/bmc-resteasy-client-configurator/pom.xml index 1f1c59e26ce..c63220d9a95 100644 --- a/bmc-addons/bmc-resteasy-client-configurator/pom.xml +++ b/bmc-addons/bmc-resteasy-client-configurator/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk-addons - 3.54.0 + 3.55.0 ../pom.xml @@ -23,7 +23,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-addons/bmc-sasl-oke-workload-identity/pom.xml b/bmc-addons/bmc-sasl-oke-workload-identity/pom.xml index 3273bbf2d05..c0618215497 100644 --- a/bmc-addons/bmc-sasl-oke-workload-identity/pom.xml +++ b/bmc-addons/bmc-sasl-oke-workload-identity/pom.xml @@ -4,7 +4,7 @@ oci-java-sdk-addons com.oracle.oci.sdk - 3.54.0 + 3.55.0 ../pom.xml 4.0.0 @@ -39,13 +39,13 @@ com.oracle.oci.sdk oci-java-sdk-addons-sasl - 3.54.0 + 3.55.0 compile com.oracle.oci.sdk oci-java-sdk-addons-oke-workload-identity - 3.54.0 + 3.55.0 compile diff --git a/bmc-addons/bmc-sasl/pom.xml b/bmc-addons/bmc-sasl/pom.xml index a686f68de94..1446ea1e3a1 100644 --- a/bmc-addons/bmc-sasl/pom.xml +++ b/bmc-addons/bmc-sasl/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk-addons - 3.54.0 + 3.55.0 ../pom.xml @@ -60,7 +60,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-addons/bmc-sse-support-jersey3/pom.xml b/bmc-addons/bmc-sse-support-jersey3/pom.xml index 673cf0febff..3052f5a53f1 100644 --- a/bmc-addons/bmc-sse-support-jersey3/pom.xml +++ b/bmc-addons/bmc-sse-support-jersey3/pom.xml @@ -5,7 +5,7 @@ oci-java-sdk-addons com.oracle.oci.sdk - 3.54.0 + 3.55.0 ../pom.xml 4.0.0 @@ -150,12 +150,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-generativeaiinference - 3.54.0 + 3.55.0 test @@ -164,7 +164,7 @@ but the code in it needs it. --> com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey3 - 3.54.0 + 3.55.0 diff --git a/bmc-addons/bmc-sse-support/pom.xml b/bmc-addons/bmc-sse-support/pom.xml index 5c716cf0f20..4824b7ad983 100644 --- a/bmc-addons/bmc-sse-support/pom.xml +++ b/bmc-addons/bmc-sse-support/pom.xml @@ -5,7 +5,7 @@ oci-java-sdk-addons com.oracle.oci.sdk - 3.54.0 + 3.55.0 ../pom.xml 4.0.0 @@ -150,12 +150,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-generativeaiinference - 3.54.0 + 3.55.0 test @@ -164,7 +164,7 @@ but the code in it needs it. --> com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 diff --git a/bmc-addons/pom.xml b/bmc-addons/pom.xml index 0b97afbc459..019abafac5e 100644 --- a/bmc-addons/pom.xml +++ b/bmc-addons/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml diff --git a/bmc-adm/pom.xml b/bmc-adm/pom.xml index ee40a5cca54..54d032e3476 100644 --- a/bmc-adm/pom.xml +++ b/bmc-adm/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-adm @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-adm/src/main/resources/com/oracle/bmc/adm/client.properties b/bmc-adm/src/main/resources/com/oracle/bmc/adm/client.properties index 1fcf02393cd..ae68169ed71 100644 --- a/bmc-adm/src/main/resources/com/oracle/bmc/adm/client.properties +++ b/bmc-adm/src/main/resources/com/oracle/bmc/adm/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220421") \ No newline at end of file diff --git a/bmc-aianomalydetection/pom.xml b/bmc-aianomalydetection/pom.xml index 3970c4eea9c..064122830e3 100644 --- a/bmc-aianomalydetection/pom.xml +++ b/bmc-aianomalydetection/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-aianomalydetection @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-aianomalydetection/src/main/resources/com/oracle/bmc/aianomalydetection/client.properties b/bmc-aianomalydetection/src/main/resources/com/oracle/bmc/aianomalydetection/client.properties index 229d16f6c59..d5589eba31d 100644 --- a/bmc-aianomalydetection/src/main/resources/com/oracle/bmc/aianomalydetection/client.properties +++ b/bmc-aianomalydetection/src/main/resources/com/oracle/bmc/aianomalydetection/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210101") \ No newline at end of file diff --git a/bmc-aidocument/pom.xml b/bmc-aidocument/pom.xml index 404c5fc89fb..8fa62c9042a 100644 --- a/bmc-aidocument/pom.xml +++ b/bmc-aidocument/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-aidocument @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-aidocument/src/main/resources/com/oracle/bmc/aidocument/client.properties b/bmc-aidocument/src/main/resources/com/oracle/bmc/aidocument/client.properties index ddc40a30142..2074f0b34b9 100644 --- a/bmc-aidocument/src/main/resources/com/oracle/bmc/aidocument/client.properties +++ b/bmc-aidocument/src/main/resources/com/oracle/bmc/aidocument/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20221109") \ No newline at end of file diff --git a/bmc-ailanguage/pom.xml b/bmc-ailanguage/pom.xml index 1cfd6fdc49a..1a23f8d1cd6 100644 --- a/bmc-ailanguage/pom.xml +++ b/bmc-ailanguage/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-ailanguage @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectDominantLanguageDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectDominantLanguageDetails.java index a749847bede..a817c7f8b57 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectDominantLanguageDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectDominantLanguageDetails.java @@ -24,6 +24,7 @@ public final class BatchDetectDominantLanguageDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated @java.beans.ConstructorProperties({ + "alias", "shouldIgnoreTransliteration", "charsToConsider", "endpointId", @@ -31,12 +32,14 @@ public final class BatchDetectDominantLanguageDetails "documents" }) public BatchDetectDominantLanguageDetails( + String alias, Boolean shouldIgnoreTransliteration, Integer charsToConsider, String endpointId, String compartmentId, java.util.List documents) { super(); + this.alias = alias; this.shouldIgnoreTransliteration = shouldIgnoreTransliteration; this.charsToConsider = charsToConsider; this.endpointId = endpointId; @@ -46,6 +49,25 @@ public BatchDetectDominantLanguageDetails( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** * Specifies whether to consider or ignore transliteration. For example "hi, aap kaise ho? * sab kuch teek hai? I will call you tomorrow." would be detected as English when ignore @@ -154,6 +176,7 @@ public Builder documents(java.util.List documents) { public BatchDetectDominantLanguageDetails build() { BatchDetectDominantLanguageDetails model = new BatchDetectDominantLanguageDetails( + this.alias, this.shouldIgnoreTransliteration, this.charsToConsider, this.endpointId, @@ -167,6 +190,9 @@ public BatchDetectDominantLanguageDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BatchDetectDominantLanguageDetails model) { + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("shouldIgnoreTransliteration")) { this.shouldIgnoreTransliteration(model.getShouldIgnoreTransliteration()); } @@ -195,6 +221,23 @@ public Builder toBuilder() { return new Builder().copy(this); } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** * Specifies whether to consider or ignore transliteration. For example "hi, aap kaise ho? sab * kuch teek hai? I will call you tomorrow." would be detected as English when ignore @@ -299,7 +342,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("BatchDetectDominantLanguageDetails("); sb.append("super=").append(super.toString()); - sb.append("shouldIgnoreTransliteration=") + sb.append("alias=").append(String.valueOf(this.alias)); + sb.append(", shouldIgnoreTransliteration=") .append(String.valueOf(this.shouldIgnoreTransliteration)); sb.append(", charsToConsider=").append(String.valueOf(this.charsToConsider)); sb.append(", endpointId=").append(String.valueOf(this.endpointId)); @@ -319,7 +363,8 @@ public boolean equals(Object o) { } BatchDetectDominantLanguageDetails other = (BatchDetectDominantLanguageDetails) o; - return java.util.Objects.equals( + return java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals( this.shouldIgnoreTransliteration, other.shouldIgnoreTransliteration) && java.util.Objects.equals(this.charsToConsider, other.charsToConsider) && java.util.Objects.equals(this.endpointId, other.endpointId) @@ -332,6 +377,7 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.shouldIgnoreTransliteration == null diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectHealthEntityDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectHealthEntityDetails.java index 58774490e89..9fb10e2026b 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectHealthEntityDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectHealthEntityDetails.java @@ -24,6 +24,7 @@ public final class BatchDetectHealthEntityDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated @java.beans.ConstructorProperties({ + "alias", "endpointId", "documents", "linkOntologies", @@ -32,6 +33,7 @@ public final class BatchDetectHealthEntityDetails "profile" }) public BatchDetectHealthEntityDetails( + String alias, String endpointId, java.util.List documents, java.util.List linkOntologies, @@ -39,6 +41,7 @@ public BatchDetectHealthEntityDetails( Boolean isDetectRelationships, Profile profile) { super(); + this.alias = alias; this.endpointId = endpointId; this.documents = documents; this.linkOntologies = linkOntologies; @@ -49,6 +52,25 @@ public BatchDetectHealthEntityDetails( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** The endpoint which have to be used for inferencing. */ @com.fasterxml.jackson.annotation.JsonProperty("endpointId") private String endpointId; @@ -140,6 +162,7 @@ public Builder profile(Profile profile) { public BatchDetectHealthEntityDetails build() { BatchDetectHealthEntityDetails model = new BatchDetectHealthEntityDetails( + this.alias, this.endpointId, this.documents, this.linkOntologies, @@ -154,6 +177,9 @@ public BatchDetectHealthEntityDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BatchDetectHealthEntityDetails model) { + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("endpointId")) { this.endpointId(model.getEndpointId()); } @@ -185,6 +211,23 @@ public Builder toBuilder() { return new Builder().copy(this); } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** The endpoint which have to be used for inferencing. */ @com.fasterxml.jackson.annotation.JsonProperty("endpointId") private final String endpointId; @@ -272,7 +315,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("BatchDetectHealthEntityDetails("); sb.append("super=").append(super.toString()); - sb.append("endpointId=").append(String.valueOf(this.endpointId)); + sb.append("alias=").append(String.valueOf(this.alias)); + sb.append(", endpointId=").append(String.valueOf(this.endpointId)); sb.append(", documents=").append(String.valueOf(this.documents)); sb.append(", linkOntologies=").append(String.valueOf(this.linkOntologies)); sb.append(", isDetectAssertions=").append(String.valueOf(this.isDetectAssertions)); @@ -292,7 +336,8 @@ public boolean equals(Object o) { } BatchDetectHealthEntityDetails other = (BatchDetectHealthEntityDetails) o; - return java.util.Objects.equals(this.endpointId, other.endpointId) + return java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.endpointId, other.endpointId) && java.util.Objects.equals(this.documents, other.documents) && java.util.Objects.equals(this.linkOntologies, other.linkOntologies) && java.util.Objects.equals(this.isDetectAssertions, other.isDetectAssertions) @@ -305,6 +350,7 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.endpointId == null ? 43 : this.endpointId.hashCode()); result = (result * PRIME) + (this.documents == null ? 43 : this.documents.hashCode()); result = diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageEntitiesDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageEntitiesDetails.java index 55f0676d509..79c168f1f77 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageEntitiesDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageEntitiesDetails.java @@ -23,10 +23,14 @@ public final class BatchDetectLanguageEntitiesDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated - @java.beans.ConstructorProperties({"compartmentId", "endpointId", "documents"}) + @java.beans.ConstructorProperties({"alias", "compartmentId", "endpointId", "documents"}) public BatchDetectLanguageEntitiesDetails( - String compartmentId, String endpointId, java.util.List documents) { + String alias, + String compartmentId, + String endpointId, + java.util.List documents) { super(); + this.alias = alias; this.compartmentId = compartmentId; this.endpointId = endpointId; this.documents = documents; @@ -34,6 +38,25 @@ public BatchDetectLanguageEntitiesDetails( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the * compartment that calls the API, inference will be served from pre trained model @@ -96,7 +119,7 @@ public Builder documents(java.util.List documents) { public BatchDetectLanguageEntitiesDetails build() { BatchDetectLanguageEntitiesDetails model = new BatchDetectLanguageEntitiesDetails( - this.compartmentId, this.endpointId, this.documents); + this.alias, this.compartmentId, this.endpointId, this.documents); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -105,6 +128,9 @@ public BatchDetectLanguageEntitiesDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BatchDetectLanguageEntitiesDetails model) { + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("compartmentId")) { this.compartmentId(model.getCompartmentId()); } @@ -127,6 +153,23 @@ public Builder toBuilder() { return new Builder().copy(this); } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the * compartment that calls the API, inference will be served from pre trained model @@ -189,7 +232,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("BatchDetectLanguageEntitiesDetails("); sb.append("super=").append(super.toString()); - sb.append("compartmentId=").append(String.valueOf(this.compartmentId)); + sb.append("alias=").append(String.valueOf(this.alias)); + sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", endpointId=").append(String.valueOf(this.endpointId)); sb.append(", documents=").append(String.valueOf(this.documents)); sb.append(")"); @@ -206,7 +250,8 @@ public boolean equals(Object o) { } BatchDetectLanguageEntitiesDetails other = (BatchDetectLanguageEntitiesDetails) o; - return java.util.Objects.equals(this.compartmentId, other.compartmentId) + return java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.endpointId, other.endpointId) && java.util.Objects.equals(this.documents, other.documents) && super.equals(other); @@ -216,6 +261,7 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.compartmentId == null ? 43 : this.compartmentId.hashCode()); diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageKeyPhrasesDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageKeyPhrasesDetails.java index c0083d1f544..5882257ef79 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageKeyPhrasesDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageKeyPhrasesDetails.java @@ -23,10 +23,14 @@ public final class BatchDetectLanguageKeyPhrasesDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated - @java.beans.ConstructorProperties({"endpointId", "compartmentId", "documents"}) + @java.beans.ConstructorProperties({"alias", "endpointId", "compartmentId", "documents"}) public BatchDetectLanguageKeyPhrasesDetails( - String endpointId, String compartmentId, java.util.List documents) { + String alias, + String endpointId, + String compartmentId, + java.util.List documents) { super(); + this.alias = alias; this.endpointId = endpointId; this.compartmentId = compartmentId; this.documents = documents; @@ -34,6 +38,25 @@ public BatchDetectLanguageKeyPhrasesDetails( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** * The endpoint which have to be used for inferencing. If endpointId and compartmentId is * provided, then inference will be served from custom model which is mapped to this @@ -96,7 +119,7 @@ public Builder documents(java.util.List documents) { public BatchDetectLanguageKeyPhrasesDetails build() { BatchDetectLanguageKeyPhrasesDetails model = new BatchDetectLanguageKeyPhrasesDetails( - this.endpointId, this.compartmentId, this.documents); + this.alias, this.endpointId, this.compartmentId, this.documents); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -105,6 +128,9 @@ public BatchDetectLanguageKeyPhrasesDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BatchDetectLanguageKeyPhrasesDetails model) { + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("endpointId")) { this.endpointId(model.getEndpointId()); } @@ -127,6 +153,23 @@ public Builder toBuilder() { return new Builder().copy(this); } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** * The endpoint which have to be used for inferencing. If endpointId and compartmentId is * provided, then inference will be served from custom model which is mapped to this Endpoint. @@ -189,7 +232,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("BatchDetectLanguageKeyPhrasesDetails("); sb.append("super=").append(super.toString()); - sb.append("endpointId=").append(String.valueOf(this.endpointId)); + sb.append("alias=").append(String.valueOf(this.alias)); + sb.append(", endpointId=").append(String.valueOf(this.endpointId)); sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", documents=").append(String.valueOf(this.documents)); sb.append(")"); @@ -206,7 +250,8 @@ public boolean equals(Object o) { } BatchDetectLanguageKeyPhrasesDetails other = (BatchDetectLanguageKeyPhrasesDetails) o; - return java.util.Objects.equals(this.endpointId, other.endpointId) + return java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.endpointId, other.endpointId) && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.documents, other.documents) && super.equals(other); @@ -216,6 +261,7 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.endpointId == null ? 43 : this.endpointId.hashCode()); result = (result * PRIME) diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguagePiiEntitiesDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguagePiiEntitiesDetails.java index db534520751..09b9bc0357e 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguagePiiEntitiesDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguagePiiEntitiesDetails.java @@ -24,6 +24,7 @@ public final class BatchDetectLanguagePiiEntitiesDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated @java.beans.ConstructorProperties({ + "alias", "endpointId", "compartmentId", "documents", @@ -31,12 +32,14 @@ public final class BatchDetectLanguagePiiEntitiesDetails "profile" }) public BatchDetectLanguagePiiEntitiesDetails( + String alias, String endpointId, String compartmentId, java.util.List documents, java.util.Map masking, Profile profile) { super(); + this.alias = alias; this.endpointId = endpointId; this.compartmentId = compartmentId; this.documents = documents; @@ -46,6 +49,25 @@ public BatchDetectLanguagePiiEntitiesDetails( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** * The endpoint which have to be used for inferencing. If endpointId and compartmentId is * provided, then inference will be served from custom model which is mapped to this @@ -132,6 +154,7 @@ public Builder profile(Profile profile) { public BatchDetectLanguagePiiEntitiesDetails build() { BatchDetectLanguagePiiEntitiesDetails model = new BatchDetectLanguagePiiEntitiesDetails( + this.alias, this.endpointId, this.compartmentId, this.documents, @@ -145,6 +168,9 @@ public BatchDetectLanguagePiiEntitiesDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BatchDetectLanguagePiiEntitiesDetails model) { + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("endpointId")) { this.endpointId(model.getEndpointId()); } @@ -173,6 +199,23 @@ public Builder toBuilder() { return new Builder().copy(this); } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** * The endpoint which have to be used for inferencing. If endpointId and compartmentId is * provided, then inference will be served from custom model which is mapped to this Endpoint. @@ -255,7 +298,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("BatchDetectLanguagePiiEntitiesDetails("); sb.append("super=").append(super.toString()); - sb.append("endpointId=").append(String.valueOf(this.endpointId)); + sb.append("alias=").append(String.valueOf(this.alias)); + sb.append(", endpointId=").append(String.valueOf(this.endpointId)); sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", documents=").append(String.valueOf(this.documents)); sb.append(", masking=").append(String.valueOf(this.masking)); @@ -274,7 +318,8 @@ public boolean equals(Object o) { } BatchDetectLanguagePiiEntitiesDetails other = (BatchDetectLanguagePiiEntitiesDetails) o; - return java.util.Objects.equals(this.endpointId, other.endpointId) + return java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.endpointId, other.endpointId) && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.documents, other.documents) && java.util.Objects.equals(this.masking, other.masking) @@ -286,6 +331,7 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.endpointId == null ? 43 : this.endpointId.hashCode()); result = (result * PRIME) diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageSentimentsDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageSentimentsDetails.java index 47b916fb397..8b90ea24c5c 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageSentimentsDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageSentimentsDetails.java @@ -23,10 +23,14 @@ public final class BatchDetectLanguageSentimentsDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated - @java.beans.ConstructorProperties({"endpointId", "compartmentId", "documents"}) + @java.beans.ConstructorProperties({"alias", "endpointId", "compartmentId", "documents"}) public BatchDetectLanguageSentimentsDetails( - String endpointId, String compartmentId, java.util.List documents) { + String alias, + String endpointId, + String compartmentId, + java.util.List documents) { super(); + this.alias = alias; this.endpointId = endpointId; this.compartmentId = compartmentId; this.documents = documents; @@ -34,6 +38,25 @@ public BatchDetectLanguageSentimentsDetails( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** * The endpoint which have to be used for inferencing. If endpointId and compartmentId is * provided, then inference will be served from custom model which is mapped to this @@ -96,7 +119,7 @@ public Builder documents(java.util.List documents) { public BatchDetectLanguageSentimentsDetails build() { BatchDetectLanguageSentimentsDetails model = new BatchDetectLanguageSentimentsDetails( - this.endpointId, this.compartmentId, this.documents); + this.alias, this.endpointId, this.compartmentId, this.documents); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -105,6 +128,9 @@ public BatchDetectLanguageSentimentsDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BatchDetectLanguageSentimentsDetails model) { + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("endpointId")) { this.endpointId(model.getEndpointId()); } @@ -127,6 +153,23 @@ public Builder toBuilder() { return new Builder().copy(this); } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** * The endpoint which have to be used for inferencing. If endpointId and compartmentId is * provided, then inference will be served from custom model which is mapped to this Endpoint. @@ -189,7 +232,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("BatchDetectLanguageSentimentsDetails("); sb.append("super=").append(super.toString()); - sb.append("endpointId=").append(String.valueOf(this.endpointId)); + sb.append("alias=").append(String.valueOf(this.alias)); + sb.append(", endpointId=").append(String.valueOf(this.endpointId)); sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", documents=").append(String.valueOf(this.documents)); sb.append(")"); @@ -206,7 +250,8 @@ public boolean equals(Object o) { } BatchDetectLanguageSentimentsDetails other = (BatchDetectLanguageSentimentsDetails) o; - return java.util.Objects.equals(this.endpointId, other.endpointId) + return java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.endpointId, other.endpointId) && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.documents, other.documents) && super.equals(other); @@ -216,6 +261,7 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.endpointId == null ? 43 : this.endpointId.hashCode()); result = (result * PRIME) diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageTextClassificationDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageTextClassificationDetails.java index 4e3f88a6939..02cdeedfaaa 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageTextClassificationDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchDetectLanguageTextClassificationDetails.java @@ -23,10 +23,14 @@ public final class BatchDetectLanguageTextClassificationDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated - @java.beans.ConstructorProperties({"compartmentId", "endpointId", "documents"}) + @java.beans.ConstructorProperties({"alias", "compartmentId", "endpointId", "documents"}) public BatchDetectLanguageTextClassificationDetails( - String compartmentId, String endpointId, java.util.List documents) { + String alias, + String compartmentId, + String endpointId, + java.util.List documents) { super(); + this.alias = alias; this.compartmentId = compartmentId; this.endpointId = endpointId; this.documents = documents; @@ -34,6 +38,25 @@ public BatchDetectLanguageTextClassificationDetails( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the * compartment that calls the API, inference will be served from pre trained model @@ -96,7 +119,7 @@ public Builder documents(java.util.List documents) { public BatchDetectLanguageTextClassificationDetails build() { BatchDetectLanguageTextClassificationDetails model = new BatchDetectLanguageTextClassificationDetails( - this.compartmentId, this.endpointId, this.documents); + this.alias, this.compartmentId, this.endpointId, this.documents); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -105,6 +128,9 @@ public BatchDetectLanguageTextClassificationDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BatchDetectLanguageTextClassificationDetails model) { + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("compartmentId")) { this.compartmentId(model.getCompartmentId()); } @@ -127,6 +153,23 @@ public Builder toBuilder() { return new Builder().copy(this); } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the * compartment that calls the API, inference will be served from pre trained model @@ -189,7 +232,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("BatchDetectLanguageTextClassificationDetails("); sb.append("super=").append(super.toString()); - sb.append("compartmentId=").append(String.valueOf(this.compartmentId)); + sb.append("alias=").append(String.valueOf(this.alias)); + sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", endpointId=").append(String.valueOf(this.endpointId)); sb.append(", documents=").append(String.valueOf(this.documents)); sb.append(")"); @@ -207,7 +251,8 @@ public boolean equals(Object o) { BatchDetectLanguageTextClassificationDetails other = (BatchDetectLanguageTextClassificationDetails) o; - return java.util.Objects.equals(this.compartmentId, other.compartmentId) + return java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.endpointId, other.endpointId) && java.util.Objects.equals(this.documents, other.documents) && super.equals(other); @@ -217,6 +262,7 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.compartmentId == null ? 43 : this.compartmentId.hashCode()); diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchLanguageTranslationDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchLanguageTranslationDetails.java index fe645ef9c28..a1b808b3b20 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchLanguageTranslationDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/BatchLanguageTranslationDetails.java @@ -23,12 +23,25 @@ public final class BatchLanguageTranslationDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated - @java.beans.ConstructorProperties({"compartmentId", "targetLanguageCode", "documents"}) + @java.beans.ConstructorProperties({ + "alias", + "endpointId", + "noTranslate", + "compartmentId", + "targetLanguageCode", + "documents" + }) public BatchLanguageTranslationDetails( + String alias, + String endpointId, + java.util.List noTranslate, String compartmentId, String targetLanguageCode, java.util.List documents) { super(); + this.alias = alias; + this.endpointId = endpointId; + this.noTranslate = noTranslate; this.compartmentId = compartmentId; this.targetLanguageCode = targetLanguageCode; this.documents = documents; @@ -36,6 +49,51 @@ public BatchLanguageTranslationDetails( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + /** Unique name to identify an endpoint to be used for inferencing */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name to identify an endpoint to be used for inferencing + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } + /** The endpoint that has to be used for inferencing. */ + @com.fasterxml.jackson.annotation.JsonProperty("endpointId") + private String endpointId; + + /** + * The endpoint that has to be used for inferencing. + * + * @param endpointId the value to set + * @return this builder + */ + public Builder endpointId(String endpointId) { + this.endpointId = endpointId; + this.__explicitlySet__.add("endpointId"); + return this; + } + /** List of words not to be translated */ + @com.fasterxml.jackson.annotation.JsonProperty("noTranslate") + private java.util.List noTranslate; + + /** + * List of words not to be translated + * + * @param noTranslate the value to set + * @return this builder + */ + public Builder noTranslate(java.util.List noTranslate) { + this.noTranslate = noTranslate; + this.__explicitlySet__.add("noTranslate"); + return this; + } /** * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the * compartment that calls the API, inference will be served from pre trained model @@ -104,7 +162,12 @@ public Builder documents(java.util.List documents) { public BatchLanguageTranslationDetails build() { BatchLanguageTranslationDetails model = new BatchLanguageTranslationDetails( - this.compartmentId, this.targetLanguageCode, this.documents); + this.alias, + this.endpointId, + this.noTranslate, + this.compartmentId, + this.targetLanguageCode, + this.documents); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -113,6 +176,15 @@ public BatchLanguageTranslationDetails build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(BatchLanguageTranslationDetails model) { + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } + if (model.wasPropertyExplicitlySet("endpointId")) { + this.endpointId(model.getEndpointId()); + } + if (model.wasPropertyExplicitlySet("noTranslate")) { + this.noTranslate(model.getNoTranslate()); + } if (model.wasPropertyExplicitlySet("compartmentId")) { this.compartmentId(model.getCompartmentId()); } @@ -135,6 +207,45 @@ public Builder toBuilder() { return new Builder().copy(this); } + /** Unique name to identify an endpoint to be used for inferencing */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name to identify an endpoint to be used for inferencing + * + * @return the value + */ + public String getAlias() { + return alias; + } + + /** The endpoint that has to be used for inferencing. */ + @com.fasterxml.jackson.annotation.JsonProperty("endpointId") + private final String endpointId; + + /** + * The endpoint that has to be used for inferencing. + * + * @return the value + */ + public String getEndpointId() { + return endpointId; + } + + /** List of words not to be translated */ + @com.fasterxml.jackson.annotation.JsonProperty("noTranslate") + private final java.util.List noTranslate; + + /** + * List of words not to be translated + * + * @return the value + */ + public java.util.List getNoTranslate() { + return noTranslate; + } + /** * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the * compartment that calls the API, inference will be served from pre trained model @@ -205,7 +316,10 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("BatchLanguageTranslationDetails("); sb.append("super=").append(super.toString()); - sb.append("compartmentId=").append(String.valueOf(this.compartmentId)); + sb.append("alias=").append(String.valueOf(this.alias)); + sb.append(", endpointId=").append(String.valueOf(this.endpointId)); + sb.append(", noTranslate=").append(String.valueOf(this.noTranslate)); + sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", targetLanguageCode=").append(String.valueOf(this.targetLanguageCode)); sb.append(", documents=").append(String.valueOf(this.documents)); sb.append(")"); @@ -222,7 +336,10 @@ public boolean equals(Object o) { } BatchLanguageTranslationDetails other = (BatchLanguageTranslationDetails) o; - return java.util.Objects.equals(this.compartmentId, other.compartmentId) + return java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.endpointId, other.endpointId) + && java.util.Objects.equals(this.noTranslate, other.noTranslate) + && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.targetLanguageCode, other.targetLanguageCode) && java.util.Objects.equals(this.documents, other.documents) && super.equals(other); @@ -232,6 +349,9 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); + result = (result * PRIME) + (this.endpointId == null ? 43 : this.endpointId.hashCode()); + result = (result * PRIME) + (this.noTranslate == null ? 43 : this.noTranslate.hashCode()); result = (result * PRIME) + (this.compartmentId == null ? 43 : this.compartmentId.hashCode()); diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/CreateEndpointDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/CreateEndpointDetails.java index 5d393dd40e0..cc19f30dd6d 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/CreateEndpointDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/CreateEndpointDetails.java @@ -25,6 +25,8 @@ public final class CreateEndpointDetails @Deprecated @java.beans.ConstructorProperties({ "displayName", + "computeType", + "alias", "description", "compartmentId", "modelId", @@ -34,6 +36,8 @@ public final class CreateEndpointDetails }) public CreateEndpointDetails( String displayName, + ComputeType computeType, + String alias, String description, String compartmentId, String modelId, @@ -42,6 +46,8 @@ public CreateEndpointDetails( java.util.Map> definedTags) { super(); this.displayName = displayName; + this.computeType = computeType; + this.alias = alias; this.description = description; this.compartmentId = compartmentId; this.modelId = modelId; @@ -71,6 +77,40 @@ public Builder displayName(String displayName) { this.__explicitlySet__.add("displayName"); return this; } + /** Compute infra type for endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("computeType") + private ComputeType computeType; + + /** + * Compute infra type for endpoint. + * + * @param computeType the value to set + * @return this builder + */ + public Builder computeType(ComputeType computeType) { + this.computeType = computeType; + this.__explicitlySet__.add("computeType"); + return this; + } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** A short description of the an endpoint. */ @com.fasterxml.jackson.annotation.JsonProperty("description") private String description; @@ -190,6 +230,8 @@ public CreateEndpointDetails build() { CreateEndpointDetails model = new CreateEndpointDetails( this.displayName, + this.computeType, + this.alias, this.description, this.compartmentId, this.modelId, @@ -207,6 +249,12 @@ public Builder copy(CreateEndpointDetails model) { if (model.wasPropertyExplicitlySet("displayName")) { this.displayName(model.getDisplayName()); } + if (model.wasPropertyExplicitlySet("computeType")) { + this.computeType(model.getComputeType()); + } + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("description")) { this.description(model.getDescription()); } @@ -255,6 +303,69 @@ public String getDisplayName() { return displayName; } + /** Compute infra type for endpoint. */ + public enum ComputeType implements com.oracle.bmc.http.internal.BmcEnum { + Cpu("CPU"), + Gpu("GPU"), + ; + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (ComputeType v : ComputeType.values()) { + map.put(v.getValue(), v); + } + } + + ComputeType(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static ComputeType create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + throw new IllegalArgumentException("Invalid ComputeType: " + key); + } + }; + /** Compute infra type for endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("computeType") + private final ComputeType computeType; + + /** + * Compute infra type for endpoint. + * + * @return the value + */ + public ComputeType getComputeType() { + return computeType; + } + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** A short description of the an endpoint. */ @com.fasterxml.jackson.annotation.JsonProperty("description") private final String description; @@ -369,6 +480,8 @@ public String toString(boolean includeByteArrayContents) { sb.append("CreateEndpointDetails("); sb.append("super=").append(super.toString()); sb.append("displayName=").append(String.valueOf(this.displayName)); + sb.append(", computeType=").append(String.valueOf(this.computeType)); + sb.append(", alias=").append(String.valueOf(this.alias)); sb.append(", description=").append(String.valueOf(this.description)); sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", modelId=").append(String.valueOf(this.modelId)); @@ -390,6 +503,8 @@ public boolean equals(Object o) { CreateEndpointDetails other = (CreateEndpointDetails) o; return java.util.Objects.equals(this.displayName, other.displayName) + && java.util.Objects.equals(this.computeType, other.computeType) + && java.util.Objects.equals(this.alias, other.alias) && java.util.Objects.equals(this.description, other.description) && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.modelId, other.modelId) @@ -404,6 +519,8 @@ public int hashCode() { final int PRIME = 59; int result = 1; result = (result * PRIME) + (this.displayName == null ? 43 : this.displayName.hashCode()); + result = (result * PRIME) + (this.computeType == null ? 43 : this.computeType.hashCode()); + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.description == null ? 43 : this.description.hashCode()); result = (result * PRIME) diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/Endpoint.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/Endpoint.java index 1c0244e3f14..85734554fc8 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/Endpoint.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/Endpoint.java @@ -23,6 +23,8 @@ public final class Endpoint extends com.oracle.bmc.http.client.internal.Explicit @Deprecated @java.beans.ConstructorProperties({ "id", + "alias", + "computeType", "displayName", "compartmentId", "projectId", @@ -39,6 +41,8 @@ public final class Endpoint extends com.oracle.bmc.http.client.internal.Explicit }) public Endpoint( String id, + String alias, + ComputeType computeType, String displayName, String compartmentId, String projectId, @@ -54,6 +58,8 @@ public Endpoint( java.util.Map> systemTags) { super(); this.id = id; + this.alias = alias; + this.computeType = computeType; this.displayName = displayName; this.compartmentId = compartmentId; this.projectId = projectId; @@ -86,6 +92,40 @@ public Builder id(String id) { this.__explicitlySet__.add("id"); return this; } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } + /** Compute infra type for endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("computeType") + private ComputeType computeType; + + /** + * Compute infra type for endpoint. + * + * @param computeType the value to set + * @return this builder + */ + public Builder computeType(ComputeType computeType) { + this.computeType = computeType; + this.__explicitlySet__.add("computeType"); + return this; + } /** * A user-friendly display name for the resource. It should be unique and can be modified. * Avoid entering confidential information. @@ -322,6 +362,8 @@ public Endpoint build() { Endpoint model = new Endpoint( this.id, + this.alias, + this.computeType, this.displayName, this.compartmentId, this.projectId, @@ -346,6 +388,12 @@ public Builder copy(Endpoint model) { if (model.wasPropertyExplicitlySet("id")) { this.id(model.getId()); } + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } + if (model.wasPropertyExplicitlySet("computeType")) { + this.computeType(model.getComputeType()); + } if (model.wasPropertyExplicitlySet("displayName")) { this.displayName(model.getDisplayName()); } @@ -411,6 +459,82 @@ public String getId() { return id; } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + + /** Compute infra type for endpoint. */ + public enum ComputeType implements com.oracle.bmc.http.internal.BmcEnum { + Cpu("CPU"), + Gpu("GPU"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(ComputeType.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (ComputeType v : ComputeType.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + ComputeType(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static ComputeType create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'ComputeType', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; + /** Compute infra type for endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("computeType") + private final ComputeType computeType; + + /** + * Compute infra type for endpoint. + * + * @return the value + */ + public ComputeType getComputeType() { + return computeType; + } + /** * A user-friendly display name for the resource. It should be unique and can be modified. Avoid * entering confidential information. @@ -678,6 +802,8 @@ public String toString(boolean includeByteArrayContents) { sb.append("Endpoint("); sb.append("super=").append(super.toString()); sb.append("id=").append(String.valueOf(this.id)); + sb.append(", alias=").append(String.valueOf(this.alias)); + sb.append(", computeType=").append(String.valueOf(this.computeType)); sb.append(", displayName=").append(String.valueOf(this.displayName)); sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", projectId=").append(String.valueOf(this.projectId)); @@ -706,6 +832,8 @@ public boolean equals(Object o) { Endpoint other = (Endpoint) o; return java.util.Objects.equals(this.id, other.id) + && java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.computeType, other.computeType) && java.util.Objects.equals(this.displayName, other.displayName) && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.projectId, other.projectId) @@ -727,6 +855,8 @@ public int hashCode() { final int PRIME = 59; int result = 1; result = (result * PRIME) + (this.id == null ? 43 : this.id.hashCode()); + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); + result = (result * PRIME) + (this.computeType == null ? 43 : this.computeType.hashCode()); result = (result * PRIME) + (this.displayName == null ? 43 : this.displayName.hashCode()); result = (result * PRIME) diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/EndpointSummary.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/EndpointSummary.java index 06d74c3d3b4..461e578456b 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/EndpointSummary.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/EndpointSummary.java @@ -24,6 +24,8 @@ public final class EndpointSummary @Deprecated @java.beans.ConstructorProperties({ "id", + "alias", + "computeType", "displayName", "compartmentId", "projectId", @@ -39,6 +41,8 @@ public final class EndpointSummary }) public EndpointSummary( String id, + String alias, + ComputeType computeType, String displayName, String compartmentId, String projectId, @@ -53,6 +57,8 @@ public EndpointSummary( java.util.Map> systemTags) { super(); this.id = id; + this.alias = alias; + this.computeType = computeType; this.displayName = displayName; this.compartmentId = compartmentId; this.projectId = projectId; @@ -84,6 +90,40 @@ public Builder id(String id) { this.__explicitlySet__.add("id"); return this; } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } + /** Compute infra type for endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("computeType") + private ComputeType computeType; + + /** + * Compute infra type for endpoint. + * + * @param computeType the value to set + * @return this builder + */ + public Builder computeType(ComputeType computeType) { + this.computeType = computeType; + this.__explicitlySet__.add("computeType"); + return this; + } /** * A user-friendly display name for the resource. It should be unique and can be modified. * Avoid entering confidential information. @@ -309,6 +349,8 @@ public EndpointSummary build() { EndpointSummary model = new EndpointSummary( this.id, + this.alias, + this.computeType, this.displayName, this.compartmentId, this.projectId, @@ -332,6 +374,12 @@ public Builder copy(EndpointSummary model) { if (model.wasPropertyExplicitlySet("id")) { this.id(model.getId()); } + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } + if (model.wasPropertyExplicitlySet("computeType")) { + this.computeType(model.getComputeType()); + } if (model.wasPropertyExplicitlySet("displayName")) { this.displayName(model.getDisplayName()); } @@ -394,6 +442,82 @@ public String getId() { return id; } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + + /** Compute infra type for endpoint. */ + public enum ComputeType implements com.oracle.bmc.http.internal.BmcEnum { + Cpu("CPU"), + Gpu("GPU"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(ComputeType.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (ComputeType v : ComputeType.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + ComputeType(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static ComputeType create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'ComputeType', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; + /** Compute infra type for endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("computeType") + private final ComputeType computeType; + + /** + * Compute infra type for endpoint. + * + * @return the value + */ + public ComputeType getComputeType() { + return computeType; + } + /** * A user-friendly display name for the resource. It should be unique and can be modified. Avoid * entering confidential information. @@ -602,6 +726,8 @@ public String toString(boolean includeByteArrayContents) { sb.append("EndpointSummary("); sb.append("super=").append(super.toString()); sb.append("id=").append(String.valueOf(this.id)); + sb.append(", alias=").append(String.valueOf(this.alias)); + sb.append(", computeType=").append(String.valueOf(this.computeType)); sb.append(", displayName=").append(String.valueOf(this.displayName)); sb.append(", compartmentId=").append(String.valueOf(this.compartmentId)); sb.append(", projectId=").append(String.valueOf(this.projectId)); @@ -629,6 +755,8 @@ public boolean equals(Object o) { EndpointSummary other = (EndpointSummary) o; return java.util.Objects.equals(this.id, other.id) + && java.util.Objects.equals(this.alias, other.alias) + && java.util.Objects.equals(this.computeType, other.computeType) && java.util.Objects.equals(this.displayName, other.displayName) && java.util.Objects.equals(this.compartmentId, other.compartmentId) && java.util.Objects.equals(this.projectId, other.projectId) @@ -649,6 +777,8 @@ public int hashCode() { final int PRIME = 59; int result = 1; result = (result * PRIME) + (this.id == null ? 43 : this.id.hashCode()); + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); + result = (result * PRIME) + (this.computeType == null ? 43 : this.computeType.hashCode()); result = (result * PRIME) + (this.displayName == null ? 43 : this.displayName.hashCode()); result = (result * PRIME) diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/HealthNluModelDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/HealthNluModelDetails.java new file mode 100644 index 00000000000..68b638925fc --- /dev/null +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/HealthNluModelDetails.java @@ -0,0 +1,154 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.ailanguage.model; + +/** + * Possible health NLU model information.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20221001") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = HealthNluModelDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "modelType") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class HealthNluModelDetails extends ModelDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("languageCode") + private String languageCode; + + public Builder languageCode(String languageCode) { + this.languageCode = languageCode; + this.__explicitlySet__.add("languageCode"); + return this; + } + /** + * Optional pre trained model version. If nothing specified latest pre trained model will be + * used. Supported versions can be found at /modelTypes/{modelType} + */ + @com.fasterxml.jackson.annotation.JsonProperty("version") + private String version; + + /** + * Optional pre trained model version. If nothing specified latest pre trained model will be + * used. Supported versions can be found at /modelTypes/{modelType} + * + * @param version the value to set + * @return this builder + */ + public Builder version(String version) { + this.version = version; + this.__explicitlySet__.add("version"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public HealthNluModelDetails build() { + HealthNluModelDetails model = + new HealthNluModelDetails(this.languageCode, this.version); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(HealthNluModelDetails model) { + if (model.wasPropertyExplicitlySet("languageCode")) { + this.languageCode(model.getLanguageCode()); + } + if (model.wasPropertyExplicitlySet("version")) { + this.version(model.getVersion()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public HealthNluModelDetails(String languageCode, String version) { + super(languageCode); + this.version = version; + } + + /** + * Optional pre trained model version. If nothing specified latest pre trained model will be + * used. Supported versions can be found at /modelTypes/{modelType} + */ + @com.fasterxml.jackson.annotation.JsonProperty("version") + private final String version; + + /** + * Optional pre trained model version. If nothing specified latest pre trained model will be + * used. Supported versions can be found at /modelTypes/{modelType} + * + * @return the value + */ + public String getVersion() { + return version; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("HealthNluModelDetails("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", version=").append(String.valueOf(this.version)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof HealthNluModelDetails)) { + return false; + } + + HealthNluModelDetails other = (HealthNluModelDetails) o; + return java.util.Objects.equals(this.version, other.version) && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = (result * PRIME) + (this.version == null ? 43 : this.version.hashCode()); + return result; + } +} diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/HierarchicalEntity.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/HierarchicalEntity.java index f6ff8addb95..29a11baa636 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/HierarchicalEntity.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/HierarchicalEntity.java @@ -23,8 +23,17 @@ public final class HierarchicalEntity extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated - @java.beans.ConstructorProperties({"offset", "length", "text", "type", "subType", "score"}) + @java.beans.ConstructorProperties({ + "metaInfo", + "offset", + "length", + "text", + "type", + "subType", + "score" + }) public HierarchicalEntity( + MetaInfo metaInfo, Integer offset, Integer length, String text, @@ -32,6 +41,7 @@ public HierarchicalEntity( String subType, Double score) { super(); + this.metaInfo = metaInfo; this.offset = offset; this.length = length; this.text = text; @@ -42,6 +52,15 @@ public HierarchicalEntity( @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + + @com.fasterxml.jackson.annotation.JsonProperty("metaInfo") + private MetaInfo metaInfo; + + public Builder metaInfo(MetaInfo metaInfo) { + this.metaInfo = metaInfo; + this.__explicitlySet__.add("metaInfo"); + return this; + } /** The number of Unicode code points preceding this entity in the submitted text. */ @com.fasterxml.jackson.annotation.JsonProperty("offset") private Integer offset; @@ -139,6 +158,7 @@ public Builder score(Double score) { public HierarchicalEntity build() { HierarchicalEntity model = new HierarchicalEntity( + this.metaInfo, this.offset, this.length, this.text, @@ -153,6 +173,9 @@ public HierarchicalEntity build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(HierarchicalEntity model) { + if (model.wasPropertyExplicitlySet("metaInfo")) { + this.metaInfo(model.getMetaInfo()); + } if (model.wasPropertyExplicitlySet("offset")) { this.offset(model.getOffset()); } @@ -184,6 +207,13 @@ public Builder toBuilder() { return new Builder().copy(this); } + @com.fasterxml.jackson.annotation.JsonProperty("metaInfo") + private final MetaInfo metaInfo; + + public MetaInfo getMetaInfo() { + return metaInfo; + } + /** The number of Unicode code points preceding this entity in the submitted text. */ @com.fasterxml.jackson.annotation.JsonProperty("offset") private final Integer offset; @@ -277,7 +307,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("HierarchicalEntity("); sb.append("super=").append(super.toString()); - sb.append("offset=").append(String.valueOf(this.offset)); + sb.append("metaInfo=").append(String.valueOf(this.metaInfo)); + sb.append(", offset=").append(String.valueOf(this.offset)); sb.append(", length=").append(String.valueOf(this.length)); sb.append(", text=").append(String.valueOf(this.text)); sb.append(", type=").append(String.valueOf(this.type)); @@ -297,7 +328,8 @@ public boolean equals(Object o) { } HierarchicalEntity other = (HierarchicalEntity) o; - return java.util.Objects.equals(this.offset, other.offset) + return java.util.Objects.equals(this.metaInfo, other.metaInfo) + && java.util.Objects.equals(this.offset, other.offset) && java.util.Objects.equals(this.length, other.length) && java.util.Objects.equals(this.text, other.text) && java.util.Objects.equals(this.type, other.type) @@ -310,6 +342,7 @@ public boolean equals(Object o) { public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.metaInfo == null ? 43 : this.metaInfo.hashCode()); result = (result * PRIME) + (this.offset == null ? 43 : this.offset.hashCode()); result = (result * PRIME) + (this.length == null ? 43 : this.length.hashCode()); result = (result * PRIME) + (this.text == null ? 43 : this.text.hashCode()); diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/MetaInfo.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/MetaInfo.java new file mode 100644 index 00000000000..aa36b510a52 --- /dev/null +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/MetaInfo.java @@ -0,0 +1,273 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.ailanguage.model; + +/** + * MetaInfo of entity detected.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20221001") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = MetaInfo.Builder.class) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class MetaInfo extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({"offset", "length", "text", "subType", "score"}) + public MetaInfo(Integer offset, Integer length, String text, String subType, Double score) { + super(); + this.offset = offset; + this.length = length; + this.text = text; + this.subType = subType; + this.score = score; + } + + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + /** The number of Unicode code points preceding this entity in the submitted text. */ + @com.fasterxml.jackson.annotation.JsonProperty("offset") + private Integer offset; + + /** + * The number of Unicode code points preceding this entity in the submitted text. + * + * @param offset the value to set + * @return this builder + */ + public Builder offset(Integer offset) { + this.offset = offset; + this.__explicitlySet__.add("offset"); + return this; + } + /** Length of entity text. */ + @com.fasterxml.jackson.annotation.JsonProperty("length") + private Integer length; + + /** + * Length of entity text. + * + * @param length the value to set + * @return this builder + */ + public Builder length(Integer length) { + this.length = length; + this.__explicitlySet__.add("length"); + return this; + } + /** Entity text like name of person, location, and so on. */ + @com.fasterxml.jackson.annotation.JsonProperty("text") + private String text; + + /** + * Entity text like name of person, location, and so on. + * + * @param text the value to set + * @return this builder + */ + public Builder text(String text) { + this.text = text; + this.__explicitlySet__.add("text"); + return this; + } + /** Sub-type of entity text like GPE for LOCATION type. */ + @com.fasterxml.jackson.annotation.JsonProperty("subType") + private String subType; + + /** + * Sub-type of entity text like GPE for LOCATION type. + * + * @param subType the value to set + * @return this builder + */ + public Builder subType(String subType) { + this.subType = subType; + this.__explicitlySet__.add("subType"); + return this; + } + /** Score or confidence for detected entity. */ + @com.fasterxml.jackson.annotation.JsonProperty("score") + private Double score; + + /** + * Score or confidence for detected entity. + * + * @param score the value to set + * @return this builder + */ + public Builder score(Double score) { + this.score = score; + this.__explicitlySet__.add("score"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public MetaInfo build() { + MetaInfo model = + new MetaInfo(this.offset, this.length, this.text, this.subType, this.score); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(MetaInfo model) { + if (model.wasPropertyExplicitlySet("offset")) { + this.offset(model.getOffset()); + } + if (model.wasPropertyExplicitlySet("length")) { + this.length(model.getLength()); + } + if (model.wasPropertyExplicitlySet("text")) { + this.text(model.getText()); + } + if (model.wasPropertyExplicitlySet("subType")) { + this.subType(model.getSubType()); + } + if (model.wasPropertyExplicitlySet("score")) { + this.score(model.getScore()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + /** The number of Unicode code points preceding this entity in the submitted text. */ + @com.fasterxml.jackson.annotation.JsonProperty("offset") + private final Integer offset; + + /** + * The number of Unicode code points preceding this entity in the submitted text. + * + * @return the value + */ + public Integer getOffset() { + return offset; + } + + /** Length of entity text. */ + @com.fasterxml.jackson.annotation.JsonProperty("length") + private final Integer length; + + /** + * Length of entity text. + * + * @return the value + */ + public Integer getLength() { + return length; + } + + /** Entity text like name of person, location, and so on. */ + @com.fasterxml.jackson.annotation.JsonProperty("text") + private final String text; + + /** + * Entity text like name of person, location, and so on. + * + * @return the value + */ + public String getText() { + return text; + } + + /** Sub-type of entity text like GPE for LOCATION type. */ + @com.fasterxml.jackson.annotation.JsonProperty("subType") + private final String subType; + + /** + * Sub-type of entity text like GPE for LOCATION type. + * + * @return the value + */ + public String getSubType() { + return subType; + } + + /** Score or confidence for detected entity. */ + @com.fasterxml.jackson.annotation.JsonProperty("score") + private final Double score; + + /** + * Score or confidence for detected entity. + * + * @return the value + */ + public Double getScore() { + return score; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("MetaInfo("); + sb.append("super=").append(super.toString()); + sb.append("offset=").append(String.valueOf(this.offset)); + sb.append(", length=").append(String.valueOf(this.length)); + sb.append(", text=").append(String.valueOf(this.text)); + sb.append(", subType=").append(String.valueOf(this.subType)); + sb.append(", score=").append(String.valueOf(this.score)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof MetaInfo)) { + return false; + } + + MetaInfo other = (MetaInfo) o; + return java.util.Objects.equals(this.offset, other.offset) + && java.util.Objects.equals(this.length, other.length) + && java.util.Objects.equals(this.text, other.text) + && java.util.Objects.equals(this.subType, other.subType) + && java.util.Objects.equals(this.score, other.score) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + (this.offset == null ? 43 : this.offset.hashCode()); + result = (result * PRIME) + (this.length == null ? 43 : this.length.hashCode()); + result = (result * PRIME) + (this.text == null ? 43 : this.text.hashCode()); + result = (result * PRIME) + (this.subType == null ? 43 : this.subType.hashCode()); + result = (result * PRIME) + (this.score == null ? 43 : this.score.hashCode()); + result = (result * PRIME) + super.hashCode(); + return result; + } +} diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/ModelDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/ModelDetails.java index 3b881453d7a..b7df0f4b2f1 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/ModelDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/ModelDetails.java @@ -25,36 +25,42 @@ @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PreTrainedKeyPhraseExtractionModelDetails.class, name = "PRE_TRAINED_KEYPHRASE_EXTRACTION"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = PreTrainedTranslationModelDetails.class, + name = "PRE_TRAINED_TRANSLATION"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PreTrainedHealthNluModelDetails.class, name = "PRE_TRAINED_HEALTH_NLU"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PreTrainedUniversalModel.class, name = "PRE_TRAINED_UNIVERSAL"), - @com.fasterxml.jackson.annotation.JsonSubTypes.Type( - value = NamedEntityRecognitionModelDetails.class, - name = "NAMED_ENTITY_RECOGNITION"), - @com.fasterxml.jackson.annotation.JsonSubTypes.Type( - value = PiiModelDetails.class, - name = "PII"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PreTrainedLanguageDetectionModelDetails.class, name = "PRE_TRAINED_LANGUAGE_DETECTION"), - @com.fasterxml.jackson.annotation.JsonSubTypes.Type( - value = PreTrainedNamedEntityRecognitionModelDetails.class, - name = "PRE_TRAINED_NAMED_ENTITY_RECOGNITION"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PreTrainedSentimentAnalysisModelDetails.class, name = "PRE_TRAINED_SENTIMENT_ANALYSIS"), - @com.fasterxml.jackson.annotation.JsonSubTypes.Type( - value = PreTrainedTextClassificationModelDetails.class, - name = "PRE_TRAINED_TEXT_CLASSIFICATION"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = TextClassificationModelDetails.class, name = "TEXT_CLASSIFICATION"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = HealthNluModelDetails.class, + name = "HEALTH_NLU"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PreTrainedSummarization.class, name = "PRE_TRAINED_SUMMARIZATION"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = NamedEntityRecognitionModelDetails.class, + name = "NAMED_ENTITY_RECOGNITION"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = PiiModelDetails.class, + name = "PII"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = PreTrainedNamedEntityRecognitionModelDetails.class, + name = "PRE_TRAINED_NAMED_ENTITY_RECOGNITION"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = PreTrainedTextClassificationModelDetails.class, + name = "PRE_TRAINED_TEXT_CLASSIFICATION"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PreTrainedPiiModelDetails.class, name = "PRE_TRAINED_PII") @@ -135,11 +141,12 @@ public enum ModelType implements com.oracle.bmc.http.internal.BmcEnum { PreTrainedKeyphraseExtraction("PRE_TRAINED_KEYPHRASE_EXTRACTION"), PreTrainedLanguageDetection("PRE_TRAINED_LANGUAGE_DETECTION"), PreTrainedPii("PRE_TRAINED_PII"), - PreTrainedTranslation("PRE_TRAINED_TRANSLATION"), PreTrainedHealthNlu("PRE_TRAINED_HEALTH_NLU"), PreTrainedSummarization("PRE_TRAINED_SUMMARIZATION"), PreTrainedUniversal("PRE_TRAINED_UNIVERSAL"), Pii("PII"), + PreTrainedTranslation("PRE_TRAINED_TRANSLATION"), + HealthNlu("HEALTH_NLU"), /** * This value is used if a service returns a value for this enum that is not recognized by diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityMask.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityMask.java index fd1fc957316..d0a6bbc84df 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityMask.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityMask.java @@ -26,6 +26,23 @@ public final class PiiEntityMask extends PiiEntityMasking { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("exclude") + private java.util.List exclude; + + public Builder exclude(java.util.List exclude) { + this.exclude = exclude; + this.__explicitlySet__.add("exclude"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("shouldDetect") + private Boolean shouldDetect; + + public Builder shouldDetect(Boolean shouldDetect) { + this.shouldDetect = shouldDetect; + this.__explicitlySet__.add("shouldDetect"); + return this; + } /** Masking character. By default, the character is an asterisk (*) */ @com.fasterxml.jackson.annotation.JsonProperty("maskingCharacter") private String maskingCharacter; @@ -84,6 +101,8 @@ public Builder isUnmaskedFromEnd(Boolean isUnmaskedFromEnd) { public PiiEntityMask build() { PiiEntityMask model = new PiiEntityMask( + this.exclude, + this.shouldDetect, this.maskingCharacter, this.leaveCharactersUnmasked, this.isUnmaskedFromEnd); @@ -95,6 +114,12 @@ public PiiEntityMask build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PiiEntityMask model) { + if (model.wasPropertyExplicitlySet("exclude")) { + this.exclude(model.getExclude()); + } + if (model.wasPropertyExplicitlySet("shouldDetect")) { + this.shouldDetect(model.getShouldDetect()); + } if (model.wasPropertyExplicitlySet("maskingCharacter")) { this.maskingCharacter(model.getMaskingCharacter()); } @@ -119,8 +144,12 @@ public Builder toBuilder() { @Deprecated public PiiEntityMask( - String maskingCharacter, Integer leaveCharactersUnmasked, Boolean isUnmaskedFromEnd) { - super(); + java.util.List exclude, + Boolean shouldDetect, + String maskingCharacter, + Integer leaveCharactersUnmasked, + Boolean isUnmaskedFromEnd) { + super(exclude, shouldDetect); this.maskingCharacter = maskingCharacter; this.leaveCharactersUnmasked = leaveCharactersUnmasked; this.isUnmaskedFromEnd = isUnmaskedFromEnd; diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityMasking.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityMasking.java index 283aa468d4a..f66a1fb64db 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityMasking.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityMasking.java @@ -34,9 +34,37 @@ com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) public class PiiEntityMasking extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated - @java.beans.ConstructorProperties({}) - protected PiiEntityMasking() { + @java.beans.ConstructorProperties({"exclude", "shouldDetect"}) + protected PiiEntityMasking(java.util.List exclude, Boolean shouldDetect) { super(); + this.exclude = exclude; + this.shouldDetect = shouldDetect; + } + + /** List of offsets/entities to be removed from anonymization. */ + @com.fasterxml.jackson.annotation.JsonProperty("exclude") + private final java.util.List exclude; + + /** + * List of offsets/entities to be removed from anonymization. + * + * @return the value + */ + public java.util.List getExclude() { + return exclude; + } + + /** To include excluded entities from masking in detected entities or not. */ + @com.fasterxml.jackson.annotation.JsonProperty("shouldDetect") + private final Boolean shouldDetect; + + /** + * To include excluded entities from masking in detected entities or not. + * + * @return the value + */ + public Boolean getShouldDetect() { + return shouldDetect; } @Override @@ -54,6 +82,8 @@ public String toString(boolean includeByteArrayContents) { java.lang.StringBuilder sb = new java.lang.StringBuilder(); sb.append("PiiEntityMasking("); sb.append("super=").append(super.toString()); + sb.append("exclude=").append(String.valueOf(this.exclude)); + sb.append(", shouldDetect=").append(String.valueOf(this.shouldDetect)); sb.append(")"); return sb.toString(); } @@ -68,13 +98,17 @@ public boolean equals(Object o) { } PiiEntityMasking other = (PiiEntityMasking) o; - return super.equals(other); + return java.util.Objects.equals(this.exclude, other.exclude) + && java.util.Objects.equals(this.shouldDetect, other.shouldDetect) + && super.equals(other); } @Override public int hashCode() { final int PRIME = 59; int result = 1; + result = (result * PRIME) + (this.exclude == null ? 43 : this.exclude.hashCode()); + result = (result * PRIME) + (this.shouldDetect == null ? 43 : this.shouldDetect.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityRemove.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityRemove.java index 36de327a554..5417181ff12 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityRemove.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityRemove.java @@ -26,12 +26,29 @@ public final class PiiEntityRemove extends PiiEntityMasking { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("exclude") + private java.util.List exclude; + + public Builder exclude(java.util.List exclude) { + this.exclude = exclude; + this.__explicitlySet__.add("exclude"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("shouldDetect") + private Boolean shouldDetect; + + public Builder shouldDetect(Boolean shouldDetect) { + this.shouldDetect = shouldDetect; + this.__explicitlySet__.add("shouldDetect"); + return this; + } @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public PiiEntityRemove build() { - PiiEntityRemove model = new PiiEntityRemove(); + PiiEntityRemove model = new PiiEntityRemove(this.exclude, this.shouldDetect); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -40,6 +57,12 @@ public PiiEntityRemove build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PiiEntityRemove model) { + if (model.wasPropertyExplicitlySet("exclude")) { + this.exclude(model.getExclude()); + } + if (model.wasPropertyExplicitlySet("shouldDetect")) { + this.shouldDetect(model.getShouldDetect()); + } return this; } } @@ -54,8 +77,8 @@ public Builder toBuilder() { } @Deprecated - public PiiEntityRemove() { - super(); + public PiiEntityRemove(java.util.List exclude, Boolean shouldDetect) { + super(exclude, shouldDetect); } @Override diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityReplace.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityReplace.java index cf3563f4419..76354a66110 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityReplace.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PiiEntityReplace.java @@ -26,6 +26,23 @@ public final class PiiEntityReplace extends PiiEntityMasking { @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("exclude") + private java.util.List exclude; + + public Builder exclude(java.util.List exclude) { + this.exclude = exclude; + this.__explicitlySet__.add("exclude"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("shouldDetect") + private Boolean shouldDetect; + + public Builder shouldDetect(Boolean shouldDetect) { + this.shouldDetect = shouldDetect; + this.__explicitlySet__.add("shouldDetect"); + return this; + } /** * Replace entities with given sequence of characters. By default PII entity will be * replaced with . @@ -50,7 +67,8 @@ public Builder replaceWith(String replaceWith) { private final java.util.Set __explicitlySet__ = new java.util.HashSet(); public PiiEntityReplace build() { - PiiEntityReplace model = new PiiEntityReplace(this.replaceWith); + PiiEntityReplace model = + new PiiEntityReplace(this.exclude, this.shouldDetect, this.replaceWith); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -59,6 +77,12 @@ public PiiEntityReplace build() { @com.fasterxml.jackson.annotation.JsonIgnore public Builder copy(PiiEntityReplace model) { + if (model.wasPropertyExplicitlySet("exclude")) { + this.exclude(model.getExclude()); + } + if (model.wasPropertyExplicitlySet("shouldDetect")) { + this.shouldDetect(model.getShouldDetect()); + } if (model.wasPropertyExplicitlySet("replaceWith")) { this.replaceWith(model.getReplaceWith()); } @@ -76,8 +100,9 @@ public Builder toBuilder() { } @Deprecated - public PiiEntityReplace(String replaceWith) { - super(); + public PiiEntityReplace( + java.util.List exclude, Boolean shouldDetect, String replaceWith) { + super(exclude, shouldDetect); this.replaceWith = replaceWith; } diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PreTrainedTranslationModelDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PreTrainedTranslationModelDetails.java new file mode 100644 index 00000000000..2d185505790 --- /dev/null +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/PreTrainedTranslationModelDetails.java @@ -0,0 +1,154 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.ailanguage.model; + +/** + * Possible pre trained translation model information.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20221001") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = PreTrainedTranslationModelDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "modelType") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class PreTrainedTranslationModelDetails extends ModelDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("languageCode") + private String languageCode; + + public Builder languageCode(String languageCode) { + this.languageCode = languageCode; + this.__explicitlySet__.add("languageCode"); + return this; + } + /** + * Optional pre trained model version. If nothing specified latest pre trained model will be + * used. Supported versions can be found at /modelTypes/{modelType} + */ + @com.fasterxml.jackson.annotation.JsonProperty("version") + private String version; + + /** + * Optional pre trained model version. If nothing specified latest pre trained model will be + * used. Supported versions can be found at /modelTypes/{modelType} + * + * @param version the value to set + * @return this builder + */ + public Builder version(String version) { + this.version = version; + this.__explicitlySet__.add("version"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public PreTrainedTranslationModelDetails build() { + PreTrainedTranslationModelDetails model = + new PreTrainedTranslationModelDetails(this.languageCode, this.version); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(PreTrainedTranslationModelDetails model) { + if (model.wasPropertyExplicitlySet("languageCode")) { + this.languageCode(model.getLanguageCode()); + } + if (model.wasPropertyExplicitlySet("version")) { + this.version(model.getVersion()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public PreTrainedTranslationModelDetails(String languageCode, String version) { + super(languageCode); + this.version = version; + } + + /** + * Optional pre trained model version. If nothing specified latest pre trained model will be + * used. Supported versions can be found at /modelTypes/{modelType} + */ + @com.fasterxml.jackson.annotation.JsonProperty("version") + private final String version; + + /** + * Optional pre trained model version. If nothing specified latest pre trained model will be + * used. Supported versions can be found at /modelTypes/{modelType} + * + * @return the value + */ + public String getVersion() { + return version; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("PreTrainedTranslationModelDetails("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", version=").append(String.valueOf(this.version)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof PreTrainedTranslationModelDetails)) { + return false; + } + + PreTrainedTranslationModelDetails other = (PreTrainedTranslationModelDetails) o; + return java.util.Objects.equals(this.version, other.version) && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = (result * PRIME) + (this.version == null ? 43 : this.version.hashCode()); + return result; + } +} diff --git a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/UpdateEndpointDetails.java b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/UpdateEndpointDetails.java index 251134875bb..a022c1012b8 100644 --- a/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/UpdateEndpointDetails.java +++ b/bmc-ailanguage/src/main/java/com/oracle/bmc/ailanguage/model/UpdateEndpointDetails.java @@ -25,6 +25,7 @@ public final class UpdateEndpointDetails @Deprecated @java.beans.ConstructorProperties({ "displayName", + "alias", "description", "modelId", "inferenceUnits", @@ -33,6 +34,7 @@ public final class UpdateEndpointDetails }) public UpdateEndpointDetails( String displayName, + String alias, String description, String modelId, Integer inferenceUnits, @@ -40,6 +42,7 @@ public UpdateEndpointDetails( java.util.Map> definedTags) { super(); this.displayName = displayName; + this.alias = alias; this.description = description; this.modelId = modelId; this.inferenceUnits = inferenceUnits; @@ -68,6 +71,25 @@ public Builder displayName(String displayName) { this.__explicitlySet__.add("displayName"); return this; } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @param alias the value to set + * @return this builder + */ + public Builder alias(String alias) { + this.alias = alias; + this.__explicitlySet__.add("alias"); + return this; + } /** A short description of the endpoint. */ @com.fasterxml.jackson.annotation.JsonProperty("description") private String description; @@ -164,6 +186,7 @@ public UpdateEndpointDetails build() { UpdateEndpointDetails model = new UpdateEndpointDetails( this.displayName, + this.alias, this.description, this.modelId, this.inferenceUnits, @@ -180,6 +203,9 @@ public Builder copy(UpdateEndpointDetails model) { if (model.wasPropertyExplicitlySet("displayName")) { this.displayName(model.getDisplayName()); } + if (model.wasPropertyExplicitlySet("alias")) { + this.alias(model.getAlias()); + } if (model.wasPropertyExplicitlySet("description")) { this.description(model.getDescription()); } @@ -225,6 +251,23 @@ public String getDisplayName() { return displayName; } + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + */ + @com.fasterxml.jackson.annotation.JsonProperty("alias") + private final String alias; + + /** + * Unique name across user tenancy in a region to identify an endpoint to be used for + * inferencing. + * + * @return the value + */ + public String getAlias() { + return alias; + } + /** A short description of the endpoint. */ @com.fasterxml.jackson.annotation.JsonProperty("description") private final String description; @@ -318,6 +361,7 @@ public String toString(boolean includeByteArrayContents) { sb.append("UpdateEndpointDetails("); sb.append("super=").append(super.toString()); sb.append("displayName=").append(String.valueOf(this.displayName)); + sb.append(", alias=").append(String.valueOf(this.alias)); sb.append(", description=").append(String.valueOf(this.description)); sb.append(", modelId=").append(String.valueOf(this.modelId)); sb.append(", inferenceUnits=").append(String.valueOf(this.inferenceUnits)); @@ -338,6 +382,7 @@ public boolean equals(Object o) { UpdateEndpointDetails other = (UpdateEndpointDetails) o; return java.util.Objects.equals(this.displayName, other.displayName) + && java.util.Objects.equals(this.alias, other.alias) && java.util.Objects.equals(this.description, other.description) && java.util.Objects.equals(this.modelId, other.modelId) && java.util.Objects.equals(this.inferenceUnits, other.inferenceUnits) @@ -351,6 +396,7 @@ public int hashCode() { final int PRIME = 59; int result = 1; result = (result * PRIME) + (this.displayName == null ? 43 : this.displayName.hashCode()); + result = (result * PRIME) + (this.alias == null ? 43 : this.alias.hashCode()); result = (result * PRIME) + (this.description == null ? 43 : this.description.hashCode()); result = (result * PRIME) + (this.modelId == null ? 43 : this.modelId.hashCode()); result = diff --git a/bmc-ailanguage/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-ailanguage/reflect-config.json b/bmc-ailanguage/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-ailanguage/reflect-config.json index 7770bd59719..e892009c2d1 100644 --- a/bmc-ailanguage/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-ailanguage/reflect-config.json +++ b/bmc-ailanguage/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-ailanguage/reflect-config.json @@ -424,6 +424,12 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.CreateEndpointDetails$ComputeType", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.ailanguage.model.CreateJobDetails", @@ -717,6 +723,12 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.Endpoint$ComputeType", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.ailanguage.model.Endpoint$LifecycleState", @@ -751,6 +763,12 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.EndpointSummary$ComputeType", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.ailanguage.model.Entity", @@ -877,6 +895,20 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.HealthNluModelDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.HealthNluModelDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.ailanguage.model.HierarchicalEntity", @@ -1035,6 +1067,20 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.MetaInfo", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.MetaInfo$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.ailanguage.model.Model", @@ -1491,6 +1537,20 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.PreTrainedTranslationModelDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.ailanguage.model.PreTrainedTranslationModelDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.ailanguage.model.PreTrainedUniversalModel", diff --git a/bmc-ailanguage/src/main/resources/com/oracle/bmc/ailanguage/client.properties b/bmc-ailanguage/src/main/resources/com/oracle/bmc/ailanguage/client.properties index d75a769d910..5fe6eec9115 100644 --- a/bmc-ailanguage/src/main/resources/com/oracle/bmc/ailanguage/client.properties +++ b/bmc-ailanguage/src/main/resources/com/oracle/bmc/ailanguage/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20221001") \ No newline at end of file diff --git a/bmc-aispeech/pom.xml b/bmc-aispeech/pom.xml index b39f40d7d73..b497ad33d75 100644 --- a/bmc-aispeech/pom.xml +++ b/bmc-aispeech/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-aispeech @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-aispeech/src/main/resources/com/oracle/bmc/aispeech/client.properties b/bmc-aispeech/src/main/resources/com/oracle/bmc/aispeech/client.properties index aba61139dc7..6b93059f216 100644 --- a/bmc-aispeech/src/main/resources/com/oracle/bmc/aispeech/client.properties +++ b/bmc-aispeech/src/main/resources/com/oracle/bmc/aispeech/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220101") \ No newline at end of file diff --git a/bmc-aivision/pom.xml b/bmc-aivision/pom.xml index cf78d5f4258..d2f497c3991 100644 --- a/bmc-aivision/pom.xml +++ b/bmc-aivision/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-aivision @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-aivision/src/main/resources/com/oracle/bmc/aivision/client.properties b/bmc-aivision/src/main/resources/com/oracle/bmc/aivision/client.properties index 3b6bf175494..42cc72d5c60 100644 --- a/bmc-aivision/src/main/resources/com/oracle/bmc/aivision/client.properties +++ b/bmc-aivision/src/main/resources/com/oracle/bmc/aivision/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") \ No newline at end of file diff --git a/bmc-analytics/pom.xml b/bmc-analytics/pom.xml index cb48b6c4437..12eb40f7728 100644 --- a/bmc-analytics/pom.xml +++ b/bmc-analytics/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-analytics @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-analytics/src/main/resources/com/oracle/bmc/analytics/client.properties b/bmc-analytics/src/main/resources/com/oracle/bmc/analytics/client.properties index 472875274fa..a40e27bbc44 100644 --- a/bmc-analytics/src/main/resources/com/oracle/bmc/analytics/client.properties +++ b/bmc-analytics/src/main/resources/com/oracle/bmc/analytics/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190331") \ No newline at end of file diff --git a/bmc-announcementsservice/pom.xml b/bmc-announcementsservice/pom.xml index 77c45b9555e..3c54cf8c4d7 100644 --- a/bmc-announcementsservice/pom.xml +++ b/bmc-announcementsservice/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-announcementsservice @@ -16,7 +16,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-announcementsservice/src/main/resources/com/oracle/bmc/announcementsservice/client.properties b/bmc-announcementsservice/src/main/resources/com/oracle/bmc/announcementsservice/client.properties index aa0dfae49dc..11b9316e8c6 100644 --- a/bmc-announcementsservice/src/main/resources/com/oracle/bmc/announcementsservice/client.properties +++ b/bmc-announcementsservice/src/main/resources/com/oracle/bmc/announcementsservice/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 0.0.1") \ No newline at end of file diff --git a/bmc-apigateway/pom.xml b/bmc-apigateway/pom.xml index 51812b861d9..cbd7bca65ea 100644 --- a/bmc-apigateway/pom.xml +++ b/bmc-apigateway/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-apigateway @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-apigateway/src/main/resources/com/oracle/bmc/apigateway/client.properties b/bmc-apigateway/src/main/resources/com/oracle/bmc/apigateway/client.properties index c401140d772..b3357cda039 100644 --- a/bmc-apigateway/src/main/resources/com/oracle/bmc/apigateway/client.properties +++ b/bmc-apigateway/src/main/resources/com/oracle/bmc/apigateway/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190501") \ No newline at end of file diff --git a/bmc-apmconfig/pom.xml b/bmc-apmconfig/pom.xml index 8c65c13c1e6..383183014b5 100644 --- a/bmc-apmconfig/pom.xml +++ b/bmc-apmconfig/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-apmconfig @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-apmconfig/src/main/resources/com/oracle/bmc/apmconfig/client.properties b/bmc-apmconfig/src/main/resources/com/oracle/bmc/apmconfig/client.properties index dcbfe7d74a4..176ce716e7e 100644 --- a/bmc-apmconfig/src/main/resources/com/oracle/bmc/apmconfig/client.properties +++ b/bmc-apmconfig/src/main/resources/com/oracle/bmc/apmconfig/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210201") \ No newline at end of file diff --git a/bmc-apmcontrolplane/pom.xml b/bmc-apmcontrolplane/pom.xml index 3ca81972cd8..8abcd764348 100644 --- a/bmc-apmcontrolplane/pom.xml +++ b/bmc-apmcontrolplane/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-apmcontrolplane @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-apmcontrolplane/src/main/resources/com/oracle/bmc/apmcontrolplane/client.properties b/bmc-apmcontrolplane/src/main/resources/com/oracle/bmc/apmcontrolplane/client.properties index 8422301a9f6..92396da4c78 100644 --- a/bmc-apmcontrolplane/src/main/resources/com/oracle/bmc/apmcontrolplane/client.properties +++ b/bmc-apmcontrolplane/src/main/resources/com/oracle/bmc/apmcontrolplane/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200630") \ No newline at end of file diff --git a/bmc-apmsynthetics/pom.xml b/bmc-apmsynthetics/pom.xml index 808ede5e1db..97e87e3d70a 100644 --- a/bmc-apmsynthetics/pom.xml +++ b/bmc-apmsynthetics/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-apmsynthetics @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-apmsynthetics/src/main/resources/com/oracle/bmc/apmsynthetics/client.properties b/bmc-apmsynthetics/src/main/resources/com/oracle/bmc/apmsynthetics/client.properties index 8422301a9f6..92396da4c78 100644 --- a/bmc-apmsynthetics/src/main/resources/com/oracle/bmc/apmsynthetics/client.properties +++ b/bmc-apmsynthetics/src/main/resources/com/oracle/bmc/apmsynthetics/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200630") \ No newline at end of file diff --git a/bmc-apmtraces/pom.xml b/bmc-apmtraces/pom.xml index fc4a58a50d5..57d5e776191 100644 --- a/bmc-apmtraces/pom.xml +++ b/bmc-apmtraces/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-apmtraces @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-apmtraces/src/main/resources/com/oracle/bmc/apmtraces/client.properties b/bmc-apmtraces/src/main/resources/com/oracle/bmc/apmtraces/client.properties index 8422301a9f6..92396da4c78 100644 --- a/bmc-apmtraces/src/main/resources/com/oracle/bmc/apmtraces/client.properties +++ b/bmc-apmtraces/src/main/resources/com/oracle/bmc/apmtraces/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200630") \ No newline at end of file diff --git a/bmc-appmgmtcontrol/pom.xml b/bmc-appmgmtcontrol/pom.xml index bdb104ccc74..c3f70871045 100644 --- a/bmc-appmgmtcontrol/pom.xml +++ b/bmc-appmgmtcontrol/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-appmgmtcontrol @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-appmgmtcontrol/src/main/resources/com/oracle/bmc/appmgmtcontrol/client.properties b/bmc-appmgmtcontrol/src/main/resources/com/oracle/bmc/appmgmtcontrol/client.properties index 6674c78d709..5e369501eb6 100644 --- a/bmc-appmgmtcontrol/src/main/resources/com/oracle/bmc/appmgmtcontrol/client.properties +++ b/bmc-appmgmtcontrol/src/main/resources/com/oracle/bmc/appmgmtcontrol/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210330") \ No newline at end of file diff --git a/bmc-artifacts/pom.xml b/bmc-artifacts/pom.xml index d3a3db9f78f..65f63ecc4ae 100644 --- a/bmc-artifacts/pom.xml +++ b/bmc-artifacts/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-artifacts @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-artifacts/src/main/resources/com/oracle/bmc/artifacts/client.properties b/bmc-artifacts/src/main/resources/com/oracle/bmc/artifacts/client.properties index 73df68dc2f1..0ca15ebfe64 100644 --- a/bmc-artifacts/src/main/resources/com/oracle/bmc/artifacts/client.properties +++ b/bmc-artifacts/src/main/resources/com/oracle/bmc/artifacts/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") \ No newline at end of file diff --git a/bmc-audit/pom.xml b/bmc-audit/pom.xml index 499cc8833d2..0ad79b5b38a 100644 --- a/bmc-audit/pom.xml +++ b/bmc-audit/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-audit/src/main/resources/com/oracle/bmc/audit/client.properties b/bmc-audit/src/main/resources/com/oracle/bmc/audit/client.properties index d9027afa5f4..246b22e4611 100644 --- a/bmc-audit/src/main/resources/com/oracle/bmc/audit/client.properties +++ b/bmc-audit/src/main/resources/com/oracle/bmc/audit/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190901") \ No newline at end of file diff --git a/bmc-autoscaling/pom.xml b/bmc-autoscaling/pom.xml index 127f30cae01..cbe9522634f 100644 --- a/bmc-autoscaling/pom.xml +++ b/bmc-autoscaling/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-autoscaling @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-autoscaling/src/main/resources/com/oracle/bmc/autoscaling/client.properties b/bmc-autoscaling/src/main/resources/com/oracle/bmc/autoscaling/client.properties index 65d5d2e04c6..e414a32d4ec 100644 --- a/bmc-autoscaling/src/main/resources/com/oracle/bmc/autoscaling/client.properties +++ b/bmc-autoscaling/src/main/resources/com/oracle/bmc/autoscaling/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181001") \ No newline at end of file diff --git a/bmc-bastion/pom.xml b/bmc-bastion/pom.xml index 207594cdf12..00142a8faee 100644 --- a/bmc-bastion/pom.xml +++ b/bmc-bastion/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-bastion @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-bastion/src/main/resources/com/oracle/bmc/bastion/client.properties b/bmc-bastion/src/main/resources/com/oracle/bmc/bastion/client.properties index 64b9a5def7e..1eb22f68226 100644 --- a/bmc-bastion/src/main/resources/com/oracle/bmc/bastion/client.properties +++ b/bmc-bastion/src/main/resources/com/oracle/bmc/bastion/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210331") \ No newline at end of file diff --git a/bmc-bds/pom.xml b/bmc-bds/pom.xml index 19747ff4ad7..d1dfc052e31 100644 --- a/bmc-bds/pom.xml +++ b/bmc-bds/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-bds @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-bds/src/main/resources/com/oracle/bmc/bds/client.properties b/bmc-bds/src/main/resources/com/oracle/bmc/bds/client.properties index 99ffe45548d..afe5e854cc6 100644 --- a/bmc-bds/src/main/resources/com/oracle/bmc/bds/client.properties +++ b/bmc-bds/src/main/resources/com/oracle/bmc/bds/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190531") \ No newline at end of file diff --git a/bmc-blockchain/pom.xml b/bmc-blockchain/pom.xml index d3b14507437..3882e69fe18 100644 --- a/bmc-blockchain/pom.xml +++ b/bmc-blockchain/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-blockchain @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-blockchain/src/main/resources/com/oracle/bmc/blockchain/client.properties b/bmc-blockchain/src/main/resources/com/oracle/bmc/blockchain/client.properties index 303cf265292..1b8155502fe 100644 --- a/bmc-blockchain/src/main/resources/com/oracle/bmc/blockchain/client.properties +++ b/bmc-blockchain/src/main/resources/com/oracle/bmc/blockchain/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20191010") \ No newline at end of file diff --git a/bmc-bom/pom.xml b/bmc-bom/pom.xml index 2fedd491f3f..10bcfec7287 100644 --- a/bmc-bom/pom.xml +++ b/bmc-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oracle.oci.sdk - 3.54.0 + 3.55.0 oci-java-sdk-bom pom Oracle Cloud Infrastructure SDK - BOM @@ -38,974 +38,974 @@ com.oracle.oci.sdk oci-java-sdk-circuitbreaker - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-common-httpclient - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey3 - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-enforcer-rules - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-shaded-full - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-audit - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-containerengine - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-core - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-database - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-dns - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-email - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-filestorage - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-identity - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-loadbalancer - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-objectstorage - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-addons-apache-configurator-jersey - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-addons-apache-configurator-jersey3 - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-addons-resteasy-client-configurator - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-addons-sasl - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-addons-oke-workload-identity - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-addons-sasl-oke-workload-identity - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-addons-aispeech-realtime - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-resourcesearch - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-addons-apache - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-keymanagement - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-announcementsservice - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-healthchecks - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-waas - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-streaming - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-resourcemanager - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-monitoring - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-ons - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-autoscaling - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-budget - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-workrequests - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-limits - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-functions - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-events - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-dts - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-oce - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-oda - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-analytics - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-integration - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-osmanagement - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-marketplace - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-apigateway - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-datacatalog - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-dataflow - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-datascience - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-nosql - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-secrets - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-vault - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-bds - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-encryption - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-cims - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-datasafe - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-mysql - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-dataintegration - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-ocvp - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-usageapi - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-blockchain - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-loggingingestion - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-logging - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-loganalytics - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-managementdashboard - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-sch - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-loggingsearch - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-managementagent - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-cloudguard - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-opsi - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-computeinstanceagent - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-optimizer - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-tenantmanagercontrolplane - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-rover - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-databasemanagement - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-artifacts - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-apmsynthetics - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-goldengate - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-apmcontrolplane - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-apmtraces - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-networkloadbalancer - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-vulnerabilityscanning - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-databasemigration - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-servicecatalog - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-ailanguage - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-operatoraccesscontrol - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-bastion - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-genericartifactscontent - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-jms - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-devops - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-aianomalydetection - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-datalabelingservice - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-datalabelingservicedataplane - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-apmconfig - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-waf - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-certificates - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-certificatesmanagement - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-usage - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-databasetools - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-servicemanagerproxy - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-appmgmtcontrol - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-ospgateway - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-identitydataplane - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-visualbuilder - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-osubusage - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-osubsubscription - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-osuborganizationsubscription - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-osubbillingschedule - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-dashboardservice - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-threatintelligence - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-aivision - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-aispeech - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-stackmonitoring - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-servicemesh - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-adm - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-licensemanager - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-onesubscription - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-governancerulescontrolplane - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-waa - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-networkfirewall - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-vnmonitoring - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-emwarehouse - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-lockbox - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-fusionapps - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-mediaservices - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-opa - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-opensearch - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-cloudmigrations - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-cloudbridge - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-disasterrecovery - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-containerinstances - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-aidocument - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-queue - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-recovery - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-vbsinst - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-identitydomains - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-accessgovernancecp - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-ocicontrolcenter - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-osmanagementhub - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-fleetsoftwareupdate - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-computecloudatcustomer - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-marketplacepublisher - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-redis - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-jmsjavadownloads - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-psql - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-generativeai - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-generativeaiinference - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-capacitymanagement - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-globallydistributeddatabase - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-desktops - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-emaildataplane - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-clusterplacementgroups - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-marketplaceprivateoffer - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-resourcescheduler - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-demandsignal - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-fleetappsmanagement - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-delegateaccesscontrol - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-generativeaiagent - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-generativeaiagentruntime - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-securityattribute - 3.54.0 + 3.55.0 false com.oracle.oci.sdk oci-java-sdk-zpr - 3.54.0 + 3.55.0 false diff --git a/bmc-budget/pom.xml b/bmc-budget/pom.xml index f604b45dbfd..95c911a32ba 100644 --- a/bmc-budget/pom.xml +++ b/bmc-budget/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-budget @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-budget/src/main/resources/com/oracle/bmc/budget/client.properties b/bmc-budget/src/main/resources/com/oracle/bmc/budget/client.properties index 19e835c2771..f690db42340 100644 --- a/bmc-budget/src/main/resources/com/oracle/bmc/budget/client.properties +++ b/bmc-budget/src/main/resources/com/oracle/bmc/budget/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190111") \ No newline at end of file diff --git a/bmc-capacitymanagement/pom.xml b/bmc-capacitymanagement/pom.xml index 3491d7170d0..e2172b73aaf 100644 --- a/bmc-capacitymanagement/pom.xml +++ b/bmc-capacitymanagement/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-capacitymanagement @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-capacitymanagement/src/main/resources/com/oracle/bmc/capacitymanagement/client.properties b/bmc-capacitymanagement/src/main/resources/com/oracle/bmc/capacitymanagement/client.properties index ffdfe6de247..7ed542aeaf0 100644 --- a/bmc-capacitymanagement/src/main/resources/com/oracle/bmc/capacitymanagement/client.properties +++ b/bmc-capacitymanagement/src/main/resources/com/oracle/bmc/capacitymanagement/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20231107") \ No newline at end of file diff --git a/bmc-certificates/pom.xml b/bmc-certificates/pom.xml index aee8aca022f..67e99c50f16 100644 --- a/bmc-certificates/pom.xml +++ b/bmc-certificates/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-certificates @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-certificates/src/main/resources/com/oracle/bmc/certificates/client.properties b/bmc-certificates/src/main/resources/com/oracle/bmc/certificates/client.properties index 2c0ea4e2047..ba00e5fe453 100644 --- a/bmc-certificates/src/main/resources/com/oracle/bmc/certificates/client.properties +++ b/bmc-certificates/src/main/resources/com/oracle/bmc/certificates/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210224") \ No newline at end of file diff --git a/bmc-certificatesmanagement/pom.xml b/bmc-certificatesmanagement/pom.xml index 9f9286b7b33..af917ecb108 100644 --- a/bmc-certificatesmanagement/pom.xml +++ b/bmc-certificatesmanagement/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-certificatesmanagement @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-certificatesmanagement/src/main/resources/com/oracle/bmc/certificatesmanagement/client.properties b/bmc-certificatesmanagement/src/main/resources/com/oracle/bmc/certificatesmanagement/client.properties index 2c0ea4e2047..ba00e5fe453 100644 --- a/bmc-certificatesmanagement/src/main/resources/com/oracle/bmc/certificatesmanagement/client.properties +++ b/bmc-certificatesmanagement/src/main/resources/com/oracle/bmc/certificatesmanagement/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210224") \ No newline at end of file diff --git a/bmc-cims/pom.xml b/bmc-cims/pom.xml index 6029708f407..9bf010160a6 100644 --- a/bmc-cims/pom.xml +++ b/bmc-cims/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-cims @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-cims/src/main/resources/com/oracle/bmc/cims/client.properties b/bmc-cims/src/main/resources/com/oracle/bmc/cims/client.properties index b471765412e..39d7bcdc635 100644 --- a/bmc-cims/src/main/resources/com/oracle/bmc/cims/client.properties +++ b/bmc-cims/src/main/resources/com/oracle/bmc/cims/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181231") \ No newline at end of file diff --git a/bmc-circuitbreaker/pom.xml b/bmc-circuitbreaker/pom.xml index e606c7d9a6a..d63e018a59c 100644 --- a/bmc-circuitbreaker/pom.xml +++ b/bmc-circuitbreaker/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-circuitbreaker diff --git a/bmc-cloudbridge/pom.xml b/bmc-cloudbridge/pom.xml index f0693cb169a..1354dafec4e 100644 --- a/bmc-cloudbridge/pom.xml +++ b/bmc-cloudbridge/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-cloudbridge @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-cloudbridge/src/main/resources/com/oracle/bmc/cloudbridge/client.properties b/bmc-cloudbridge/src/main/resources/com/oracle/bmc/cloudbridge/client.properties index 10a73548958..d3508c783ee 100644 --- a/bmc-cloudbridge/src/main/resources/com/oracle/bmc/cloudbridge/client.properties +++ b/bmc-cloudbridge/src/main/resources/com/oracle/bmc/cloudbridge/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220509") \ No newline at end of file diff --git a/bmc-cloudguard/pom.xml b/bmc-cloudguard/pom.xml index 878cf1a8286..2b237f65cd1 100644 --- a/bmc-cloudguard/pom.xml +++ b/bmc-cloudguard/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-cloudguard @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-cloudguard/src/main/resources/com/oracle/bmc/cloudguard/client.properties b/bmc-cloudguard/src/main/resources/com/oracle/bmc/cloudguard/client.properties index b34c03426da..141fa02cf82 100644 --- a/bmc-cloudguard/src/main/resources/com/oracle/bmc/cloudguard/client.properties +++ b/bmc-cloudguard/src/main/resources/com/oracle/bmc/cloudguard/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200131") \ No newline at end of file diff --git a/bmc-cloudmigrations/pom.xml b/bmc-cloudmigrations/pom.xml index bd42000c994..00d6bb45429 100644 --- a/bmc-cloudmigrations/pom.xml +++ b/bmc-cloudmigrations/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-cloudmigrations @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-cloudmigrations/src/main/resources/com/oracle/bmc/cloudmigrations/client.properties b/bmc-cloudmigrations/src/main/resources/com/oracle/bmc/cloudmigrations/client.properties index 9171ce4f07a..fb0a8729f58 100644 --- a/bmc-cloudmigrations/src/main/resources/com/oracle/bmc/cloudmigrations/client.properties +++ b/bmc-cloudmigrations/src/main/resources/com/oracle/bmc/cloudmigrations/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220919") \ No newline at end of file diff --git a/bmc-clusterplacementgroups/pom.xml b/bmc-clusterplacementgroups/pom.xml index e3ca45a2121..0031510ff9c 100644 --- a/bmc-clusterplacementgroups/pom.xml +++ b/bmc-clusterplacementgroups/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-clusterplacementgroups @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-clusterplacementgroups/src/main/resources/com/oracle/bmc/clusterplacementgroups/client.properties b/bmc-clusterplacementgroups/src/main/resources/com/oracle/bmc/clusterplacementgroups/client.properties index 0447d7c5238..82792b34625 100644 --- a/bmc-clusterplacementgroups/src/main/resources/com/oracle/bmc/clusterplacementgroups/client.properties +++ b/bmc-clusterplacementgroups/src/main/resources/com/oracle/bmc/clusterplacementgroups/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230801") \ No newline at end of file diff --git a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/pom.xml b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/pom.xml index e1c8d097046..7690fe00e1e 100644 --- a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/pom.xml +++ b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk-common-httpclient-choices - 3.54.0 + 3.55.0 ../pom.xml @@ -68,7 +68,7 @@ com.oracle.oci.sdk oci-java-sdk-addons-apache-configurator-jersey - 3.54.0 + 3.55.0 @@ -77,7 +77,7 @@ com.oracle.oci.sdk oci-java-sdk-common-httpclient - 3.54.0 + 3.55.0 org.glassfish.jersey.core diff --git a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/src/main/java/com/oracle/bmc/http/client/jersey/JerseyHttpClient.java b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/src/main/java/com/oracle/bmc/http/client/jersey/JerseyHttpClient.java index 5fdb49be5eb..cf7b55da5d2 100644 --- a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/src/main/java/com/oracle/bmc/http/client/jersey/JerseyHttpClient.java +++ b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/src/main/java/com/oracle/bmc/http/client/jersey/JerseyHttpClient.java @@ -15,11 +15,12 @@ import javax.ws.rs.client.Client; import javax.ws.rs.client.WebTarget; import java.util.List; +import java.util.function.Supplier; final class JerseyHttpClient implements HttpClient { final List requestInterceptors; - private final WebTarget baseTarget; + private volatile Supplier baseTargetSupplier; final Client client; final boolean isApacheNonBufferingClient; final HttpClientConnectionManager httpClientConnectionManager; @@ -38,8 +39,14 @@ final class JerseyHttpClient implements HttpClient { List requestInterceptors, boolean isApacheNonBufferingClient, HttpClientConnectionManager httpClientConnectionManager) { + if (client == null) { + throw new IllegalArgumentException("Client must be non-null"); + } + if (baseTarget == null) { + throw new IllegalArgumentException("Endpoint must be non-null"); + } this.client = client; - this.baseTarget = baseTarget; + this.baseTargetSupplier = () -> baseTarget; this.requestInterceptors = requestInterceptors; this.isApacheNonBufferingClient = isApacheNonBufferingClient; this.httpClientConnectionManager = httpClientConnectionManager; @@ -47,7 +54,7 @@ final class JerseyHttpClient implements HttpClient { @Override public HttpRequest createRequest(Method method) { - return new JerseyHttpRequest(this, method, baseTarget); + return new JerseyHttpRequest(this, method, this.baseTargetSupplier.get()); } @Override @@ -62,4 +69,31 @@ public void close() { public boolean isProcessingException(Exception e) { return e instanceof ProcessingException; } + + @Override + public synchronized void updateEndpoint(String baseTarget) { + if (!(this.baseTargetSupplier instanceof ThreadLocalWebTargetSupplier)) { + // switch to "each thread has its own endpoint" + this.baseTargetSupplier = new ThreadLocalWebTargetSupplier(this.baseTargetSupplier); + } + ThreadLocalWebTargetSupplier supplier = + (ThreadLocalWebTargetSupplier) this.baseTargetSupplier; + supplier.set(this.client.target(baseTarget)); + } + + static final class ThreadLocalWebTargetSupplier implements Supplier { + private final ThreadLocal threadLocal; + + public ThreadLocalWebTargetSupplier(Supplier initial) { + threadLocal = ThreadLocal.withInitial(initial); + } + + public WebTarget get() { + return threadLocal.get(); + } + + public void set(WebTarget updated) { + threadLocal.set(updated); + } + } } diff --git a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/src/test/java/com/oracle/bmc/http/client/jersey/JerseyHttpClientTest.java b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/src/test/java/com/oracle/bmc/http/client/jersey/JerseyHttpClientTest.java index 8661e3220f2..7462bee0398 100644 --- a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/src/test/java/com/oracle/bmc/http/client/jersey/JerseyHttpClientTest.java +++ b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey/src/test/java/com/oracle/bmc/http/client/jersey/JerseyHttpClientTest.java @@ -5,15 +5,19 @@ package com.oracle.bmc.http.client.jersey; import com.oracle.bmc.http.client.HttpClientBuilder; +import com.oracle.bmc.http.client.Method; import com.oracle.bmc.http.client.internal.ClientThreadFactory; import com.oracle.bmc.http.client.jersey.internal.IdleConnectionMonitor; import org.apache.http.conn.HttpClientConnectionManager; import org.junit.Test; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -35,6 +39,55 @@ public void validateEnabledIdleConnectionMonitorThread() throws InterruptedExcep assertNull(IdleConnectionMonitor.getInstance()); } + @Test + public void threadSafeUpdateEndpoint() throws InterruptedException { + + HttpClientBuilder builder = JerseyHttpProvider.getInstance().newBuilder(); + JerseyHttpClient client = + (JerseyHttpClient) + builder.baseUri("https://objectstorage.us-phoenix-1.oci.customer-oci.com") + .build(); + + final ConcurrentMap endpointMap = new ConcurrentHashMap<>(); + final String epOne = "https://ns1.objectstorage.us-phoenix-1.oci.customer-oci.com"; + final String epTwo = "https://ns2.objectstorage.us-phoenix-1.oci.customer-oci.com"; + Thread t1 = + new Thread( + () -> { + try { + client.updateEndpoint(epOne); + Thread.sleep(30); + JerseyHttpRequest request = + (JerseyHttpRequest) client.createRequest(Method.GET); + String endpoint = request.uri().toString(); + endpointMap.put(1, endpoint); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); + Thread t2 = + new Thread( + () -> { + try { + Thread.sleep(10); + client.updateEndpoint(epTwo); + JerseyHttpRequest request = + (JerseyHttpRequest) client.createRequest(Method.GET); + String endpoint = request.uri().toString(); + endpointMap.put(2, endpoint); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); + t1.start(); + t2.start(); + t1.join(); + t2.join(); + assertEquals(epOne, endpointMap.get(1)); + assertEquals(epTwo, endpointMap.get(2)); + client.close(); + } + @Test public void validateDisabledIdleConnectionMonitorThread() { diff --git a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/pom.xml b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/pom.xml index 2edc25c5e62..916c632795c 100644 --- a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/pom.xml +++ b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk-common-httpclient-choices - 3.54.0 + 3.55.0 ../pom.xml @@ -70,7 +70,7 @@ com.oracle.oci.sdk oci-java-sdk-addons-apache-configurator-jersey3 - 3.54.0 + 3.55.0 @@ -79,7 +79,7 @@ com.oracle.oci.sdk oci-java-sdk-common-httpclient - 3.54.0 + 3.55.0 jakarta.ws.rs diff --git a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/src/main/java/com/oracle/bmc/http/client/jersey3/Jersey3HttpClient.java b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/src/main/java/com/oracle/bmc/http/client/jersey3/Jersey3HttpClient.java index bced02e4e1b..1cd83de1197 100644 --- a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/src/main/java/com/oracle/bmc/http/client/jersey3/Jersey3HttpClient.java +++ b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/src/main/java/com/oracle/bmc/http/client/jersey3/Jersey3HttpClient.java @@ -16,11 +16,12 @@ import org.apache.http.conn.HttpClientConnectionManager; import java.util.List; +import java.util.function.Supplier; final class Jersey3HttpClient implements HttpClient { final List requestInterceptors; - private final WebTarget baseTarget; + private volatile Supplier baseTargetSupplier; final Client client; final boolean isApacheNonBufferingClient; final HttpClientConnectionManager httpClientConnectionManager; @@ -39,8 +40,15 @@ final class Jersey3HttpClient implements HttpClient { List requestInterceptors, boolean isApacheNonBufferingClient, HttpClientConnectionManager httpClientConnectionManager) { + if (client == null) { + throw new IllegalArgumentException("Client must be non-null"); + } + if (baseTarget == null) { + throw new IllegalArgumentException("Endpoint must be non-null"); + } this.client = client; - this.baseTarget = baseTarget; + // start out with one endpoint for all threads + this.baseTargetSupplier = () -> baseTarget; this.requestInterceptors = requestInterceptors; this.isApacheNonBufferingClient = isApacheNonBufferingClient; this.httpClientConnectionManager = httpClientConnectionManager; @@ -48,7 +56,7 @@ final class Jersey3HttpClient implements HttpClient { @Override public HttpRequest createRequest(Method method) { - return new Jersey3HttpRequest(this, method, baseTarget); + return new Jersey3HttpRequest(this, method, this.baseTargetSupplier.get()); } @Override @@ -63,4 +71,31 @@ public void close() { public boolean isProcessingException(Exception e) { return e instanceof ProcessingException; } + + @Override + public synchronized void updateEndpoint(String baseTarget) { + if (!(this.baseTargetSupplier instanceof ThreadLocalWebTargetSupplier)) { + // switch to each thread has its own endpoint, so they can be updated safely + this.baseTargetSupplier = new ThreadLocalWebTargetSupplier(this.baseTargetSupplier); + } + ThreadLocalWebTargetSupplier supplier = + (ThreadLocalWebTargetSupplier) this.baseTargetSupplier; + supplier.set(this.client.target(baseTarget)); + } + + static final class ThreadLocalWebTargetSupplier implements Supplier { + private final ThreadLocal threadLocal; + + public ThreadLocalWebTargetSupplier(Supplier initial) { + threadLocal = ThreadLocal.withInitial(initial); + } + + public WebTarget get() { + return threadLocal.get(); + } + + public void set(WebTarget updated) { + threadLocal.set(updated); + } + } } diff --git a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/src/test/java/com/oracle/bmc/http/client/jersey3/Jersey3HttpClientTest.java b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/src/test/java/com/oracle/bmc/http/client/jersey3/Jersey3HttpClientTest.java index 0ee773b3992..b6815f5fd9a 100644 --- a/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/src/test/java/com/oracle/bmc/http/client/jersey3/Jersey3HttpClientTest.java +++ b/bmc-common-httpclient-choices/bmc-common-httpclient-jersey3/src/test/java/com/oracle/bmc/http/client/jersey3/Jersey3HttpClientTest.java @@ -5,15 +5,19 @@ package com.oracle.bmc.http.client.jersey3; import com.oracle.bmc.http.client.HttpClientBuilder; +import com.oracle.bmc.http.client.Method; import com.oracle.bmc.http.client.internal.ClientThreadFactory; import com.oracle.bmc.http.client.jersey3.internal.IdleConnectionMonitor; import org.apache.http.conn.HttpClientConnectionManager; import org.junit.Test; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -35,6 +39,55 @@ public void validateEnabledIdleConnectionMonitorThread() throws InterruptedExcep assertNull(IdleConnectionMonitor.getInstance()); } + @Test + public void threadSafeUpdateEndpoint() throws InterruptedException { + + HttpClientBuilder builder = Jersey3HttpProvider.getInstance().newBuilder(); + Jersey3HttpClient client = + (Jersey3HttpClient) + builder.baseUri("https://objectstorage.us-phoenix-1.oci.customer-oci.com") + .build(); + + final ConcurrentMap endpointMap = new ConcurrentHashMap<>(); + final String epOne = "https://ns1.objectstorage.us-phoenix-1.oci.customer-oci.com"; + final String epTwo = "https://ns2.objectstorage.us-phoenix-1.oci.customer-oci.com"; + Thread t1 = + new Thread( + () -> { + try { + client.updateEndpoint(epOne); + Thread.sleep(30); + Jersey3HttpRequest request = + (Jersey3HttpRequest) client.createRequest(Method.GET); + String endpoint = request.uri().toString(); + endpointMap.put(1, endpoint); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); + Thread t2 = + new Thread( + () -> { + try { + Thread.sleep(10); + client.updateEndpoint(epTwo); + Jersey3HttpRequest request = + (Jersey3HttpRequest) client.createRequest(Method.GET); + String endpoint = request.uri().toString(); + endpointMap.put(2, endpoint); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }); + t1.start(); + t2.start(); + t1.join(); + t2.join(); + assertEquals(epOne, endpointMap.get(1)); + assertEquals(epTwo, endpointMap.get(2)); + client.close(); + } + @Test public void validateDisabledIdleConnectionMonitorThread() { diff --git a/bmc-common-httpclient-choices/pom.xml b/bmc-common-httpclient-choices/pom.xml index cecc72970e8..93c11243cf3 100644 --- a/bmc-common-httpclient-choices/pom.xml +++ b/bmc-common-httpclient-choices/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml diff --git a/bmc-common-httpclient/pom.xml b/bmc-common-httpclient/pom.xml index 9878da13f68..a10c4910c30 100644 --- a/bmc-common-httpclient/pom.xml +++ b/bmc-common-httpclient/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml diff --git a/bmc-common-httpclient/src/main/java/com/oracle/bmc/http/client/HttpClient.java b/bmc-common-httpclient/src/main/java/com/oracle/bmc/http/client/HttpClient.java index d32bb508bae..172b2b9c23b 100644 --- a/bmc-common-httpclient/src/main/java/com/oracle/bmc/http/client/HttpClient.java +++ b/bmc-common-httpclient/src/main/java/com/oracle/bmc/http/client/HttpClient.java @@ -14,4 +14,12 @@ public interface HttpClient extends Closeable { /** Check whether the given exception is a "processing exception", e.g. a json parse failure. */ boolean isProcessingException(Exception e); + + /** + * Updates the endpoint URL used by this HTTP client instance. + * + * @param baseTarget A string representing the new base target URL for all subsequent requests + * made through this client. + */ + void updateEndpoint(String baseTarget); } diff --git a/bmc-common/pom.xml b/bmc-common/pom.xml index 50b3d4fcf77..0779e27fb9b 100644 --- a/bmc-common/pom.xml +++ b/bmc-common/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -12,6 +12,9 @@ Oracle Cloud Infrastructure SDK - Common This project contains the common runtime components of the SDK used for Oracle Cloud Infrastructure https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm + + 9.4.56.v20240826 + @@ -59,12 +62,12 @@ com.oracle.oci.sdk oci-java-sdk-circuitbreaker - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-common-httpclient - 3.54.0 + 3.55.0 @@ -73,10 +76,43 @@ 2.23.2 test + + + + net.minidev + json-smart + 2.5.1 + test + + + org.eclipse.jetty + jetty-server + ${jetty.version} + test + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + test + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + test + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + test + + com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 test diff --git a/bmc-common/src/main/java/com/oracle/bmc/Region.java b/bmc-common/src/main/java/com/oracle/bmc/Region.java index 78bbdc182f7..4a074113ab9 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/Region.java +++ b/bmc-common/src/main/java/com/oracle/bmc/Region.java @@ -47,6 +47,7 @@ import static com.oracle.bmc.auth.AbstractFederationClientAuthenticationDetailsProviderBuilder.AUTHORIZATION_HEADER_VALUE; import static com.oracle.bmc.auth.AbstractFederationClientAuthenticationDetailsProviderBuilder.METADATA_SERVICE_BASE_URL; +import static com.oracle.bmc.auth.AbstractFederationClientAuthenticationDetailsProviderBuilder.METADATA_URL_OVERRIDE; import static com.oracle.bmc.http.internal.HeaderUtils.AUTHORIZATION_HEADER_NAME; import static com.oracle.bmc.http.internal.HeaderUtils.MEDIA_TYPE_APPLICATION_JSON; @@ -935,7 +936,7 @@ public static boolean registerFromInstanceMetadataService() { } enableInstanceMetadataService(); - Region result = getRegionFromImds(METADATA_SERVICE_BASE_URL); + Region result = getRegionFromImds(getMetadataBaseUrl()); if (result != null) { regionFromImds = result; } @@ -949,6 +950,20 @@ public static boolean registerFromInstanceMetadataService() { return hasReceivedInstanceMetadataServiceResponse; } + private static String getMetadataBaseUrl() { + if (!StringUtils.isBlank(METADATA_URL_OVERRIDE)) { + LOG.info( + "Environment Variable OCI_METADATA_BASE_URL is present. Overriding default base url to: {}", + METADATA_URL_OVERRIDE); + return METADATA_URL_OVERRIDE; + } else { + LOG.info( + "Environment Variable OCI_METADATA_BASE_URL is not present. Using default base url: {}", + METADATA_SERVICE_BASE_URL); + return METADATA_SERVICE_BASE_URL; + } + } + /** * If Alloy config exists, read the config and check if service is enabled. If Alloy config * doesn't exist, return true. diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/AbstractFederationClientAuthenticationDetailsProviderBuilder.java b/bmc-common/src/main/java/com/oracle/bmc/auth/AbstractFederationClientAuthenticationDetailsProviderBuilder.java index 151528e9428..702c68b5ee7 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/AbstractFederationClientAuthenticationDetailsProviderBuilder.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/AbstractFederationClientAuthenticationDetailsProviderBuilder.java @@ -19,6 +19,7 @@ import com.oracle.bmc.http.client.StandardClientProperties; import com.oracle.bmc.http.internal.SyncFutureWaiter; import com.oracle.bmc.util.CircuitBreakerUtils; +import com.oracle.bmc.util.internal.StringUtils; import com.oracle.bmc.waiter.ExponentialBackoffDelayStrategyWithJitter; import com.oracle.bmc.waiter.WaiterConfiguration; import org.slf4j.Logger; @@ -65,8 +66,11 @@ public abstract class AbstractFederationClientAuthenticationDetailsProviderBuild /** Default base url of metadata service. */ public static final String METADATA_SERVICE_BASE_URL = "http://169.254.169.254/opc/v2/"; - /** fallback base url of metadata service. */ - protected static final String FALLBACK_METADATA_SERVICE_URL = "http://169.254.169.254/opc/v1/"; + /** Environment variable used to overwrite the default metadata base url. */ + public static final String METADATA_BASE_URL_ENV_VAR = "OCI_METADATA_BASE_URL"; + + /** Metadata URL from environment variable, to use if present. */ + public static final String METADATA_URL_OVERRIDE = System.getenv(METADATA_BASE_URL_ENV_VAR); /** The Authorization header value to be sent for requests to the metadata service. */ public static final String AUTHORIZATION_HEADER_VALUE = "Bearer Oracle"; @@ -89,8 +93,8 @@ public abstract class AbstractFederationClientAuthenticationDetailsProviderBuild /** The custom timeout for each retry for auto-detecting endpoint. */ protected int timeoutForEachRetry = 0; - /** Flag to ensure fallback logic executed only once. */ - private volatile boolean wasFallbackCheckExecuted = false; + /** Flag to ensure V2 endpoint is only checked once, if successful. */ + private volatile boolean wasImdsV2CheckExecuted = false; /** The leaf certificate, or null if detecting from instance metadata. */ protected X509CertificateSupplier leafCertificateSupplier; @@ -264,7 +268,7 @@ protected void autoDetectUsingMetadataUrl() { protected String autoDetectEndpointUsingMetadataUrl() { if (federationEndpoint == null) { - executeInstanceFallback(); + executeImdsV2EndpointCheck(); String regionStr = fetchRegion(resp -> resp.textBody()); LOG.info("Looking up region for {}", regionStr); @@ -299,11 +303,11 @@ protected String autoDetectEndpointUsingMetadataUrl() { protected void autoDetectCertificatesUsingMetadataUrl() { try { - if (!wasFallbackCheckExecuted) { + if (!wasImdsV2CheckExecuted) { LOG.info( - " Executing fallback check for certificates as federation endpoint was already set to {}", + "Executing V2 endpoint check for certificates as federation endpoint was already set to {}", getFederationEndpoint()); - executeInstanceFallback(); + executeImdsV2EndpointCheck(); } if (leafCertificateSupplier == null) { @@ -349,7 +353,7 @@ private R fetchRegion(Function> responseHan .build()) { ExponentialBackoffDelayStrategyWithJitter strategy = - new ExponentialBackoffDelayStrategyWithJitter(TimeUnit.SECONDS.toMillis(100)); + new ExponentialBackoffDelayStrategyWithJitter(TimeUnit.SECONDS.toMillis(30)); WaiterConfiguration.WaitContext context = new WaiterConfiguration.WaitContext(System.currentTimeMillis()); @@ -410,29 +414,27 @@ private R fetchRegion(Function> responseHan } /** - * Checks and falls back to V1 endpoint for both federation endpoint detection & certificates if - * necessary. + * Checks the V2 endpoint for both federation endpoint detection & certificates if necessary. */ - private void executeInstanceFallback() { + private void executeImdsV2EndpointCheck() { try { // don't care about the body, just get me the status! int status = fetchRegion(resp -> CompletableFuture.completedFuture(resp.status())); - LOG.info("Rest call to verify if v2 endpoint exists, response from v2 was {}", status); + LOG.info( + "REST request to verify if IMDS v2 endpoint exists, response from v2 was {}", + status); // fallback to v1 if v2 endpoint throws resource not found else raise exception - if (status == 404) { - LOG.warn("Falling back to v1, response from v2 was {}", status); - this.metadataBaseUrl = FALLBACK_METADATA_SERVICE_URL; - } else if (status >= 300) { + if (status >= 300) { throw new RuntimeException( - "Rest call to v2 endpoint failed : HTTP error code : " + status); + "REST request to IMDS v2 endpoint failed : HTTP error code : " + status); } - wasFallbackCheckExecuted = true; - LOG.info( - " Metadata base url on executing instance fallback is {}", - getMetadataBaseUrl()); + wasImdsV2CheckExecuted = true; + LOG.info("Metadata base url {}", getMetadataBaseUrl()); } catch (RuntimeException e) { - LOG.warn("Rest call to v2 endpoint failed & cannot fallback as it's not 404 ", e); + LOG.warn( + "REST request to IMDS v2 endpoint failed with unexpected Runtime exception ", + e); } } @@ -461,7 +463,17 @@ private URLBasedX509CertificateSupplier.ResourceDetails getMetadataResourceDetai protected abstract P buildProvider(SessionKeySupplier sessionKeySupplierToUse); public String getMetadataBaseUrl() { - return this.metadataBaseUrl; + if (!StringUtils.isBlank(METADATA_URL_OVERRIDE)) { + LOG.info( + "Environment Variable OCI_METADATA_BASE_URL is present. Overriding default base url to: {}", + METADATA_URL_OVERRIDE); + return METADATA_URL_OVERRIDE; + } else { + LOG.info( + "Environment Variable OCI_METADATA_BASE_URL is not present. Using url: {}", + this.metadataBaseUrl); + return this.metadataBaseUrl; + } } public String getFederationEndpoint() { diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/SessionTokenAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/SessionTokenAuthenticationDetailsProvider.java index c57ab99d6cc..049067d150a 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/SessionTokenAuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/SessionTokenAuthenticationDetailsProvider.java @@ -37,6 +37,7 @@ * Implementation of {@link AuthenticationDetailsProvider} that uses a session token for * authentication. */ +@AuthCachingPolicy(cacheKeyId = false, cachePrivateKey = false) public class SessionTokenAuthenticationDetailsProvider implements AuthenticationDetailsProvider, RegionProvider, @@ -274,6 +275,9 @@ public String refresh() { if (this.sessionToken.equals(oldSessionToken)) { LOG.warn( "A session token refresh was attempted but it did not change. The token file has not been updated!"); + } else { + LOG.info( + "A session token refresh was attempted and the token was successfully changed. The token file has been updated!"); } } catch (IOException e) { LOG.warn("Unable to refresh session token.", e); diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/BaseClient.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/BaseClient.java index f0a3fffcf62..85c0fa4c20f 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/BaseClient.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/BaseClient.java @@ -33,6 +33,7 @@ import com.oracle.bmc.internal.EndpointBuilder; import com.oracle.bmc.requests.BmcRequest; import com.oracle.bmc.responses.BmcResponse; +import com.oracle.bmc.util.internal.Validate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -358,36 +359,9 @@ private List parseEndpointForParams(String endpointTemplate) { * @param endpoint The updated endpoint to use */ public final synchronized void updateBaseEndpoint(String endpoint) { + Validate.notBlank(endpoint, "Cannot update the endpoint since it is null or blank."); logger.info("Updating endpoint to {}", endpoint); - - HttpClientBuilder builder = - httpProvider - .newBuilder() - .baseUri(endpoint) - .property( - StandardClientProperties.CONNECT_TIMEOUT, - Duration.ofMillis( - clientConfigurationToUse.getConnectionTimeoutMillis())) - .property( - StandardClientProperties.READ_TIMEOUT, - Duration.ofMillis(clientConfigurationToUse.getReadTimeoutMillis())) - .property( - StandardClientProperties.ASYNC_POOL_SIZE, - clientConfigurationToUse.getMaxAsyncThreads()) - .registerRequestInterceptor( - Priorities.AUTHENTICATION, - new AuthnClientFilter(defaultRequestSigner, requestSigners)) - .registerRequestInterceptor(Priorities.HEADER_DECORATOR, CLIENT_ID_FILTER) - .registerRequestInterceptor(Priorities.USER, LOG_HEADERS_FILTER); - clientConfigurator.customizeClient(builder); - HttpClient oldClient = this.httpClient; - if (oldClient != null) { - oldClient.close(); - } - this.httpClient = builder.build(); - - circuitBreaker = - CircuitBreakerHelper.makeCircuitBreaker(httpClient, circuitBreakerConfiguration); + this.httpClient.updateEndpoint(endpoint); } public final synchronized void setEndpoint(String endpoint) { diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ClientCall.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ClientCall.java index feca2896519..683b85330c7 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ClientCall.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ClientCall.java @@ -33,6 +33,7 @@ import com.oracle.bmc.waiter.TerminationStrategy; import com.oracle.bmc.waiter.WaiterScheduler; import jakarta.annotation.Nullable; +import com.oracle.bmc.model.SdkRuntimeException; import org.slf4j.Logger; import java.io.IOException; @@ -107,6 +108,11 @@ public final class ClientCall< private boolean firstAttempt = true; private BiConsumer responseEventStreamHandler; + // Unless overridden, throw BmcException when receive a response error. + @SuppressWarnings("rawtypes") + private ResponseErrorRuntimeExceptionFactory responseErrorExceptionFactory = + ResponseErrorBmcExceptionFactory.INSTANCE; + private ClientCall(HttpClient httpClient) { this.httpClient = httpClient; } @@ -648,6 +654,13 @@ public ClientCall handleResponseHeadersMap( return this; } + @SuppressWarnings("rawtypes") + public ClientCall responseErrorExceptionFactory( + ResponseErrorRuntimeExceptionFactory responseErrorExceptionFactory) { + this.responseErrorExceptionFactory = responseErrorExceptionFactory; + return this; + } + private CompletionStage transformResponse(HttpResponse rawResponse) { CompletionStage failure = checkError(rawResponse); if (failure != null) { @@ -786,7 +799,7 @@ private CompletionStage checkError(HttpResponse response) { responseBody, s -> failedFuture( - new BmcException( + responseErrorExceptionFactory.createRuntimeException( status, "Unknown", String.format( @@ -796,7 +809,7 @@ private CompletionStage checkError(HttpResponse response) { buildServiceDetails()))); } - return response.body(ResponseHelper.ErrorCodeAndMessage.class) + return response.body(this.responseErrorExceptionFactory.getResponseErrorModelType()) .handle( (ecm, t) -> { if (t != null) { @@ -811,13 +824,14 @@ private CompletionStage checkError(HttpResponse response) { msgFuture, msg -> ClientCall.failedFuture( - new BmcException( - status, - "Unknown", - msg, - opcRequestId, - t, - buildServiceDetails()))); + responseErrorExceptionFactory + .createRuntimeException( + status, + "Unknown", + msg, + opcRequestId, + (Throwable) t, + buildServiceDetails()))); } else { if (ecm == null) { String defaultMessage = @@ -825,7 +839,7 @@ private CompletionStage checkError(HttpResponse response) { status, "Detailed exception information not available"); return ClientCall.failedFuture( - new BmcException( + responseErrorExceptionFactory.createRuntimeException( status, "Unknown", defaultMessage, @@ -833,15 +847,11 @@ private CompletionStage checkError(HttpResponse response) { buildServiceDetails())); } else { return ClientCall.failedFuture( - new BmcException( + responseErrorExceptionFactory.createRuntimeException( status, - ecm.getCode(), - ecm.getMessage(), opcRequestId, - buildServiceDetails(), - ecm.getOriginalMessage(), - ecm.getOriginalMessageTemplate(), - ecm.getMessageArguments())); + ecm, + buildServiceDetails())); } } }) @@ -1123,7 +1133,7 @@ public RESP callSync() { try { return futureWaiter.listenForResult(callAsync0(null)); - } catch (BmcException e) { + } catch (SdkRuntimeException e) { throw e; } catch (Throwable e) { throw BmcException.createClientSide("Unknown error", e, null, buildServiceDetails()); diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseErrorBmcExceptionFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseErrorBmcExceptionFactory.java new file mode 100644 index 00000000000..22e743cf98f --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseErrorBmcExceptionFactory.java @@ -0,0 +1,72 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.http.internal; + +import com.oracle.bmc.ServiceDetails; +import com.oracle.bmc.http.internal.ResponseHelper.ErrorCodeAndMessage; +import com.oracle.bmc.model.BmcException; + +/** + * Default {@link ResponseErrorRuntimeExceptionFactory} implementation that knows how to deserialize + * error responses using the {@link ResponseHelper.ErrorCodeAndMessage} model. When an error + * response is received and deserialized, a {@link BmcException} is thrown, allowing access to the + * error object. + */ +public enum ResponseErrorBmcExceptionFactory + implements + ResponseErrorRuntimeExceptionFactory< + ResponseHelper.ErrorCodeAndMessage, BmcException> { + + /** The single stateless ResponseErrorBmcExceptionFactory instance. */ + INSTANCE; + + /** + * @return This implementation returns the {@link ResponseHelper.ErrorCodeAndMessage} class + * object. + */ + @Override + public Class getResponseErrorModelType() { + return ResponseHelper.ErrorCodeAndMessage.class; + } + + @Override + public BmcException createRuntimeException( + int statusCode, + String opcRequestId, + ErrorCodeAndMessage errorResponse, + ServiceDetails serviceDetails) { + return new BmcException( + statusCode, + errorResponse.getCode(), + errorResponse.getMessage(), + opcRequestId, + serviceDetails, + errorResponse.getOriginalMessage(), + errorResponse.getOriginalMessageTemplate(), + errorResponse.getMessageArguments()); + } + + @Override + public BmcException createRuntimeException( + int statusCode, + String serviceCode, + String message, + String opcRequestId, + ServiceDetails serviceDetails) { + return new BmcException(statusCode, serviceCode, message, opcRequestId, serviceDetails); + } + + @Override + public BmcException createRuntimeException( + int statusCode, + String serviceCode, + String message, + String opcRequestId, + Throwable cause, + ServiceDetails serviceDetails) { + return new BmcException( + statusCode, serviceCode, message, opcRequestId, cause, serviceDetails); + } +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseErrorRuntimeExceptionFactory.java b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseErrorRuntimeExceptionFactory.java new file mode 100644 index 00000000000..1cf827603db --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/http/internal/ResponseErrorRuntimeExceptionFactory.java @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.http.internal; + +import com.oracle.bmc.ServiceDetails; +import com.oracle.bmc.model.SdkRuntimeException; + +/** + * Factory interface that defines the model type of a response error (used for deserializing a + * response error), as well as how to create a SdkRuntimeException that allows access + * to that deserialized error. + * + *

This factory allows client code to inject their own error handling code, complete with their + * own error model and SdkRuntimeException implementation to pass on that information + * in the deserialized response. + * + * @param The model type that represents the model in the response error. + * @param A {@link SdkRuntimeException} to be created by the "create exception" methods. + */ +public interface ResponseErrorRuntimeExceptionFactory { + + /** + * @return a Class that represents the type of model in the response error, which can be used to + * deserialize the response content. + */ + public Class getResponseErrorModelType(); + + public E createRuntimeException( + int statusCode, + String opcRequestId, + ERRMODEL errorResponse, + ServiceDetails serviceDetails); + + public E createRuntimeException( + int statusCode, + String serviceCode, + String message, + String opcRequestId, + ServiceDetails serviceDetails); + + public E createRuntimeException( + int statusCode, + String serviceCode, + String message, + String opcRequestId, + Throwable cause, + ServiceDetails serviceDetails); +} diff --git a/bmc-common/src/main/java/com/oracle/bmc/model/BmcException.java b/bmc-common/src/main/java/com/oracle/bmc/model/BmcException.java index a522993e54c..f260ab80811 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/model/BmcException.java +++ b/bmc-common/src/main/java/com/oracle/bmc/model/BmcException.java @@ -12,7 +12,7 @@ import java.util.Date; import java.util.Map; -public class BmcException extends RuntimeException { +public class BmcException extends SdkRuntimeException { /** Name of the header that contains the request id. */ public static final String OPC_REQUEST_ID_HEADER = "opc-request-id"; diff --git a/bmc-common/src/main/java/com/oracle/bmc/model/SdkRuntimeException.java b/bmc-common/src/main/java/com/oracle/bmc/model/SdkRuntimeException.java new file mode 100644 index 00000000000..8f9b36a26f4 --- /dev/null +++ b/bmc-common/src/main/java/com/oracle/bmc/model/SdkRuntimeException.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.model; + +/** + * Parent class of {@link BmcException}, as well as any {@link RuntimeException} that is defined for + * use by the {@link ResponseErrorRuntimeExceptionFactory} injected into {@link ClientCall}. + */ +public class SdkRuntimeException extends RuntimeException { + + public SdkRuntimeException() { + super(); + } + + public SdkRuntimeException( + String message, + Throwable cause, + boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + public SdkRuntimeException(String message, Throwable cause) { + super(message, cause); + } + + public SdkRuntimeException(String message) { + super(message); + } + + public SdkRuntimeException(Throwable cause) { + super(cause); + } +} diff --git a/bmc-common/src/main/resources/com/oracle/bmc/sdk.properties b/bmc-common/src/main/resources/com/oracle/bmc/sdk.properties index 4337a2c82ca..249960f5a28 100644 --- a/bmc-common/src/main/resources/com/oracle/bmc/sdk.properties +++ b/bmc-common/src/main/resources/com/oracle/bmc/sdk.properties @@ -7,5 +7,5 @@ sdk.version = ${pom.version} # Clients generated using a codegen version between the minimum and maximum # expressed below are compatible with the version of oci-java-sdk-common in this module. -java.minimum.client.codegen.version = 2.100 +java.minimum.client.codegen.version = 2.113 java.maximum.client.codegen.version = ${oci.codegen.version} diff --git a/bmc-common/src/test/java/com/oracle/bmc/auth/SessionTokenAuthTest.java b/bmc-common/src/test/java/com/oracle/bmc/auth/SessionTokenAuthTest.java index 3f9ea918031..8893db1307c 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/auth/SessionTokenAuthTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/auth/SessionTokenAuthTest.java @@ -8,12 +8,15 @@ import org.junit.Test; -import java.io.File; import java.io.FileNotFoundException; import java.io.FileWriter; import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class SessionTokenAuthTest { final String CONFIG_FILE_PATH = "src/test/resources/unit_test_session_token_config"; @@ -23,6 +26,7 @@ public class SessionTokenAuthTest { final String TOKEN_EXISTS_PROFILE = "TOKENEXISTS"; final String SESSION_TOKEN = "thisisasessiontoken"; final String NEW_SESSION_TOKEN = "this is a new session token!"; + final String AUTHORIZATION_HEADER_KEY = "authorization"; @Test(expected = NullPointerException.class) public void testSessionTokenNoPathProvided() throws IOException { @@ -65,6 +69,44 @@ public void testSessionTokenRefresh() throws IOException { assertEquals(provider.getKeyId(), "ST$" + NEW_SESSION_TOKEN); } + @Test + public void testSessionTokenRefreshPropogatesToSigner() throws IOException { + com.oracle.bmc.Service testService = + com.oracle.bmc.Services.serviceBuilder() + .serviceName("SessionAuthTestService") + .serviceEndpointTemplate("https://test-service.test") + .build(); + final ConfigFileReader.ConfigFile configFile = + ConfigFileReader.parse(CONFIG_FILE_PATH, TOKEN_EXISTS_PROFILE); + writeToSessionTokenFile(SESSION_TOKEN); + final SessionTokenAuthenticationDetailsProvider provider = + new SessionTokenAuthenticationDetailsProvider(configFile); + final com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory signerFactory = + new com.oracle.bmc.http.signing.internal.DefaultRequestSignerFactory( + com.oracle.bmc.http.signing.SigningStrategy.STANDARD); + final com.oracle.bmc.http.signing.RequestSigner requestSignerImpl = + signerFactory.createRequestSigner(testService, provider); + final Map headers = + requestSignerImpl.signRequest( + java.net.URI.create(testService.getServiceEndpointTemplate()), + javax.ws.rs.HttpMethod.GET, + new HashMap>(), + null); + // Check if the authorization header contains the old token + assertTrue(headers.get(AUTHORIZATION_HEADER_KEY).contains(SESSION_TOKEN)); + + writeToSessionTokenFile(NEW_SESSION_TOKEN); + assertEquals(provider.refresh(), NEW_SESSION_TOKEN); + final Map newHeaders = + requestSignerImpl.signRequest( + java.net.URI.create(testService.getServiceEndpointTemplate()), + javax.ws.rs.HttpMethod.GET, + new HashMap>(), + null); + // Check if the authorization header contains the new token + assertTrue(newHeaders.get(AUTHORIZATION_HEADER_KEY).contains(NEW_SESSION_TOKEN)); + } + private void writeToSessionTokenFile(String token) throws IOException { // Write to & close file. FileWriter writer = new FileWriter(TOKEN_FILE_PATH); diff --git a/bmc-common/src/test/java/com/oracle/bmc/http/internal/BaseClientTest.java b/bmc-common/src/test/java/com/oracle/bmc/http/internal/BaseClientTest.java index 40ee426c9c2..4d7603248b3 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/http/internal/BaseClientTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/http/internal/BaseClientTest.java @@ -4,67 +4,43 @@ */ package com.oracle.bmc.http.internal; -import com.oracle.bmc.auth.AbstractAuthenticationDetailsProvider; import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider; -import com.oracle.bmc.auth.InstancePrincipalsAuthenticationDetailsProvider; -import com.oracle.bmc.auth.ResourcePrincipalAuthenticationDetailsProvider; import com.oracle.bmc.common.InternalBuilderAccess; -import com.oracle.bmc.http.client.HttpClient; import com.oracle.bmc.http.client.HttpProvider; -import com.oracle.bmc.http.client.HttpRequest; -import com.oracle.bmc.http.client.HttpResponse; -import com.oracle.bmc.http.client.Method; import com.oracle.bmc.http.signing.RequestSigner; import com.oracle.bmc.http.signing.RequestSignerFactory; import com.oracle.bmc.http.signing.SigningStrategy; -import com.oracle.bmc.model.BmcException; import com.oracle.bmc.util.CircuitBreakerUtils; -import com.oracle.bmc.util.internal.Validate; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import org.slf4j.Logger; -import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.Objects; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.function.Supplier; -import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.mockito.Matchers.any; -import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(PowerMockRunner.class) @PrepareForTest({HttpProvider.class, InternalBuilderAccess.class}) public class BaseClientTest { - @Test - public void testCloseWithoutEndpoint() { + + private BasicAuthenticationDetailsProvider mockAuthProvider; + + @Before + public void setup() { HttpProvider mockHttpProvider = mock(HttpProvider.class); PowerMockito.mockStatic(HttpProvider.class); PowerMockito.when(HttpProvider.getDefault()).thenReturn(mockHttpProvider); - BasicAuthenticationDetailsProvider mockAuthProvider = - mock(BasicAuthenticationDetailsProvider.class); + mockAuthProvider = mock(BasicAuthenticationDetailsProvider.class); RequestSigner mockRequestSigner = mock(RequestSigner.class); @@ -81,11 +57,36 @@ public void testCloseWithoutEndpoint() { } PowerMockito.when(InternalBuilderAccess.getSigningStrategyRequestSignerFactories(any())) .thenReturn(factories); + } + @Test + public void testCloseWithoutEndpoint() { TestBaseClient client = TestBaseClient.builder().build(mockAuthProvider); client.close(); } + @Test + public void testEmptyUpdateBaseEndpoint() { + try { + TestBaseClient client = TestBaseClient.builder().build(mockAuthProvider); + client.updateBaseEndpoint(""); + } catch (Exception e) { + assertTrue(e instanceof IllegalArgumentException); + assertEquals("Cannot update the endpoint since it is null or blank.", e.getMessage()); + } + } + + @Test + public void testNullUpdateBaseEndpoint() { + try { + TestBaseClient client = TestBaseClient.builder().build(mockAuthProvider); + client.updateBaseEndpoint(null); + } catch (Exception e) { + assertTrue(e instanceof NullPointerException); + assertEquals("Cannot update the endpoint since it is null or blank.", e.getMessage()); + } + } + private static class TestBaseClient extends BaseClient { /** Service instance for ObjectStorage. */ public static final com.oracle.bmc.Service SERVICE = diff --git a/bmc-common/src/test/java/com/oracle/bmc/http/internal/ClientCallTest.java b/bmc-common/src/test/java/com/oracle/bmc/http/internal/ClientCallTest.java index 272686b9af1..951fa59e110 100644 --- a/bmc-common/src/test/java/com/oracle/bmc/http/internal/ClientCallTest.java +++ b/bmc-common/src/test/java/com/oracle/bmc/http/internal/ClientCallTest.java @@ -4,6 +4,7 @@ */ package com.oracle.bmc.http.internal; +import com.oracle.bmc.ServiceDetails; import com.oracle.bmc.circuitbreaker.CircuitBreakerConfiguration; import com.oracle.bmc.circuitbreaker.internal.resilience4j.OciCircuitBreakerImpl; import com.oracle.bmc.http.client.HttpClient; @@ -11,7 +12,10 @@ import com.oracle.bmc.http.client.HttpResponse; import com.oracle.bmc.http.client.Method; import com.oracle.bmc.http.client.Serializer; +import com.oracle.bmc.http.internal.ClientCallTest.TestErrorModel; +import com.oracle.bmc.http.internal.ClientCallTest.TestRuntimeSdkException; import com.oracle.bmc.model.BmcException; +import com.oracle.bmc.model.SdkRuntimeException; import com.oracle.bmc.retrier.RetryConfiguration; import com.oracle.bmc.waiter.MaxAttemptsTerminationStrategy; @@ -36,6 +40,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -375,6 +380,98 @@ public int hashCode() { } } + public static class TestResponseErrorRuntimeExceptionFactory + implements ResponseErrorRuntimeExceptionFactory< + TestErrorModel, TestRuntimeSdkException> { + + @Override + public Class getResponseErrorModelType() { + return TestErrorModel.class; + } + + @Override + public TestRuntimeSdkException createRuntimeException( + int statusCode, + String opcRequestId, + TestErrorModel errorResponse, + ServiceDetails serviceDetails) { + return new TestRuntimeSdkException( + statusCode, opcRequestId, serviceDetails, errorResponse); + } + + @Override + public TestRuntimeSdkException createRuntimeException( + int statusCode, + String serviceCode, + String message, + String opcRequestId, + ServiceDetails serviceDetails) { + return new TestRuntimeSdkException( + statusCode, opcRequestId, serviceDetails, serviceCode, message); + } + + @Override + public TestRuntimeSdkException createRuntimeException( + int statusCode, + String serviceCode, + String message, + String opcRequestId, + Throwable cause, + ServiceDetails serviceDetails) { + return new TestRuntimeSdkException( + statusCode, opcRequestId, serviceDetails, serviceCode, message, cause); + } + } + + public static class TestRuntimeSdkException extends SdkRuntimeException { + private int statusCode; + private String errorCode; + private String opcRequestId; + private ServiceDetails serviceDetails; + private TestErrorModel error; + + public TestRuntimeSdkException( + int statusCode, + String opcRequestId, + ServiceDetails serviceDetails, + String errorCode, + String errorMessage) { + this(statusCode, opcRequestId, serviceDetails, errorCode, errorMessage, null); + } + + public TestRuntimeSdkException( + int statusCode, + String opcRequestId, + ServiceDetails serviceDetails, + String errorCode, + String errorMessage, + Throwable cause) { + super(errorMessage, cause); + this.statusCode = statusCode; + this.opcRequestId = opcRequestId; + this.serviceDetails = serviceDetails; + this.errorCode = errorCode; + } + + public TestRuntimeSdkException( + int statusCode, + String opcRequestId, + ServiceDetails serviceDetails, + TestErrorModel error) { + super(error.errorMessage); + this.statusCode = statusCode; + this.opcRequestId = opcRequestId; + this.serviceDetails = serviceDetails; + this.errorCode = error.errorCode; + this.error = error; + } + } + + public static class TestErrorModel { + private String errorCode; + private String errorMessage; + } + public static class TestResponseHelper { private static final String OPC_REQUEST_ID = "DummyOPCRequestID"; private static final String JSON_MEDIA_TYPE = "application/json"; @@ -527,6 +624,36 @@ public void test_throwIfNotSuccessful_InValidJsonResponseExtendedForPartialLocal } } + @Test + public void test_throwIfNotSuccessful_CustomRuntimeExceptionFactory() { + TestErrorModel tem = new TestErrorModel(); + tem.errorCode = "TestErrorModel_errorCode"; + tem.errorMessage = "TestErrorModel_errorMessage"; + + when(mockResponse.body(TestErrorModel.class)) + .thenReturn(CompletableFuture.completedFuture(tem)); + + when(mockResponse.status()).thenReturn(BAD_GATEWAY_STATUS); + when(mockResponse.header("content-type")).thenReturn(JSON_MEDIA_TYPE); + try { + ClientCall.builder(mockClient, new ClientCallTest.TestRequest(), responseBuilder) + .logger(mockLogger, "mockLogger") + .method(Method.GET) + // Inject the custom exception factory + .responseErrorExceptionFactory( + new TestResponseErrorRuntimeExceptionFactory()) + .callSync(); + fail("Expected to throw"); + } catch (TestRuntimeSdkException e) { + // expected + assertEquals(BAD_GATEWAY_STATUS, e.statusCode); + assertEquals(tem.errorMessage, e.getMessage()); + assertEquals(tem.errorCode, e.errorCode); + assertEquals(OPC_REQUEST_ID, e.opcRequestId); + assertNotNull(e.serviceDetails); + } + } + @Test public void test_throwIfNotSuccessful_InvalidJsonResponse() { ecm = diff --git a/bmc-common/src/test/resources/unit_test_session_token_config b/bmc-common/src/test/resources/unit_test_session_token_config index e909c3a657f..5ccc4622a54 100644 --- a/bmc-common/src/test/resources/unit_test_session_token_config +++ b/bmc-common/src/test/resources/unit_test_session_token_config @@ -15,5 +15,5 @@ security_token_file=src/test/resources/token fingerprint=fingerprint tenancy=tenancy user=user -key_file=key_file +key_file=src/test/resources/pkcs1_private_key.pem security_token_file=src/test/resources/unit_test_token \ No newline at end of file diff --git a/bmc-computecloudatcustomer/pom.xml b/bmc-computecloudatcustomer/pom.xml index 56ec96e9573..819dbf89023 100644 --- a/bmc-computecloudatcustomer/pom.xml +++ b/bmc-computecloudatcustomer/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-computecloudatcustomer @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-computecloudatcustomer/src/main/resources/com/oracle/bmc/computecloudatcustomer/client.properties b/bmc-computecloudatcustomer/src/main/resources/com/oracle/bmc/computecloudatcustomer/client.properties index 90e87d3c29c..3a849c3b8b6 100644 --- a/bmc-computecloudatcustomer/src/main/resources/com/oracle/bmc/computecloudatcustomer/client.properties +++ b/bmc-computecloudatcustomer/src/main/resources/com/oracle/bmc/computecloudatcustomer/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20221208") \ No newline at end of file diff --git a/bmc-computeinstanceagent/pom.xml b/bmc-computeinstanceagent/pom.xml index 75de3e654bd..712889e8040 100644 --- a/bmc-computeinstanceagent/pom.xml +++ b/bmc-computeinstanceagent/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-computeinstanceagent @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-computeinstanceagent/src/main/resources/com/oracle/bmc/computeinstanceagent/client.properties b/bmc-computeinstanceagent/src/main/resources/com/oracle/bmc/computeinstanceagent/client.properties index 93d53541f3c..7fa51ff7d40 100644 --- a/bmc-computeinstanceagent/src/main/resources/com/oracle/bmc/computeinstanceagent/client.properties +++ b/bmc-computeinstanceagent/src/main/resources/com/oracle/bmc/computeinstanceagent/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180530") \ No newline at end of file diff --git a/bmc-containerengine/pom.xml b/bmc-containerengine/pom.xml index 8a1ac3426d3..1a8a79e7ae1 100644 --- a/bmc-containerengine/pom.xml +++ b/bmc-containerengine/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-containerengine/src/main/java/com/oracle/bmc/containerengine/ContainerEngineAsyncClient.java b/bmc-containerengine/src/main/java/com/oracle/bmc/containerengine/ContainerEngineAsyncClient.java index e6b497a7abc..9f02a0dc556 100644 --- a/bmc-containerengine/src/main/java/com/oracle/bmc/containerengine/ContainerEngineAsyncClient.java +++ b/bmc-containerengine/src/main/java/com/oracle/bmc/containerengine/ContainerEngineAsyncClient.java @@ -137,7 +137,10 @@ public java.util.concurrent.Future clusterMig return clientCall(request, ClusterMigrateToNativeVcnResponse::builder) .logger(LOG, "clusterMigrateToNativeVcn") - .serviceDetails("ContainerEngine", "ClusterMigrateToNativeVcn", "") + .serviceDetails( + "ContainerEngine", + "ClusterMigrateToNativeVcn", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/ClusterMigrateToNativeVcn") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ClusterMigrateToNativeVcnRequest::builder) .basePath("/20180222") @@ -170,7 +173,10 @@ public java.util.concurrent.Future clusterMig return clientCall(request, CompleteCredentialRotationResponse::builder) .logger(LOG, "completeCredentialRotation") - .serviceDetails("ContainerEngine", "CompleteCredentialRotation", "") + .serviceDetails( + "ContainerEngine", + "CompleteCredentialRotation", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/CompleteCredentialRotation") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CompleteCredentialRotationRequest::builder) .basePath("/20180222") @@ -200,7 +206,10 @@ public java.util.concurrent.Future createCluster( return clientCall(request, CreateClusterResponse::builder) .logger(LOG, "createCluster") - .serviceDetails("ContainerEngine", "CreateCluster", "") + .serviceDetails( + "ContainerEngine", + "CreateCluster", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/CreateCluster") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateClusterRequest::builder) .basePath("/20180222") @@ -227,7 +236,10 @@ public java.util.concurrent.Future createKubeconfig( return clientCall(request, CreateKubeconfigResponse::builder) .logger(LOG, "createKubeconfig") - .serviceDetails("ContainerEngine", "CreateKubeconfig", "") + .serviceDetails( + "ContainerEngine", + "CreateKubeconfig", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/CreateKubeconfig") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateKubeconfigRequest::builder) .basePath("/20180222") @@ -256,7 +268,10 @@ public java.util.concurrent.Future createNodePool( return clientCall(request, CreateNodePoolResponse::builder) .logger(LOG, "createNodePool") - .serviceDetails("ContainerEngine", "CreateNodePool", "") + .serviceDetails( + "ContainerEngine", + "CreateNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/CreateNodePool") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateNodePoolRequest::builder) .basePath("/20180222") @@ -284,7 +299,10 @@ public java.util.concurrent.Future createVirtualN return clientCall(request, CreateVirtualNodePoolResponse::builder) .logger(LOG, "createVirtualNodePool") - .serviceDetails("ContainerEngine", "CreateVirtualNodePool", "") + .serviceDetails( + "ContainerEngine", + "CreateVirtualNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/CreateVirtualNodePool") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateVirtualNodePoolRequest::builder) .basePath("/20180222") @@ -315,7 +333,10 @@ public java.util.concurrent.Future createWorkload return clientCall(request, CreateWorkloadMappingResponse::builder) .logger(LOG, "createWorkloadMapping") - .serviceDetails("ContainerEngine", "CreateWorkloadMapping", "") + .serviceDetails( + "ContainerEngine", + "CreateWorkloadMapping", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/CreateWorkloadMapping") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateWorkloadMappingRequest::builder) .basePath("/20180222") @@ -345,7 +366,10 @@ public java.util.concurrent.Future deleteCluster( return clientCall(request, DeleteClusterResponse::builder) .logger(LOG, "deleteCluster") - .serviceDetails("ContainerEngine", "DeleteCluster", "") + .serviceDetails( + "ContainerEngine", + "DeleteCluster", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/DeleteCluster") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteClusterRequest::builder) .basePath("/20180222") @@ -373,7 +397,10 @@ public java.util.concurrent.Future deleteNode( return clientCall(request, DeleteNodeResponse::builder) .logger(LOG, "deleteNode") - .serviceDetails("ContainerEngine", "DeleteNode", "") + .serviceDetails( + "ContainerEngine", + "DeleteNode", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/DeleteNode") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteNodeRequest::builder) .basePath("/20180222") @@ -408,7 +435,10 @@ public java.util.concurrent.Future deleteNodePool( return clientCall(request, DeleteNodePoolResponse::builder) .logger(LOG, "deleteNodePool") - .serviceDetails("ContainerEngine", "DeleteNodePool", "") + .serviceDetails( + "ContainerEngine", + "DeleteNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/DeleteNodePool") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteNodePoolRequest::builder) .basePath("/20180222") @@ -440,7 +470,10 @@ public java.util.concurrent.Future deleteVirtualN return clientCall(request, DeleteVirtualNodePoolResponse::builder) .logger(LOG, "deleteVirtualNodePool") - .serviceDetails("ContainerEngine", "DeleteVirtualNodePool", "") + .serviceDetails( + "ContainerEngine", + "DeleteVirtualNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/DeleteVirtualNodePool") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteVirtualNodePoolRequest::builder) .basePath("/20180222") @@ -474,7 +507,10 @@ public java.util.concurrent.Future deleteWorkRequest( return clientCall(request, DeleteWorkRequestResponse::builder) .logger(LOG, "deleteWorkRequest") - .serviceDetails("ContainerEngine", "DeleteWorkRequest", "") + .serviceDetails( + "ContainerEngine", + "DeleteWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequest/DeleteWorkRequest") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteWorkRequestRequest::builder) .basePath("/20180222") @@ -501,7 +537,10 @@ public java.util.concurrent.Future deleteWorkload return clientCall(request, DeleteWorkloadMappingResponse::builder) .logger(LOG, "deleteWorkloadMapping") - .serviceDetails("ContainerEngine", "DeleteWorkloadMapping", "") + .serviceDetails( + "ContainerEngine", + "DeleteWorkloadMapping", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/DeleteWorkloadMapping") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteWorkloadMappingRequest::builder) .basePath("/20180222") @@ -531,7 +570,10 @@ public java.util.concurrent.Future disableAddon( return clientCall(request, DisableAddonResponse::builder) .logger(LOG, "disableAddon") - .serviceDetails("ContainerEngine", "DisableAddon", "") + .serviceDetails( + "ContainerEngine", + "DisableAddon", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/DisableAddon") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DisableAddonRequest::builder) .basePath("/20180222") @@ -562,7 +604,10 @@ public java.util.concurrent.Future getAddon( return clientCall(request, GetAddonResponse::builder) .logger(LOG, "getAddon") - .serviceDetails("ContainerEngine", "GetAddon", "") + .serviceDetails( + "ContainerEngine", + "GetAddon", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/GetAddon") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetAddonRequest::builder) .basePath("/20180222") @@ -591,7 +636,10 @@ public java.util.concurrent.Future getCluster( return clientCall(request, GetClusterResponse::builder) .logger(LOG, "getCluster") - .serviceDetails("ContainerEngine", "GetCluster", "") + .serviceDetails( + "ContainerEngine", + "GetCluster", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/GetCluster") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetClusterRequest::builder) .basePath("/20180222") @@ -621,7 +669,10 @@ public java.util.concurrent.Future getCluster( return clientCall(request, GetClusterMigrateToNativeVcnStatusResponse::builder) .logger(LOG, "getClusterMigrateToNativeVcnStatus") - .serviceDetails("ContainerEngine", "GetClusterMigrateToNativeVcnStatus", "") + .serviceDetails( + "ContainerEngine", + "GetClusterMigrateToNativeVcnStatus", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/ClusterMigrateToNativeVcnStatus/GetClusterMigrateToNativeVcnStatus") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetClusterMigrateToNativeVcnStatusRequest::builder) .basePath("/20180222") @@ -653,7 +704,10 @@ public java.util.concurrent.Future getClusterOptions( return clientCall(request, GetClusterOptionsResponse::builder) .logger(LOG, "getClusterOptions") - .serviceDetails("ContainerEngine", "GetClusterOptions", "") + .serviceDetails( + "ContainerEngine", + "GetClusterOptions", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/ClusterOptions/GetClusterOptions") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetClusterOptionsRequest::builder) .basePath("/20180222") @@ -683,7 +737,10 @@ public java.util.concurrent.Future getClusterOptions( return clientCall(request, GetCredentialRotationStatusResponse::builder) .logger(LOG, "getCredentialRotationStatus") - .serviceDetails("ContainerEngine", "GetCredentialRotationStatus", "") + .serviceDetails( + "ContainerEngine", + "GetCredentialRotationStatus", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/CredentialRotationStatus/GetCredentialRotationStatus") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetCredentialRotationStatusRequest::builder) .basePath("/20180222") @@ -712,7 +769,10 @@ public java.util.concurrent.Future getNodePool( return clientCall(request, GetNodePoolResponse::builder) .logger(LOG, "getNodePool") - .serviceDetails("ContainerEngine", "GetNodePool", "") + .serviceDetails( + "ContainerEngine", + "GetNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/GetNodePool") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetNodePoolRequest::builder) .basePath("/20180222") @@ -740,7 +800,10 @@ public java.util.concurrent.Future getNodePoolOption return clientCall(request, GetNodePoolOptionsResponse::builder) .logger(LOG, "getNodePoolOptions") - .serviceDetails("ContainerEngine", "GetNodePoolOptions", "") + .serviceDetails( + "ContainerEngine", + "GetNodePoolOptions", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePoolOptions/GetNodePoolOptions") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetNodePoolOptionsRequest::builder) .basePath("/20180222") @@ -770,7 +833,10 @@ public java.util.concurrent.Future getVirtualNode( return clientCall(request, GetVirtualNodeResponse::builder) .logger(LOG, "getVirtualNode") - .serviceDetails("ContainerEngine", "GetVirtualNode", "") + .serviceDetails( + "ContainerEngine", + "GetVirtualNode", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/GetVirtualNode") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetVirtualNodeRequest::builder) .basePath("/20180222") @@ -800,7 +866,10 @@ public java.util.concurrent.Future getVirtualNodePoo return clientCall(request, GetVirtualNodePoolResponse::builder) .logger(LOG, "getVirtualNodePool") - .serviceDetails("ContainerEngine", "GetVirtualNodePool", "") + .serviceDetails( + "ContainerEngine", + "GetVirtualNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/GetVirtualNodePool") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetVirtualNodePoolRequest::builder) .basePath("/20180222") @@ -828,7 +897,10 @@ public java.util.concurrent.Future getWorkRequest( return clientCall(request, GetWorkRequestResponse::builder) .logger(LOG, "getWorkRequest") - .serviceDetails("ContainerEngine", "GetWorkRequest", "") + .serviceDetails( + "ContainerEngine", + "GetWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequest/GetWorkRequest") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetWorkRequestRequest::builder) .basePath("/20180222") @@ -860,7 +932,10 @@ public java.util.concurrent.Future getWorkloadMappin return clientCall(request, GetWorkloadMappingResponse::builder) .logger(LOG, "getWorkloadMapping") - .serviceDetails("ContainerEngine", "GetWorkloadMapping", "") + .serviceDetails( + "ContainerEngine", + "GetWorkloadMapping", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/GetWorkloadMapping") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetWorkloadMappingRequest::builder) .basePath("/20180222") @@ -890,7 +965,10 @@ public java.util.concurrent.Future installAddon( return clientCall(request, InstallAddonResponse::builder) .logger(LOG, "installAddon") - .serviceDetails("ContainerEngine", "InstallAddon", "") + .serviceDetails( + "ContainerEngine", + "InstallAddon", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/InstallAddon") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(InstallAddonRequest::builder) .basePath("/20180222") @@ -919,7 +997,10 @@ public java.util.concurrent.Future listAddonOptions( return clientCall(request, ListAddonOptionsResponse::builder) .logger(LOG, "listAddonOptions") - .serviceDetails("ContainerEngine", "ListAddonOptions", "") + .serviceDetails( + "ContainerEngine", + "ListAddonOptions", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/AddonOptionSummary/ListAddonOptions") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListAddonOptionsRequest::builder) .basePath("/20180222") @@ -952,7 +1033,10 @@ public java.util.concurrent.Future listAddons( return clientCall(request, ListAddonsResponse::builder) .logger(LOG, "listAddons") - .serviceDetails("ContainerEngine", "ListAddons", "") + .serviceDetails( + "ContainerEngine", + "ListAddons", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/ListAddons") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListAddonsRequest::builder) .basePath("/20180222") @@ -984,7 +1068,10 @@ public java.util.concurrent.Future listClusters( return clientCall(request, ListClustersResponse::builder) .logger(LOG, "listClusters") - .serviceDetails("ContainerEngine", "ListClusters", "") + .serviceDetails( + "ContainerEngine", + "ListClusters", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/ClusterSummary/ListClusters") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListClustersRequest::builder) .basePath("/20180222") @@ -1020,7 +1107,10 @@ public java.util.concurrent.Future listNodePools( return clientCall(request, ListNodePoolsResponse::builder) .logger(LOG, "listNodePools") - .serviceDetails("ContainerEngine", "ListNodePools", "") + .serviceDetails( + "ContainerEngine", + "ListNodePools", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePoolSummary/ListNodePools") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListNodePoolsRequest::builder) .basePath("/20180222") @@ -1057,7 +1147,10 @@ public java.util.concurrent.Future listPodShapes( return clientCall(request, ListPodShapesResponse::builder) .logger(LOG, "listPodShapes") - .serviceDetails("ContainerEngine", "ListPodShapes", "") + .serviceDetails( + "ContainerEngine", + "ListPodShapes", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/PodShapeSummary/ListPodShapes") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListPodShapesRequest::builder) .basePath("/20180222") @@ -1091,7 +1184,10 @@ public java.util.concurrent.Future listVirtualNode return clientCall(request, ListVirtualNodePoolsResponse::builder) .logger(LOG, "listVirtualNodePools") - .serviceDetails("ContainerEngine", "ListVirtualNodePools", "") + .serviceDetails( + "ContainerEngine", + "ListVirtualNodePools", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePoolSummary/ListVirtualNodePools") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListVirtualNodePoolsRequest::builder) .basePath("/20180222") @@ -1130,7 +1226,10 @@ public java.util.concurrent.Future listVirtualNodes( return clientCall(request, ListVirtualNodesResponse::builder) .logger(LOG, "listVirtualNodes") - .serviceDetails("ContainerEngine", "ListVirtualNodes", "") + .serviceDetails( + "ContainerEngine", + "ListVirtualNodes", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/ListVirtualNodes") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListVirtualNodesRequest::builder) .basePath("/20180222") @@ -1166,7 +1265,10 @@ public java.util.concurrent.Future listWorkReques return clientCall(request, ListWorkRequestErrorsResponse::builder) .logger(LOG, "listWorkRequestErrors") - .serviceDetails("ContainerEngine", "ListWorkRequestErrors", "") + .serviceDetails( + "ContainerEngine", + "ListWorkRequestErrors", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequestError/ListWorkRequestErrors") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListWorkRequestErrorsRequest::builder) .basePath("/20180222") @@ -1196,7 +1298,10 @@ public java.util.concurrent.Future listWorkRequestL return clientCall(request, ListWorkRequestLogsResponse::builder) .logger(LOG, "listWorkRequestLogs") - .serviceDetails("ContainerEngine", "ListWorkRequestLogs", "") + .serviceDetails( + "ContainerEngine", + "ListWorkRequestLogs", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequestLogEntry/ListWorkRequestLogs") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListWorkRequestLogsRequest::builder) .basePath("/20180222") @@ -1224,7 +1329,10 @@ public java.util.concurrent.Future listWorkRequests( return clientCall(request, ListWorkRequestsResponse::builder) .logger(LOG, "listWorkRequests") - .serviceDetails("ContainerEngine", "ListWorkRequests", "") + .serviceDetails( + "ContainerEngine", + "ListWorkRequests", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequestSummary/ListWorkRequests") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListWorkRequestsRequest::builder) .basePath("/20180222") @@ -1264,7 +1372,10 @@ public java.util.concurrent.Future listWorkloadMap return clientCall(request, ListWorkloadMappingsResponse::builder) .logger(LOG, "listWorkloadMappings") - .serviceDetails("ContainerEngine", "ListWorkloadMappings", "") + .serviceDetails( + "ContainerEngine", + "ListWorkloadMappings", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/ListWorkloadMappings") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListWorkloadMappingsRequest::builder) .basePath("/20180222") @@ -1301,7 +1412,10 @@ public java.util.concurrent.Future startCredent return clientCall(request, StartCredentialRotationResponse::builder) .logger(LOG, "startCredentialRotation") - .serviceDetails("ContainerEngine", "StartCredentialRotation", "") + .serviceDetails( + "ContainerEngine", + "StartCredentialRotation", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/StartCredentialRotation") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(StartCredentialRotationRequest::builder) .basePath("/20180222") @@ -1335,7 +1449,10 @@ public java.util.concurrent.Future updateAddon( return clientCall(request, UpdateAddonResponse::builder) .logger(LOG, "updateAddon") - .serviceDetails("ContainerEngine", "UpdateAddon", "") + .serviceDetails( + "ContainerEngine", + "UpdateAddon", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/UpdateAddon") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateAddonRequest::builder) .basePath("/20180222") @@ -1366,7 +1483,10 @@ public java.util.concurrent.Future updateCluster( return clientCall(request, UpdateClusterResponse::builder) .logger(LOG, "updateCluster") - .serviceDetails("ContainerEngine", "UpdateCluster", "") + .serviceDetails( + "ContainerEngine", + "UpdateCluster", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/UpdateCluster") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateClusterRequest::builder) .basePath("/20180222") @@ -1399,7 +1519,10 @@ public java.util.concurrent.Future updateCluster( return clientCall(request, UpdateClusterEndpointConfigResponse::builder) .logger(LOG, "updateClusterEndpointConfig") - .serviceDetails("ContainerEngine", "UpdateClusterEndpointConfig", "") + .serviceDetails( + "ContainerEngine", + "UpdateClusterEndpointConfig", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/UpdateClusterEndpointConfig") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(UpdateClusterEndpointConfigRequest::builder) .basePath("/20180222") @@ -1432,7 +1555,10 @@ public java.util.concurrent.Future updateNodePool( return clientCall(request, UpdateNodePoolResponse::builder) .logger(LOG, "updateNodePool") - .serviceDetails("ContainerEngine", "UpdateNodePool", "") + .serviceDetails( + "ContainerEngine", + "UpdateNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/UpdateNodePool") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateNodePoolRequest::builder) .basePath("/20180222") @@ -1468,7 +1594,10 @@ public java.util.concurrent.Future updateVirtualN return clientCall(request, UpdateVirtualNodePoolResponse::builder) .logger(LOG, "updateVirtualNodePool") - .serviceDetails("ContainerEngine", "UpdateVirtualNodePool", "") + .serviceDetails( + "ContainerEngine", + "UpdateVirtualNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/UpdateVirtualNodePool") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateVirtualNodePoolRequest::builder) .basePath("/20180222") @@ -1502,7 +1631,10 @@ public java.util.concurrent.Future updateWorkload return clientCall(request, UpdateWorkloadMappingResponse::builder) .logger(LOG, "updateWorkloadMapping") - .serviceDetails("ContainerEngine", "UpdateWorkloadMapping", "") + .serviceDetails( + "ContainerEngine", + "UpdateWorkloadMapping", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/UpdateWorkloadMapping") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateWorkloadMappingRequest::builder) .basePath("/20180222") diff --git a/bmc-containerengine/src/main/java/com/oracle/bmc/containerengine/ContainerEngineClient.java b/bmc-containerengine/src/main/java/com/oracle/bmc/containerengine/ContainerEngineClient.java index f7444a48072..e8122b6489a 100644 --- a/bmc-containerengine/src/main/java/com/oracle/bmc/containerengine/ContainerEngineClient.java +++ b/bmc-containerengine/src/main/java/com/oracle/bmc/containerengine/ContainerEngineClient.java @@ -160,7 +160,10 @@ public ClusterMigrateToNativeVcnResponse clusterMigrateToNativeVcn( return clientCall(request, ClusterMigrateToNativeVcnResponse::builder) .logger(LOG, "clusterMigrateToNativeVcn") - .serviceDetails("ContainerEngine", "ClusterMigrateToNativeVcn", "") + .serviceDetails( + "ContainerEngine", + "ClusterMigrateToNativeVcn", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/ClusterMigrateToNativeVcn") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ClusterMigrateToNativeVcnRequest::builder) .basePath("/20180222") @@ -189,7 +192,10 @@ public CompleteCredentialRotationResponse completeCredentialRotation( return clientCall(request, CompleteCredentialRotationResponse::builder) .logger(LOG, "completeCredentialRotation") - .serviceDetails("ContainerEngine", "CompleteCredentialRotation", "") + .serviceDetails( + "ContainerEngine", + "CompleteCredentialRotation", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/CompleteCredentialRotation") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CompleteCredentialRotationRequest::builder) .basePath("/20180222") @@ -217,7 +223,10 @@ public CreateClusterResponse createCluster(CreateClusterRequest request) { return clientCall(request, CreateClusterResponse::builder) .logger(LOG, "createCluster") - .serviceDetails("ContainerEngine", "CreateCluster", "") + .serviceDetails( + "ContainerEngine", + "CreateCluster", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/CreateCluster") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateClusterRequest::builder) .basePath("/20180222") @@ -241,7 +250,10 @@ public CreateKubeconfigResponse createKubeconfig(CreateKubeconfigRequest request return clientCall(request, CreateKubeconfigResponse::builder) .logger(LOG, "createKubeconfig") - .serviceDetails("ContainerEngine", "CreateKubeconfig", "") + .serviceDetails( + "ContainerEngine", + "CreateKubeconfig", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/CreateKubeconfig") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateKubeconfigRequest::builder) .basePath("/20180222") @@ -267,7 +279,10 @@ public CreateNodePoolResponse createNodePool(CreateNodePoolRequest request) { return clientCall(request, CreateNodePoolResponse::builder) .logger(LOG, "createNodePool") - .serviceDetails("ContainerEngine", "CreateNodePool", "") + .serviceDetails( + "ContainerEngine", + "CreateNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/CreateNodePool") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateNodePoolRequest::builder) .basePath("/20180222") @@ -293,7 +308,10 @@ public CreateVirtualNodePoolResponse createVirtualNodePool( return clientCall(request, CreateVirtualNodePoolResponse::builder) .logger(LOG, "createVirtualNodePool") - .serviceDetails("ContainerEngine", "CreateVirtualNodePool", "") + .serviceDetails( + "ContainerEngine", + "CreateVirtualNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/CreateVirtualNodePool") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateVirtualNodePoolRequest::builder) .basePath("/20180222") @@ -322,7 +340,10 @@ public CreateWorkloadMappingResponse createWorkloadMapping( return clientCall(request, CreateWorkloadMappingResponse::builder) .logger(LOG, "createWorkloadMapping") - .serviceDetails("ContainerEngine", "CreateWorkloadMapping", "") + .serviceDetails( + "ContainerEngine", + "CreateWorkloadMapping", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/CreateWorkloadMapping") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateWorkloadMappingRequest::builder) .basePath("/20180222") @@ -350,7 +371,10 @@ public DeleteClusterResponse deleteCluster(DeleteClusterRequest request) { return clientCall(request, DeleteClusterResponse::builder) .logger(LOG, "deleteCluster") - .serviceDetails("ContainerEngine", "DeleteCluster", "") + .serviceDetails( + "ContainerEngine", + "DeleteCluster", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/DeleteCluster") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteClusterRequest::builder) .basePath("/20180222") @@ -376,7 +400,10 @@ public DeleteNodeResponse deleteNode(DeleteNodeRequest request) { return clientCall(request, DeleteNodeResponse::builder) .logger(LOG, "deleteNode") - .serviceDetails("ContainerEngine", "DeleteNode", "") + .serviceDetails( + "ContainerEngine", + "DeleteNode", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/DeleteNode") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteNodeRequest::builder) .basePath("/20180222") @@ -408,7 +435,10 @@ public DeleteNodePoolResponse deleteNodePool(DeleteNodePoolRequest request) { return clientCall(request, DeleteNodePoolResponse::builder) .logger(LOG, "deleteNodePool") - .serviceDetails("ContainerEngine", "DeleteNodePool", "") + .serviceDetails( + "ContainerEngine", + "DeleteNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/DeleteNodePool") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteNodePoolRequest::builder) .basePath("/20180222") @@ -438,7 +468,10 @@ public DeleteVirtualNodePoolResponse deleteVirtualNodePool( return clientCall(request, DeleteVirtualNodePoolResponse::builder) .logger(LOG, "deleteVirtualNodePool") - .serviceDetails("ContainerEngine", "DeleteVirtualNodePool", "") + .serviceDetails( + "ContainerEngine", + "DeleteVirtualNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/DeleteVirtualNodePool") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteVirtualNodePoolRequest::builder) .basePath("/20180222") @@ -469,7 +502,10 @@ public DeleteWorkRequestResponse deleteWorkRequest(DeleteWorkRequestRequest requ return clientCall(request, DeleteWorkRequestResponse::builder) .logger(LOG, "deleteWorkRequest") - .serviceDetails("ContainerEngine", "DeleteWorkRequest", "") + .serviceDetails( + "ContainerEngine", + "DeleteWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequest/DeleteWorkRequest") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteWorkRequestRequest::builder) .basePath("/20180222") @@ -494,7 +530,10 @@ public DeleteWorkloadMappingResponse deleteWorkloadMapping( return clientCall(request, DeleteWorkloadMappingResponse::builder) .logger(LOG, "deleteWorkloadMapping") - .serviceDetails("ContainerEngine", "DeleteWorkloadMapping", "") + .serviceDetails( + "ContainerEngine", + "DeleteWorkloadMapping", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/DeleteWorkloadMapping") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteWorkloadMappingRequest::builder) .basePath("/20180222") @@ -522,7 +561,10 @@ public DisableAddonResponse disableAddon(DisableAddonRequest request) { return clientCall(request, DisableAddonResponse::builder) .logger(LOG, "disableAddon") - .serviceDetails("ContainerEngine", "DisableAddon", "") + .serviceDetails( + "ContainerEngine", + "DisableAddon", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/DisableAddon") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DisableAddonRequest::builder) .basePath("/20180222") @@ -551,7 +593,10 @@ public GetAddonResponse getAddon(GetAddonRequest request) { return clientCall(request, GetAddonResponse::builder) .logger(LOG, "getAddon") - .serviceDetails("ContainerEngine", "GetAddon", "") + .serviceDetails( + "ContainerEngine", + "GetAddon", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/GetAddon") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetAddonRequest::builder) .basePath("/20180222") @@ -578,7 +623,10 @@ public GetClusterResponse getCluster(GetClusterRequest request) { return clientCall(request, GetClusterResponse::builder) .logger(LOG, "getCluster") - .serviceDetails("ContainerEngine", "GetCluster", "") + .serviceDetails( + "ContainerEngine", + "GetCluster", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/GetCluster") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetClusterRequest::builder) .basePath("/20180222") @@ -604,7 +652,10 @@ public GetClusterMigrateToNativeVcnStatusResponse getClusterMigrateToNativeVcnSt return clientCall(request, GetClusterMigrateToNativeVcnStatusResponse::builder) .logger(LOG, "getClusterMigrateToNativeVcnStatus") - .serviceDetails("ContainerEngine", "GetClusterMigrateToNativeVcnStatus", "") + .serviceDetails( + "ContainerEngine", + "GetClusterMigrateToNativeVcnStatus", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/ClusterMigrateToNativeVcnStatus/GetClusterMigrateToNativeVcnStatus") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetClusterMigrateToNativeVcnStatusRequest::builder) .basePath("/20180222") @@ -633,7 +684,10 @@ public GetClusterOptionsResponse getClusterOptions(GetClusterOptionsRequest requ return clientCall(request, GetClusterOptionsResponse::builder) .logger(LOG, "getClusterOptions") - .serviceDetails("ContainerEngine", "GetClusterOptions", "") + .serviceDetails( + "ContainerEngine", + "GetClusterOptions", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/ClusterOptions/GetClusterOptions") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetClusterOptionsRequest::builder) .basePath("/20180222") @@ -659,7 +713,10 @@ public GetCredentialRotationStatusResponse getCredentialRotationStatus( return clientCall(request, GetCredentialRotationStatusResponse::builder) .logger(LOG, "getCredentialRotationStatus") - .serviceDetails("ContainerEngine", "GetCredentialRotationStatus", "") + .serviceDetails( + "ContainerEngine", + "GetCredentialRotationStatus", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/CredentialRotationStatus/GetCredentialRotationStatus") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetCredentialRotationStatusRequest::builder) .basePath("/20180222") @@ -686,7 +743,10 @@ public GetNodePoolResponse getNodePool(GetNodePoolRequest request) { return clientCall(request, GetNodePoolResponse::builder) .logger(LOG, "getNodePool") - .serviceDetails("ContainerEngine", "GetNodePool", "") + .serviceDetails( + "ContainerEngine", + "GetNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/GetNodePool") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetNodePoolRequest::builder) .basePath("/20180222") @@ -711,7 +771,10 @@ public GetNodePoolOptionsResponse getNodePoolOptions(GetNodePoolOptionsRequest r return clientCall(request, GetNodePoolOptionsResponse::builder) .logger(LOG, "getNodePoolOptions") - .serviceDetails("ContainerEngine", "GetNodePoolOptions", "") + .serviceDetails( + "ContainerEngine", + "GetNodePoolOptions", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePoolOptions/GetNodePoolOptions") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetNodePoolOptionsRequest::builder) .basePath("/20180222") @@ -738,7 +801,10 @@ public GetVirtualNodeResponse getVirtualNode(GetVirtualNodeRequest request) { return clientCall(request, GetVirtualNodeResponse::builder) .logger(LOG, "getVirtualNode") - .serviceDetails("ContainerEngine", "GetVirtualNode", "") + .serviceDetails( + "ContainerEngine", + "GetVirtualNode", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/GetVirtualNode") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetVirtualNodeRequest::builder) .basePath("/20180222") @@ -765,7 +831,10 @@ public GetVirtualNodePoolResponse getVirtualNodePool(GetVirtualNodePoolRequest r return clientCall(request, GetVirtualNodePoolResponse::builder) .logger(LOG, "getVirtualNodePool") - .serviceDetails("ContainerEngine", "GetVirtualNodePool", "") + .serviceDetails( + "ContainerEngine", + "GetVirtualNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/GetVirtualNodePool") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetVirtualNodePoolRequest::builder) .basePath("/20180222") @@ -790,7 +859,10 @@ public GetWorkRequestResponse getWorkRequest(GetWorkRequestRequest request) { return clientCall(request, GetWorkRequestResponse::builder) .logger(LOG, "getWorkRequest") - .serviceDetails("ContainerEngine", "GetWorkRequest", "") + .serviceDetails( + "ContainerEngine", + "GetWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequest/GetWorkRequest") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetWorkRequestRequest::builder) .basePath("/20180222") @@ -819,7 +891,10 @@ public GetWorkloadMappingResponse getWorkloadMapping(GetWorkloadMappingRequest r return clientCall(request, GetWorkloadMappingResponse::builder) .logger(LOG, "getWorkloadMapping") - .serviceDetails("ContainerEngine", "GetWorkloadMapping", "") + .serviceDetails( + "ContainerEngine", + "GetWorkloadMapping", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/GetWorkloadMapping") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetWorkloadMappingRequest::builder) .basePath("/20180222") @@ -847,7 +922,10 @@ public InstallAddonResponse installAddon(InstallAddonRequest request) { return clientCall(request, InstallAddonResponse::builder) .logger(LOG, "installAddon") - .serviceDetails("ContainerEngine", "InstallAddon", "") + .serviceDetails( + "ContainerEngine", + "InstallAddon", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/InstallAddon") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(InstallAddonRequest::builder) .basePath("/20180222") @@ -873,7 +951,10 @@ public ListAddonOptionsResponse listAddonOptions(ListAddonOptionsRequest request return clientCall(request, ListAddonOptionsResponse::builder) .logger(LOG, "listAddonOptions") - .serviceDetails("ContainerEngine", "ListAddonOptions", "") + .serviceDetails( + "ContainerEngine", + "ListAddonOptions", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/AddonOptionSummary/ListAddonOptions") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListAddonOptionsRequest::builder) .basePath("/20180222") @@ -904,7 +985,10 @@ public ListAddonsResponse listAddons(ListAddonsRequest request) { return clientCall(request, ListAddonsResponse::builder) .logger(LOG, "listAddons") - .serviceDetails("ContainerEngine", "ListAddons", "") + .serviceDetails( + "ContainerEngine", + "ListAddons", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/ListAddons") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListAddonsRequest::builder) .basePath("/20180222") @@ -934,7 +1018,10 @@ public ListClustersResponse listClusters(ListClustersRequest request) { return clientCall(request, ListClustersResponse::builder) .logger(LOG, "listClusters") - .serviceDetails("ContainerEngine", "ListClusters", "") + .serviceDetails( + "ContainerEngine", + "ListClusters", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/ClusterSummary/ListClusters") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListClustersRequest::builder) .basePath("/20180222") @@ -968,7 +1055,10 @@ public ListNodePoolsResponse listNodePools(ListNodePoolsRequest request) { return clientCall(request, ListNodePoolsResponse::builder) .logger(LOG, "listNodePools") - .serviceDetails("ContainerEngine", "ListNodePools", "") + .serviceDetails( + "ContainerEngine", + "ListNodePools", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePoolSummary/ListNodePools") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListNodePoolsRequest::builder) .basePath("/20180222") @@ -1003,7 +1093,10 @@ public ListPodShapesResponse listPodShapes(ListPodShapesRequest request) { return clientCall(request, ListPodShapesResponse::builder) .logger(LOG, "listPodShapes") - .serviceDetails("ContainerEngine", "ListPodShapes", "") + .serviceDetails( + "ContainerEngine", + "ListPodShapes", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/PodShapeSummary/ListPodShapes") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListPodShapesRequest::builder) .basePath("/20180222") @@ -1034,7 +1127,10 @@ public ListVirtualNodePoolsResponse listVirtualNodePools(ListVirtualNodePoolsReq return clientCall(request, ListVirtualNodePoolsResponse::builder) .logger(LOG, "listVirtualNodePools") - .serviceDetails("ContainerEngine", "ListVirtualNodePools", "") + .serviceDetails( + "ContainerEngine", + "ListVirtualNodePools", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePoolSummary/ListVirtualNodePools") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListVirtualNodePoolsRequest::builder) .basePath("/20180222") @@ -1070,7 +1166,10 @@ public ListVirtualNodesResponse listVirtualNodes(ListVirtualNodesRequest request return clientCall(request, ListVirtualNodesResponse::builder) .logger(LOG, "listVirtualNodes") - .serviceDetails("ContainerEngine", "ListVirtualNodes", "") + .serviceDetails( + "ContainerEngine", + "ListVirtualNodes", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/ListVirtualNodes") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListVirtualNodesRequest::builder) .basePath("/20180222") @@ -1104,7 +1203,10 @@ public ListWorkRequestErrorsResponse listWorkRequestErrors( return clientCall(request, ListWorkRequestErrorsResponse::builder) .logger(LOG, "listWorkRequestErrors") - .serviceDetails("ContainerEngine", "ListWorkRequestErrors", "") + .serviceDetails( + "ContainerEngine", + "ListWorkRequestErrors", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequestError/ListWorkRequestErrors") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListWorkRequestErrorsRequest::builder) .basePath("/20180222") @@ -1131,7 +1233,10 @@ public ListWorkRequestLogsResponse listWorkRequestLogs(ListWorkRequestLogsReques return clientCall(request, ListWorkRequestLogsResponse::builder) .logger(LOG, "listWorkRequestLogs") - .serviceDetails("ContainerEngine", "ListWorkRequestLogs", "") + .serviceDetails( + "ContainerEngine", + "ListWorkRequestLogs", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequestLogEntry/ListWorkRequestLogs") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListWorkRequestLogsRequest::builder) .basePath("/20180222") @@ -1156,7 +1261,10 @@ public ListWorkRequestsResponse listWorkRequests(ListWorkRequestsRequest request return clientCall(request, ListWorkRequestsResponse::builder) .logger(LOG, "listWorkRequests") - .serviceDetails("ContainerEngine", "ListWorkRequests", "") + .serviceDetails( + "ContainerEngine", + "ListWorkRequests", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkRequestSummary/ListWorkRequests") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListWorkRequestsRequest::builder) .basePath("/20180222") @@ -1193,7 +1301,10 @@ public ListWorkloadMappingsResponse listWorkloadMappings(ListWorkloadMappingsReq return clientCall(request, ListWorkloadMappingsResponse::builder) .logger(LOG, "listWorkloadMappings") - .serviceDetails("ContainerEngine", "ListWorkloadMappings", "") + .serviceDetails( + "ContainerEngine", + "ListWorkloadMappings", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/ListWorkloadMappings") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListWorkloadMappingsRequest::builder) .basePath("/20180222") @@ -1228,7 +1339,10 @@ public StartCredentialRotationResponse startCredentialRotation( return clientCall(request, StartCredentialRotationResponse::builder) .logger(LOG, "startCredentialRotation") - .serviceDetails("ContainerEngine", "StartCredentialRotation", "") + .serviceDetails( + "ContainerEngine", + "StartCredentialRotation", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/StartCredentialRotation") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(StartCredentialRotationRequest::builder) .basePath("/20180222") @@ -1260,7 +1374,10 @@ public UpdateAddonResponse updateAddon(UpdateAddonRequest request) { return clientCall(request, UpdateAddonResponse::builder) .logger(LOG, "updateAddon") - .serviceDetails("ContainerEngine", "UpdateAddon", "") + .serviceDetails( + "ContainerEngine", + "UpdateAddon", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/UpdateAddon") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateAddonRequest::builder) .basePath("/20180222") @@ -1289,7 +1406,10 @@ public UpdateClusterResponse updateCluster(UpdateClusterRequest request) { return clientCall(request, UpdateClusterResponse::builder) .logger(LOG, "updateCluster") - .serviceDetails("ContainerEngine", "UpdateCluster", "") + .serviceDetails( + "ContainerEngine", + "UpdateCluster", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/UpdateCluster") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateClusterRequest::builder) .basePath("/20180222") @@ -1318,7 +1438,10 @@ public UpdateClusterEndpointConfigResponse updateClusterEndpointConfig( return clientCall(request, UpdateClusterEndpointConfigResponse::builder) .logger(LOG, "updateClusterEndpointConfig") - .serviceDetails("ContainerEngine", "UpdateClusterEndpointConfig", "") + .serviceDetails( + "ContainerEngine", + "UpdateClusterEndpointConfig", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/Cluster/UpdateClusterEndpointConfig") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(UpdateClusterEndpointConfigRequest::builder) .basePath("/20180222") @@ -1348,7 +1471,10 @@ public UpdateNodePoolResponse updateNodePool(UpdateNodePoolRequest request) { return clientCall(request, UpdateNodePoolResponse::builder) .logger(LOG, "updateNodePool") - .serviceDetails("ContainerEngine", "UpdateNodePool", "") + .serviceDetails( + "ContainerEngine", + "UpdateNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/NodePool/UpdateNodePool") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateNodePoolRequest::builder) .basePath("/20180222") @@ -1382,7 +1508,10 @@ public UpdateVirtualNodePoolResponse updateVirtualNodePool( return clientCall(request, UpdateVirtualNodePoolResponse::builder) .logger(LOG, "updateVirtualNodePool") - .serviceDetails("ContainerEngine", "UpdateVirtualNodePool", "") + .serviceDetails( + "ContainerEngine", + "UpdateVirtualNodePool", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/VirtualNodePool/UpdateVirtualNodePool") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateVirtualNodePoolRequest::builder) .basePath("/20180222") @@ -1414,7 +1543,10 @@ public UpdateWorkloadMappingResponse updateWorkloadMapping( return clientCall(request, UpdateWorkloadMappingResponse::builder) .logger(LOG, "updateWorkloadMapping") - .serviceDetails("ContainerEngine", "UpdateWorkloadMapping", "") + .serviceDetails( + "ContainerEngine", + "UpdateWorkloadMapping", + "https://docs.oracle.com/iaas/api/#/en/containerengine/20180222/WorkloadMapping/UpdateWorkloadMapping") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateWorkloadMappingRequest::builder) .basePath("/20180222") diff --git a/bmc-containerengine/src/main/resources/com/oracle/bmc/containerengine/client.properties b/bmc-containerengine/src/main/resources/com/oracle/bmc/containerengine/client.properties index 0b814b32d57..8ab653d5ed0 100644 --- a/bmc-containerengine/src/main/resources/com/oracle/bmc/containerengine/client.properties +++ b/bmc-containerengine/src/main/resources/com/oracle/bmc/containerengine/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180222") \ No newline at end of file diff --git a/bmc-containerinstances/pom.xml b/bmc-containerinstances/pom.xml index 02eb595f2ab..20b879e3ded 100644 --- a/bmc-containerinstances/pom.xml +++ b/bmc-containerinstances/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-containerinstances @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-containerinstances/src/main/resources/com/oracle/bmc/containerinstances/client.properties b/bmc-containerinstances/src/main/resources/com/oracle/bmc/containerinstances/client.properties index 1a6167dc6b1..2cb3ed6e1e0 100644 --- a/bmc-containerinstances/src/main/resources/com/oracle/bmc/containerinstances/client.properties +++ b/bmc-containerinstances/src/main/resources/com/oracle/bmc/containerinstances/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210415") \ No newline at end of file diff --git a/bmc-core/pom.xml b/bmc-core/pom.xml index e1c8cb5896a..dcd6e3f30aa 100644 --- a/bmc-core/pom.xml +++ b/bmc-core/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,12 +18,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-workrequests - 3.54.0 + 3.55.0 diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java index a1abe981170..6cc8071560c 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Instance.java @@ -75,7 +75,8 @@ public final class Instance extends com.oracle.bmc.http.client.internal.Explicit "agentConfig", "timeMaintenanceRebootDue", "platformConfig", - "instanceConfigurationId" + "instanceConfigurationId", + "licensingConfigs" }) public Instance( String availabilityDomain, @@ -110,7 +111,8 @@ public Instance( InstanceAgentConfig agentConfig, java.util.Date timeMaintenanceRebootDue, PlatformConfig platformConfig, - String instanceConfigurationId) { + String instanceConfigurationId, + java.util.List licensingConfigs) { super(); this.availabilityDomain = availabilityDomain; this.capacityReservationId = capacityReservationId; @@ -145,6 +147,7 @@ public Instance( this.timeMaintenanceRebootDue = timeMaintenanceRebootDue; this.platformConfig = platformConfig; this.instanceConfigurationId = instanceConfigurationId; + this.licensingConfigs = licensingConfigs; } @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @@ -789,6 +792,21 @@ public Builder instanceConfigurationId(String instanceConfigurationId) { this.__explicitlySet__.add("instanceConfigurationId"); return this; } + /** List of licensing configurations associated with the instance. */ + @com.fasterxml.jackson.annotation.JsonProperty("licensingConfigs") + private java.util.List licensingConfigs; + + /** + * List of licensing configurations associated with the instance. + * + * @param licensingConfigs the value to set + * @return this builder + */ + public Builder licensingConfigs(java.util.List licensingConfigs) { + this.licensingConfigs = licensingConfigs; + this.__explicitlySet__.add("licensingConfigs"); + return this; + } @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -828,7 +846,8 @@ public Instance build() { this.agentConfig, this.timeMaintenanceRebootDue, this.platformConfig, - this.instanceConfigurationId); + this.instanceConfigurationId, + this.licensingConfigs); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -936,6 +955,9 @@ public Builder copy(Instance model) { if (model.wasPropertyExplicitlySet("instanceConfigurationId")) { this.instanceConfigurationId(model.getInstanceConfigurationId()); } + if (model.wasPropertyExplicitlySet("licensingConfigs")) { + this.licensingConfigs(model.getLicensingConfigs()); + } return this; } } @@ -1671,6 +1693,19 @@ public String getInstanceConfigurationId() { return instanceConfigurationId; } + /** List of licensing configurations associated with the instance. */ + @com.fasterxml.jackson.annotation.JsonProperty("licensingConfigs") + private final java.util.List licensingConfigs; + + /** + * List of licensing configurations associated with the instance. + * + * @return the value + */ + public java.util.List getLicensingConfigs() { + return licensingConfigs; + } + @Override public String toString() { return this.toString(true); @@ -1724,6 +1759,7 @@ public String toString(boolean includeByteArrayContents) { sb.append(", platformConfig=").append(String.valueOf(this.platformConfig)); sb.append(", instanceConfigurationId=") .append(String.valueOf(this.instanceConfigurationId)); + sb.append(", licensingConfigs=").append(String.valueOf(this.licensingConfigs)); sb.append(")"); return sb.toString(); } @@ -1776,6 +1812,7 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.platformConfig, other.platformConfig) && java.util.Objects.equals( this.instanceConfigurationId, other.instanceConfigurationId) + && java.util.Objects.equals(this.licensingConfigs, other.licensingConfigs) && super.equals(other); } @@ -1870,6 +1907,9 @@ public int hashCode() { + (this.instanceConfigurationId == null ? 43 : this.instanceConfigurationId.hashCode()); + result = + (result * PRIME) + + (this.licensingConfigs == null ? 43 : this.licensingConfigs.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConfigurationLaunchInstanceDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConfigurationLaunchInstanceDetails.java index fa5166558c1..b8ee20ab7b1 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConfigurationLaunchInstanceDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConfigurationLaunchInstanceDetails.java @@ -53,7 +53,8 @@ public final class InstanceConfigurationLaunchInstanceDetails "preferredMaintenanceAction", "instanceOptions", "availabilityConfig", - "preemptibleInstanceConfig" + "preemptibleInstanceConfig", + "licensingConfigs" }) public InstanceConfigurationLaunchInstanceDetails( String availabilityDomain, @@ -81,7 +82,8 @@ public InstanceConfigurationLaunchInstanceDetails( PreferredMaintenanceAction preferredMaintenanceAction, InstanceConfigurationInstanceOptions instanceOptions, InstanceConfigurationAvailabilityConfig availabilityConfig, - PreemptibleInstanceConfigDetails preemptibleInstanceConfig) { + PreemptibleInstanceConfigDetails preemptibleInstanceConfig, + java.util.List licensingConfigs) { super(); this.availabilityDomain = availabilityDomain; this.capacityReservationId = capacityReservationId; @@ -109,6 +111,7 @@ public InstanceConfigurationLaunchInstanceDetails( this.instanceOptions = instanceOptions; this.availabilityConfig = availabilityConfig; this.preemptibleInstanceConfig = preemptibleInstanceConfig; + this.licensingConfigs = licensingConfigs; } @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @@ -721,6 +724,22 @@ public Builder preemptibleInstanceConfig( this.__explicitlySet__.add("preemptibleInstanceConfig"); return this; } + /** List of licensing configurations associated with target launch values. */ + @com.fasterxml.jackson.annotation.JsonProperty("licensingConfigs") + private java.util.List licensingConfigs; + + /** + * List of licensing configurations associated with target launch values. + * + * @param licensingConfigs the value to set + * @return this builder + */ + public Builder licensingConfigs( + java.util.List licensingConfigs) { + this.licensingConfigs = licensingConfigs; + this.__explicitlySet__.add("licensingConfigs"); + return this; + } @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -753,7 +772,8 @@ public InstanceConfigurationLaunchInstanceDetails build() { this.preferredMaintenanceAction, this.instanceOptions, this.availabilityConfig, - this.preemptibleInstanceConfig); + this.preemptibleInstanceConfig, + this.licensingConfigs); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -840,6 +860,9 @@ public Builder copy(InstanceConfigurationLaunchInstanceDetails model) { if (model.wasPropertyExplicitlySet("preemptibleInstanceConfig")) { this.preemptibleInstanceConfig(model.getPreemptibleInstanceConfig()); } + if (model.wasPropertyExplicitlySet("licensingConfigs")) { + this.licensingConfigs(model.getLicensingConfigs()); + } return this; } } @@ -1499,6 +1522,19 @@ public PreemptibleInstanceConfigDetails getPreemptibleInstanceConfig() { return preemptibleInstanceConfig; } + /** List of licensing configurations associated with target launch values. */ + @com.fasterxml.jackson.annotation.JsonProperty("licensingConfigs") + private final java.util.List licensingConfigs; + + /** + * List of licensing configurations associated with target launch values. + * + * @return the value + */ + public java.util.List getLicensingConfigs() { + return licensingConfigs; + } + @Override public String toString() { return this.toString(true); @@ -1544,6 +1580,7 @@ public String toString(boolean includeByteArrayContents) { sb.append(", availabilityConfig=").append(String.valueOf(this.availabilityConfig)); sb.append(", preemptibleInstanceConfig=") .append(String.valueOf(this.preemptibleInstanceConfig)); + sb.append(", licensingConfigs=").append(String.valueOf(this.licensingConfigs)); sb.append(")"); return sb.toString(); } @@ -1589,6 +1626,7 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.availabilityConfig, other.availabilityConfig) && java.util.Objects.equals( this.preemptibleInstanceConfig, other.preemptibleInstanceConfig) + && java.util.Objects.equals(this.licensingConfigs, other.licensingConfigs) && super.equals(other); } @@ -1670,6 +1708,9 @@ public int hashCode() { + (this.preemptibleInstanceConfig == null ? 43 : this.preemptibleInstanceConfig.hashCode()); + result = + (result * PRIME) + + (this.licensingConfigs == null ? 43 : this.licensingConfigs.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } 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 3a80ae16463..5cd604b21ec 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 @@ -54,7 +54,8 @@ public final class LaunchInstanceDetails "launchVolumeAttachments", "isPvEncryptionInTransitEnabled", "platformConfig", - "instanceConfigurationId" + "instanceConfigurationId", + "licensingConfigs" }) public LaunchInstanceDetails( String availabilityDomain, @@ -86,7 +87,8 @@ public LaunchInstanceDetails( java.util.List launchVolumeAttachments, Boolean isPvEncryptionInTransitEnabled, LaunchInstancePlatformConfig platformConfig, - String instanceConfigurationId) { + String instanceConfigurationId, + java.util.List licensingConfigs) { super(); this.availabilityDomain = availabilityDomain; this.capacityReservationId = capacityReservationId; @@ -118,6 +120,7 @@ public LaunchInstanceDetails( this.isPvEncryptionInTransitEnabled = isPvEncryptionInTransitEnabled; this.platformConfig = platformConfig; this.instanceConfigurationId = instanceConfigurationId; + this.licensingConfigs = licensingConfigs; } @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @@ -801,6 +804,22 @@ public Builder instanceConfigurationId(String instanceConfigurationId) { this.__explicitlySet__.add("instanceConfigurationId"); return this; } + /** List of licensing configurations associated with target launch values. */ + @com.fasterxml.jackson.annotation.JsonProperty("licensingConfigs") + private java.util.List licensingConfigs; + + /** + * List of licensing configurations associated with target launch values. + * + * @param licensingConfigs the value to set + * @return this builder + */ + public Builder licensingConfigs( + java.util.List licensingConfigs) { + this.licensingConfigs = licensingConfigs; + this.__explicitlySet__.add("licensingConfigs"); + return this; + } @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -837,7 +856,8 @@ public LaunchInstanceDetails build() { this.launchVolumeAttachments, this.isPvEncryptionInTransitEnabled, this.platformConfig, - this.instanceConfigurationId); + this.instanceConfigurationId, + this.licensingConfigs); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -936,6 +956,9 @@ public Builder copy(LaunchInstanceDetails model) { if (model.wasPropertyExplicitlySet("instanceConfigurationId")) { this.instanceConfigurationId(model.getInstanceConfigurationId()); } + if (model.wasPropertyExplicitlySet("licensingConfigs")) { + this.licensingConfigs(model.getLicensingConfigs()); + } return this; } } @@ -1555,6 +1578,19 @@ public String getInstanceConfigurationId() { return instanceConfigurationId; } + /** List of licensing configurations associated with target launch values. */ + @com.fasterxml.jackson.annotation.JsonProperty("licensingConfigs") + private final java.util.List licensingConfigs; + + /** + * List of licensing configurations associated with target launch values. + * + * @return the value + */ + public java.util.List getLicensingConfigs() { + return licensingConfigs; + } + @Override public String toString() { return this.toString(true); @@ -1605,6 +1641,7 @@ public String toString(boolean includeByteArrayContents) { sb.append(", platformConfig=").append(String.valueOf(this.platformConfig)); sb.append(", instanceConfigurationId=") .append(String.valueOf(this.instanceConfigurationId)); + sb.append(", licensingConfigs=").append(String.valueOf(this.licensingConfigs)); sb.append(")"); return sb.toString(); } @@ -1654,6 +1691,7 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.platformConfig, other.platformConfig) && java.util.Objects.equals( this.instanceConfigurationId, other.instanceConfigurationId) + && java.util.Objects.equals(this.licensingConfigs, other.licensingConfigs) && super.equals(other); } @@ -1747,6 +1785,9 @@ public int hashCode() { + (this.instanceConfigurationId == null ? 43 : this.instanceConfigurationId.hashCode()); + result = + (result * PRIME) + + (this.licensingConfigs == null ? 43 : this.licensingConfigs.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceLicensingConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceLicensingConfig.java new file mode 100644 index 00000000000..1ec8d570e1a --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceLicensingConfig.java @@ -0,0 +1,191 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.core.model; + +/** + * The license config requested for the instance.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type", + defaultImpl = LaunchInstanceLicensingConfig.class) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = LaunchInstanceWindowsLicensingConfig.class, + name = "WINDOWS") +}) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public class LaunchInstanceLicensingConfig + extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({"licenseType"}) + protected LaunchInstanceLicensingConfig(LicenseType licenseType) { + super(); + this.licenseType = licenseType; + } + + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + */ + public enum LicenseType implements com.oracle.bmc.http.internal.BmcEnum { + OciProvided("OCI_PROVIDED"), + BringYourOwnLicense("BRING_YOUR_OWN_LICENSE"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(LicenseType.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (LicenseType v : LicenseType.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + LicenseType(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static LicenseType create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'LicenseType', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + */ + @com.fasterxml.jackson.annotation.JsonProperty("licenseType") + private final LicenseType licenseType; + + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + * + * @return the value + */ + public LicenseType getLicenseType() { + return licenseType; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("LaunchInstanceLicensingConfig("); + sb.append("super=").append(super.toString()); + sb.append("licenseType=").append(String.valueOf(this.licenseType)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof LaunchInstanceLicensingConfig)) { + return false; + } + + LaunchInstanceLicensingConfig other = (LaunchInstanceLicensingConfig) o; + return java.util.Objects.equals(this.licenseType, other.licenseType) && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + (this.licenseType == null ? 43 : this.licenseType.hashCode()); + result = (result * PRIME) + super.hashCode(); + return result; + } + + /** Operating System type of the Configuration. */ + public enum Type implements com.oracle.bmc.http.internal.BmcEnum { + Windows("WINDOWS"), + + /** + * 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 static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(Type.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (Type v : Type.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + Type(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); + return UnknownEnumValue; + } + }; +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceWindowsLicensingConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceWindowsLicensingConfig.java new file mode 100644 index 00000000000..8243deedbaf --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/LaunchInstanceWindowsLicensingConfig.java @@ -0,0 +1,112 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.core.model; + +/** + * The default windows licensing config.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = LaunchInstanceWindowsLicensingConfig.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class LaunchInstanceWindowsLicensingConfig extends LaunchInstanceLicensingConfig { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("licenseType") + private LicenseType licenseType; + + public Builder licenseType(LicenseType licenseType) { + this.licenseType = licenseType; + this.__explicitlySet__.add("licenseType"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public LaunchInstanceWindowsLicensingConfig build() { + LaunchInstanceWindowsLicensingConfig model = + new LaunchInstanceWindowsLicensingConfig(this.licenseType); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(LaunchInstanceWindowsLicensingConfig model) { + if (model.wasPropertyExplicitlySet("licenseType")) { + this.licenseType(model.getLicenseType()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public LaunchInstanceWindowsLicensingConfig(LicenseType licenseType) { + super(licenseType); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("LaunchInstanceWindowsLicensingConfig("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof LaunchInstanceWindowsLicensingConfig)) { + return false; + } + + LaunchInstanceWindowsLicensingConfig other = (LaunchInstanceWindowsLicensingConfig) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + return result; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/LicensingConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/LicensingConfig.java new file mode 100644 index 00000000000..d5f5e9dd154 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/LicensingConfig.java @@ -0,0 +1,304 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.core.model; + +/** + * Configuration of the Operating System license.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = LicensingConfig.Builder.class) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class LicensingConfig + extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({"type", "licenseType", "osVersion"}) + public LicensingConfig(Type type, LicenseType licenseType, String osVersion) { + super(); + this.type = type; + this.licenseType = licenseType; + this.osVersion = osVersion; + } + + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + /** Operating System type of the Configuration. */ + @com.fasterxml.jackson.annotation.JsonProperty("type") + private Type type; + + /** + * Operating System type of the Configuration. + * + * @param type the value to set + * @return this builder + */ + public Builder type(Type type) { + this.type = type; + this.__explicitlySet__.add("type"); + return this; + } + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. + * metered $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + */ + @com.fasterxml.jackson.annotation.JsonProperty("licenseType") + private LicenseType licenseType; + + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. + * metered $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + * + * @param licenseType the value to set + * @return this builder + */ + public Builder licenseType(LicenseType licenseType) { + this.licenseType = licenseType; + this.__explicitlySet__.add("licenseType"); + return this; + } + /** The Operating System version of the license config. */ + @com.fasterxml.jackson.annotation.JsonProperty("osVersion") + private String osVersion; + + /** + * The Operating System version of the license config. + * + * @param osVersion the value to set + * @return this builder + */ + public Builder osVersion(String osVersion) { + this.osVersion = osVersion; + this.__explicitlySet__.add("osVersion"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public LicensingConfig build() { + LicensingConfig model = + new LicensingConfig(this.type, this.licenseType, this.osVersion); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(LicensingConfig model) { + if (model.wasPropertyExplicitlySet("type")) { + this.type(model.getType()); + } + if (model.wasPropertyExplicitlySet("licenseType")) { + this.licenseType(model.getLicenseType()); + } + if (model.wasPropertyExplicitlySet("osVersion")) { + this.osVersion(model.getOsVersion()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + /** Operating System type of the Configuration. */ + public enum Type implements com.oracle.bmc.http.internal.BmcEnum { + Windows("WINDOWS"), + + /** + * 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 static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(Type.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (Type v : Type.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + Type(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'Type', returning UnknownEnumValue", key); + return UnknownEnumValue; + } + }; + /** Operating System type of the Configuration. */ + @com.fasterxml.jackson.annotation.JsonProperty("type") + private final Type type; + + /** + * Operating System type of the Configuration. + * + * @return the value + */ + public Type getType() { + return type; + } + + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + */ + public enum LicenseType implements com.oracle.bmc.http.internal.BmcEnum { + OciProvided("OCI_PROVIDED"), + BringYourOwnLicense("BRING_YOUR_OWN_LICENSE"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(LicenseType.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (LicenseType v : LicenseType.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + LicenseType(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static LicenseType create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'LicenseType', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } + }; + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + */ + @com.fasterxml.jackson.annotation.JsonProperty("licenseType") + private final LicenseType licenseType; + + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + * + * @return the value + */ + public LicenseType getLicenseType() { + return licenseType; + } + + /** The Operating System version of the license config. */ + @com.fasterxml.jackson.annotation.JsonProperty("osVersion") + private final String osVersion; + + /** + * The Operating System version of the license config. + * + * @return the value + */ + public String getOsVersion() { + return osVersion; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("LicensingConfig("); + sb.append("super=").append(super.toString()); + sb.append("type=").append(String.valueOf(this.type)); + sb.append(", licenseType=").append(String.valueOf(this.licenseType)); + sb.append(", osVersion=").append(String.valueOf(this.osVersion)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof LicensingConfig)) { + return false; + } + + LicensingConfig other = (LicensingConfig) o; + return java.util.Objects.equals(this.type, other.type) + && java.util.Objects.equals(this.licenseType, other.licenseType) + && java.util.Objects.equals(this.osVersion, other.osVersion) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + (this.type == null ? 43 : this.type.hashCode()); + result = (result * PRIME) + (this.licenseType == null ? 43 : this.licenseType.hashCode()); + result = (result * PRIME) + (this.osVersion == null ? 43 : this.osVersion.hashCode()); + result = (result * PRIME) + super.hashCode(); + return result; + } +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java index 883d1511635..9b16497a94a 100644 --- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceDetails.java @@ -42,7 +42,8 @@ public final class UpdateInstanceDetails "availabilityConfig", "timeMaintenanceRebootDue", "dedicatedVmHostId", - "platformConfig" + "platformConfig", + "licensingConfigs" }) public UpdateInstanceDetails( String capacityReservationId, @@ -63,7 +64,8 @@ public UpdateInstanceDetails( UpdateInstanceAvailabilityConfigDetails availabilityConfig, java.util.Date timeMaintenanceRebootDue, String dedicatedVmHostId, - UpdateInstancePlatformConfig platformConfig) { + UpdateInstancePlatformConfig platformConfig, + java.util.List licensingConfigs) { super(); this.capacityReservationId = capacityReservationId; this.definedTags = definedTags; @@ -84,6 +86,7 @@ public UpdateInstanceDetails( this.timeMaintenanceRebootDue = timeMaintenanceRebootDue; this.dedicatedVmHostId = dedicatedVmHostId; this.platformConfig = platformConfig; + this.licensingConfigs = licensingConfigs; } @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @@ -549,6 +552,22 @@ public Builder platformConfig(UpdateInstancePlatformConfig platformConfig) { this.__explicitlySet__.add("platformConfig"); return this; } + /** The list of liscensing configurations with target update values. */ + @com.fasterxml.jackson.annotation.JsonProperty("licensingConfigs") + private java.util.List licensingConfigs; + + /** + * The list of liscensing configurations with target update values. + * + * @param licensingConfigs the value to set + * @return this builder + */ + public Builder licensingConfigs( + java.util.List licensingConfigs) { + this.licensingConfigs = licensingConfigs; + this.__explicitlySet__.add("licensingConfigs"); + return this; + } @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -574,7 +593,8 @@ public UpdateInstanceDetails build() { this.availabilityConfig, this.timeMaintenanceRebootDue, this.dedicatedVmHostId, - this.platformConfig); + this.platformConfig, + this.licensingConfigs); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -640,6 +660,9 @@ public Builder copy(UpdateInstanceDetails model) { if (model.wasPropertyExplicitlySet("platformConfig")) { this.platformConfig(model.getPlatformConfig()); } + if (model.wasPropertyExplicitlySet("licensingConfigs")) { + this.licensingConfigs(model.getLicensingConfigs()); + } return this; } } @@ -1108,6 +1131,19 @@ public UpdateInstancePlatformConfig getPlatformConfig() { return platformConfig; } + /** The list of liscensing configurations with target update values. */ + @com.fasterxml.jackson.annotation.JsonProperty("licensingConfigs") + private final java.util.List licensingConfigs; + + /** + * The list of liscensing configurations with target update values. + * + * @return the value + */ + public java.util.List getLicensingConfigs() { + return licensingConfigs; + } + @Override public String toString() { return this.toString(true); @@ -1144,6 +1180,7 @@ public String toString(boolean includeByteArrayContents) { .append(String.valueOf(this.timeMaintenanceRebootDue)); sb.append(", dedicatedVmHostId=").append(String.valueOf(this.dedicatedVmHostId)); sb.append(", platformConfig=").append(String.valueOf(this.platformConfig)); + sb.append(", licensingConfigs=").append(String.valueOf(this.licensingConfigs)); sb.append(")"); return sb.toString(); } @@ -1179,6 +1216,7 @@ public boolean equals(Object o) { this.timeMaintenanceRebootDue, other.timeMaintenanceRebootDue) && java.util.Objects.equals(this.dedicatedVmHostId, other.dedicatedVmHostId) && java.util.Objects.equals(this.platformConfig, other.platformConfig) + && java.util.Objects.equals(this.licensingConfigs, other.licensingConfigs) && super.equals(other); } @@ -1237,6 +1275,9 @@ public int hashCode() { result = (result * PRIME) + (this.platformConfig == null ? 43 : this.platformConfig.hashCode()); + result = + (result * PRIME) + + (this.licensingConfigs == null ? 43 : this.licensingConfigs.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceLicensingConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceLicensingConfig.java new file mode 100644 index 00000000000..6791a21841d --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceLicensingConfig.java @@ -0,0 +1,167 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.core.model; + +/** + * The target license config to be updated on the instance.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type", + defaultImpl = UpdateInstanceLicensingConfig.class) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = UpdateInstanceWindowsLicensingConfig.class, + name = "WINDOWS") +}) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public class UpdateInstanceLicensingConfig + extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({"licenseType"}) + protected UpdateInstanceLicensingConfig(LicenseType licenseType) { + super(); + this.licenseType = licenseType; + } + + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + */ + public enum LicenseType implements com.oracle.bmc.http.internal.BmcEnum { + OciProvided("OCI_PROVIDED"), + BringYourOwnLicense("BRING_YOUR_OWN_LICENSE"), + ; + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (LicenseType v : LicenseType.values()) { + map.put(v.getValue(), v); + } + } + + LicenseType(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static LicenseType create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + throw new IllegalArgumentException("Invalid LicenseType: " + key); + } + }; + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + */ + @com.fasterxml.jackson.annotation.JsonProperty("licenseType") + private final LicenseType licenseType; + + /** + * License Type for the OS license. * {@code OCI_PROVIDED} - OCI provided license (e.g. metered + * $/OCPU-hour). * {@code BRING_YOUR_OWN_LICENSE} - Bring your own license. + * + * @return the value + */ + public LicenseType getLicenseType() { + return licenseType; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("UpdateInstanceLicensingConfig("); + sb.append("super=").append(super.toString()); + sb.append("licenseType=").append(String.valueOf(this.licenseType)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof UpdateInstanceLicensingConfig)) { + return false; + } + + UpdateInstanceLicensingConfig other = (UpdateInstanceLicensingConfig) o; + return java.util.Objects.equals(this.licenseType, other.licenseType) && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + (this.licenseType == null ? 43 : this.licenseType.hashCode()); + result = (result * PRIME) + super.hashCode(); + return result; + } + + /** Operating system type of the configuration. */ + public enum Type implements com.oracle.bmc.http.internal.BmcEnum { + Windows("WINDOWS"), + ; + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (Type v : Type.values()) { + map.put(v.getValue(), v); + } + } + + Type(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + throw new IllegalArgumentException("Invalid Type: " + key); + } + }; +} diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceWindowsLicensingConfig.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceWindowsLicensingConfig.java new file mode 100644 index 00000000000..2b150a80ae8 --- /dev/null +++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateInstanceWindowsLicensingConfig.java @@ -0,0 +1,112 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.core.model; + +/** + * The default windows licensing config.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = UpdateInstanceWindowsLicensingConfig.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class UpdateInstanceWindowsLicensingConfig extends UpdateInstanceLicensingConfig { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("licenseType") + private LicenseType licenseType; + + public Builder licenseType(LicenseType licenseType) { + this.licenseType = licenseType; + this.__explicitlySet__.add("licenseType"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public UpdateInstanceWindowsLicensingConfig build() { + UpdateInstanceWindowsLicensingConfig model = + new UpdateInstanceWindowsLicensingConfig(this.licenseType); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(UpdateInstanceWindowsLicensingConfig model) { + if (model.wasPropertyExplicitlySet("licenseType")) { + this.licenseType(model.getLicenseType()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public UpdateInstanceWindowsLicensingConfig(LicenseType licenseType) { + super(licenseType); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("UpdateInstanceWindowsLicensingConfig("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof UpdateInstanceWindowsLicensingConfig)) { + return false; + } + + UpdateInstanceWindowsLicensingConfig other = (UpdateInstanceWindowsLicensingConfig) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + return result; + } +} diff --git a/bmc-core/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-core/reflect-config.json b/bmc-core/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-core/reflect-config.json index 1e1c27cf7dd..b6e153340ea 100644 --- a/bmc-core/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-core/reflect-config.json +++ b/bmc-core/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-core/reflect-config.json @@ -6443,6 +6443,25 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LaunchInstanceLicensingConfig", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LaunchInstanceLicensingConfig$Type", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LaunchInstanceLicensingConfig$LicenseType", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.core.model.LaunchInstancePlatformConfig", @@ -6476,6 +6495,20 @@ "allDeclaredFields": true, "allDeclaredMethods": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LaunchInstanceWindowsLicensingConfig", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LaunchInstanceWindowsLicensingConfig$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.core.model.LaunchOptions", @@ -6534,6 +6567,32 @@ "allDeclaredFields": true, "allDeclaredMethods": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LicensingConfig", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LicensingConfig$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LicensingConfig$Type", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.LicensingConfig$LicenseType", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.core.model.ListIpInventoryDetails", @@ -8539,6 +8598,25 @@ "allDeclaredFields": true, "allDeclaredMethods": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.UpdateInstanceLicensingConfig", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.UpdateInstanceLicensingConfig$Type", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.UpdateInstanceLicensingConfig$LicenseType", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.core.model.UpdateInstanceMaintenanceEventDetails", @@ -8649,6 +8727,20 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.UpdateInstanceWindowsLicensingConfig", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.core.model.UpdateInstanceWindowsLicensingConfig$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.core.model.UpdateInternetGatewayDetails", diff --git a/bmc-core/src/main/resources/com/oracle/bmc/core/client.properties b/bmc-core/src/main/resources/com/oracle/bmc/core/client.properties index 73df68dc2f1..0ca15ebfe64 100644 --- a/bmc-core/src/main/resources/com/oracle/bmc/core/client.properties +++ b/bmc-core/src/main/resources/com/oracle/bmc/core/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") \ No newline at end of file diff --git a/bmc-dashboardservice/pom.xml b/bmc-dashboardservice/pom.xml index ae5abd841bf..3fb603cd312 100644 --- a/bmc-dashboardservice/pom.xml +++ b/bmc-dashboardservice/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-dashboardservice @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-dashboardservice/src/main/resources/com/oracle/bmc/dashboardservice/client.properties b/bmc-dashboardservice/src/main/resources/com/oracle/bmc/dashboardservice/client.properties index f6078d01831..968063f7298 100644 --- a/bmc-dashboardservice/src/main/resources/com/oracle/bmc/dashboardservice/client.properties +++ b/bmc-dashboardservice/src/main/resources/com/oracle/bmc/dashboardservice/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210731") \ No newline at end of file diff --git a/bmc-database/pom.xml b/bmc-database/pom.xml index b5fda927272..a7626d4841f 100644 --- a/bmc-database/pom.xml +++ b/bmc-database/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,12 +18,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-workrequests - 3.54.0 + 3.55.0 diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseAsyncClient.java b/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseAsyncClient.java index 4ac9db78a9a..efbe85c0696 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseAsyncClient.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseAsyncClient.java @@ -12830,6 +12830,7 @@ public java.util.concurrent.Future restoreDatabase( .appendHeader("if-match", request.getIfMatch()) .appendHeader("opc-retry-token", request.getOpcRetryToken()) .appendHeader("opc-request-id", request.getOpcRequestId()) + .hasBody() .handleBody( com.oracle.bmc.database.model.AutonomousContainerDatabase.class, RotateAutonomousContainerDatabaseEncryptionKeyResponse.Builder @@ -12877,6 +12878,7 @@ public java.util.concurrent.Future restoreDatabase( .appendHeader("if-match", request.getIfMatch()) .appendHeader("opc-retry-token", request.getOpcRetryToken()) .appendHeader("opc-request-id", request.getOpcRequestId()) + .hasBody() .handleBody( com.oracle.bmc.database.model.AutonomousDatabase.class, RotateAutonomousDatabaseEncryptionKeyResponse.Builder::autonomousDatabase) diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseClient.java b/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseClient.java index a5cbd79a53c..a5c6aa5dd40 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseClient.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/DatabaseClient.java @@ -11491,6 +11491,7 @@ public RestoreDatabaseResponse restoreDatabase(RestoreDatabaseRequest request) { .appendHeader("if-match", request.getIfMatch()) .appendHeader("opc-retry-token", request.getOpcRetryToken()) .appendHeader("opc-request-id", request.getOpcRequestId()) + .hasBody() .handleBody( com.oracle.bmc.database.model.AutonomousContainerDatabase.class, RotateAutonomousContainerDatabaseEncryptionKeyResponse.Builder @@ -11533,6 +11534,7 @@ public RotateAutonomousDatabaseEncryptionKeyResponse rotateAutonomousDatabaseEnc .appendHeader("if-match", request.getIfMatch()) .appendHeader("opc-retry-token", request.getOpcRetryToken()) .appendHeader("opc-request-id", request.getOpcRequestId()) + .hasBody() .handleBody( com.oracle.bmc.database.model.AutonomousDatabase.class, RotateAutonomousDatabaseEncryptionKeyResponse.Builder::autonomousDatabase) diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/RotateAutonomousContainerDatabaseEncryptionKeyDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/RotateAutonomousContainerDatabaseEncryptionKeyDetails.java new file mode 100644 index 00000000000..019a86bc389 --- /dev/null +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/RotateAutonomousContainerDatabaseEncryptionKeyDetails.java @@ -0,0 +1,144 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.database.model; + +/** + * Key details provided by the user for rotate key operation for Autonomous 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = RotateAutonomousContainerDatabaseEncryptionKeyDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class RotateAutonomousContainerDatabaseEncryptionKeyDetails + extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({"keyVersionId"}) + public RotateAutonomousContainerDatabaseEncryptionKeyDetails(String keyVersionId) { + super(); + this.keyVersionId = keyVersionId; + } + + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + /** + * Key version ocid of the key provided by the user for rotate operation. + * [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). + */ + @com.fasterxml.jackson.annotation.JsonProperty("keyVersionId") + private String keyVersionId; + + /** + * Key version ocid of the key provided by the user for rotate operation. + * [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). + * + * @param keyVersionId the value to set + * @return this builder + */ + public Builder keyVersionId(String keyVersionId) { + this.keyVersionId = keyVersionId; + this.__explicitlySet__.add("keyVersionId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public RotateAutonomousContainerDatabaseEncryptionKeyDetails build() { + RotateAutonomousContainerDatabaseEncryptionKeyDetails model = + new RotateAutonomousContainerDatabaseEncryptionKeyDetails(this.keyVersionId); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(RotateAutonomousContainerDatabaseEncryptionKeyDetails model) { + if (model.wasPropertyExplicitlySet("keyVersionId")) { + this.keyVersionId(model.getKeyVersionId()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + /** + * Key version ocid of the key provided by the user for rotate operation. + * [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). + */ + @com.fasterxml.jackson.annotation.JsonProperty("keyVersionId") + private final String keyVersionId; + + /** + * Key version ocid of the key provided by the user for rotate operation. + * [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). + * + * @return the value + */ + public String getKeyVersionId() { + return keyVersionId; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("RotateAutonomousContainerDatabaseEncryptionKeyDetails("); + sb.append("super=").append(super.toString()); + sb.append("keyVersionId=").append(String.valueOf(this.keyVersionId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RotateAutonomousContainerDatabaseEncryptionKeyDetails)) { + return false; + } + + RotateAutonomousContainerDatabaseEncryptionKeyDetails other = + (RotateAutonomousContainerDatabaseEncryptionKeyDetails) o; + return java.util.Objects.equals(this.keyVersionId, other.keyVersionId) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + (this.keyVersionId == null ? 43 : this.keyVersionId.hashCode()); + result = (result * PRIME) + super.hashCode(); + return result; + } +} diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/model/RotateAutonomousDatabaseEncryptionKeyDetails.java b/bmc-database/src/main/java/com/oracle/bmc/database/model/RotateAutonomousDatabaseEncryptionKeyDetails.java new file mode 100644 index 00000000000..3a9beea39fb --- /dev/null +++ b/bmc-database/src/main/java/com/oracle/bmc/database/model/RotateAutonomousDatabaseEncryptionKeyDetails.java @@ -0,0 +1,144 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.database.model; + +/** + * Key details provided by the user for rotate key operation for Autonomous 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = RotateAutonomousDatabaseEncryptionKeyDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class RotateAutonomousDatabaseEncryptionKeyDetails + extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({"keyVersionId"}) + public RotateAutonomousDatabaseEncryptionKeyDetails(String keyVersionId) { + super(); + this.keyVersionId = keyVersionId; + } + + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + /** + * Key version ocid of the key provided by the user for rotate operation. + * [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). + */ + @com.fasterxml.jackson.annotation.JsonProperty("keyVersionId") + private String keyVersionId; + + /** + * Key version ocid of the key provided by the user for rotate operation. + * [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). + * + * @param keyVersionId the value to set + * @return this builder + */ + public Builder keyVersionId(String keyVersionId) { + this.keyVersionId = keyVersionId; + this.__explicitlySet__.add("keyVersionId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public RotateAutonomousDatabaseEncryptionKeyDetails build() { + RotateAutonomousDatabaseEncryptionKeyDetails model = + new RotateAutonomousDatabaseEncryptionKeyDetails(this.keyVersionId); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(RotateAutonomousDatabaseEncryptionKeyDetails model) { + if (model.wasPropertyExplicitlySet("keyVersionId")) { + this.keyVersionId(model.getKeyVersionId()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + /** + * Key version ocid of the key provided by the user for rotate operation. + * [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). + */ + @com.fasterxml.jackson.annotation.JsonProperty("keyVersionId") + private final String keyVersionId; + + /** + * Key version ocid of the key provided by the user for rotate operation. + * [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). + * + * @return the value + */ + public String getKeyVersionId() { + return keyVersionId; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("RotateAutonomousDatabaseEncryptionKeyDetails("); + sb.append("super=").append(super.toString()); + sb.append("keyVersionId=").append(String.valueOf(this.keyVersionId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RotateAutonomousDatabaseEncryptionKeyDetails)) { + return false; + } + + RotateAutonomousDatabaseEncryptionKeyDetails other = + (RotateAutonomousDatabaseEncryptionKeyDetails) o; + return java.util.Objects.equals(this.keyVersionId, other.keyVersionId) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + (this.keyVersionId == null ? 43 : this.keyVersionId.hashCode()); + result = (result * PRIME) + super.hashCode(); + return result; + } +} diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/RotateAutonomousContainerDatabaseEncryptionKeyRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/RotateAutonomousContainerDatabaseEncryptionKeyRequest.java index a218e8f46a5..4a7fd821d0e 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/RotateAutonomousContainerDatabaseEncryptionKeyRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/RotateAutonomousContainerDatabaseEncryptionKeyRequest.java @@ -13,7 +13,9 @@ */ @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") public class RotateAutonomousContainerDatabaseEncryptionKeyRequest - extends com.oracle.bmc.requests.BmcRequest { + extends com.oracle.bmc.requests.BmcRequest< + com.oracle.bmc.database.model + .RotateAutonomousContainerDatabaseEncryptionKeyDetails> { /** * The Autonomous Container Database @@ -71,10 +73,33 @@ public String getOpcRetryToken() { public String getOpcRequestId() { return opcRequestId; } + /** Key details provided by the user for rotate key operation for Autonomous Database. */ + private com.oracle.bmc.database.model.RotateAutonomousContainerDatabaseEncryptionKeyDetails + rotateAutonomousContainerDatabaseEncryptionKeyDetails; + + /** Key details provided by the user for rotate key operation for Autonomous Database. */ + public com.oracle.bmc.database.model.RotateAutonomousContainerDatabaseEncryptionKeyDetails + getRotateAutonomousContainerDatabaseEncryptionKeyDetails() { + return rotateAutonomousContainerDatabaseEncryptionKeyDetails; + } + + /** + * Alternative accessor for the body parameter. + * + * @return body parameter + */ + @Override + @com.oracle.bmc.InternalSdk + public com.oracle.bmc.database.model.RotateAutonomousContainerDatabaseEncryptionKeyDetails + getBody$() { + return rotateAutonomousContainerDatabaseEncryptionKeyDetails; + } public static class Builder implements com.oracle.bmc.requests.BmcRequest.Builder< - RotateAutonomousContainerDatabaseEncryptionKeyRequest, java.lang.Void> { + RotateAutonomousContainerDatabaseEncryptionKeyRequest, + com.oracle.bmc.database.model + .RotateAutonomousContainerDatabaseEncryptionKeyDetails> { private com.oracle.bmc.http.client.RequestInterceptor invocationCallback = null; private com.oracle.bmc.retrier.RetryConfiguration retryConfiguration = null; @@ -156,6 +181,24 @@ public Builder opcRequestId(String opcRequestId) { return this; } + /** Key details provided by the user for rotate key operation for Autonomous Database. */ + private com.oracle.bmc.database.model.RotateAutonomousContainerDatabaseEncryptionKeyDetails + rotateAutonomousContainerDatabaseEncryptionKeyDetails = null; + + /** + * Key details provided by the user for rotate key operation for Autonomous Database. + * + * @param rotateAutonomousContainerDatabaseEncryptionKeyDetails the value to set + * @return this builder instance + */ + public Builder rotateAutonomousContainerDatabaseEncryptionKeyDetails( + com.oracle.bmc.database.model.RotateAutonomousContainerDatabaseEncryptionKeyDetails + rotateAutonomousContainerDatabaseEncryptionKeyDetails) { + this.rotateAutonomousContainerDatabaseEncryptionKeyDetails = + rotateAutonomousContainerDatabaseEncryptionKeyDetails; + return this; + } + /** * Set the invocation callback for the request to be built. * @@ -190,6 +233,8 @@ public Builder copy(RotateAutonomousContainerDatabaseEncryptionKeyRequest o) { ifMatch(o.getIfMatch()); opcRetryToken(o.getOpcRetryToken()); opcRequestId(o.getOpcRequestId()); + rotateAutonomousContainerDatabaseEncryptionKeyDetails( + o.getRotateAutonomousContainerDatabaseEncryptionKeyDetails()); invocationCallback(o.getInvocationCallback()); retryConfiguration(o.getRetryConfiguration()); return this; @@ -215,6 +260,20 @@ public RotateAutonomousContainerDatabaseEncryptionKeyRequest build() { return request; } + /** + * Alternative setter for the body parameter. + * + * @param body the body parameter + * @return this builder instance + */ + @com.oracle.bmc.InternalSdk + public Builder body$( + com.oracle.bmc.database.model.RotateAutonomousContainerDatabaseEncryptionKeyDetails + body) { + rotateAutonomousContainerDatabaseEncryptionKeyDetails(body); + return this; + } + /** * Build the instance of RotateAutonomousContainerDatabaseEncryptionKeyRequest as configured * by this builder @@ -233,10 +292,13 @@ public RotateAutonomousContainerDatabaseEncryptionKeyRequest build() { request.ifMatch = ifMatch; request.opcRetryToken = opcRetryToken; request.opcRequestId = opcRequestId; + request.rotateAutonomousContainerDatabaseEncryptionKeyDetails = + rotateAutonomousContainerDatabaseEncryptionKeyDetails; return request; // new // RotateAutonomousContainerDatabaseEncryptionKeyRequest(autonomousContainerDatabaseId, - // ifMatch, opcRetryToken, opcRequestId); + // ifMatch, opcRetryToken, opcRequestId, + // rotateAutonomousContainerDatabaseEncryptionKeyDetails); } } @@ -250,7 +312,9 @@ public Builder toBuilder() { .autonomousContainerDatabaseId(autonomousContainerDatabaseId) .ifMatch(ifMatch) .opcRetryToken(opcRetryToken) - .opcRequestId(opcRequestId); + .opcRequestId(opcRequestId) + .rotateAutonomousContainerDatabaseEncryptionKeyDetails( + rotateAutonomousContainerDatabaseEncryptionKeyDetails); } /** @@ -272,6 +336,8 @@ public String toString() { sb.append(",ifMatch=").append(String.valueOf(this.ifMatch)); sb.append(",opcRetryToken=").append(String.valueOf(this.opcRetryToken)); sb.append(",opcRequestId=").append(String.valueOf(this.opcRequestId)); + sb.append(",rotateAutonomousContainerDatabaseEncryptionKeyDetails=") + .append(String.valueOf(this.rotateAutonomousContainerDatabaseEncryptionKeyDetails)); sb.append(")"); return sb.toString(); } @@ -292,7 +358,10 @@ public boolean equals(Object o) { this.autonomousContainerDatabaseId, other.autonomousContainerDatabaseId) && java.util.Objects.equals(this.ifMatch, other.ifMatch) && java.util.Objects.equals(this.opcRetryToken, other.opcRetryToken) - && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId) + && java.util.Objects.equals( + this.rotateAutonomousContainerDatabaseEncryptionKeyDetails, + other.rotateAutonomousContainerDatabaseEncryptionKeyDetails); } @Override @@ -309,6 +378,12 @@ public int hashCode() { (result * PRIME) + (this.opcRetryToken == null ? 43 : this.opcRetryToken.hashCode()); result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + result = + (result * PRIME) + + (this.rotateAutonomousContainerDatabaseEncryptionKeyDetails == null + ? 43 + : this.rotateAutonomousContainerDatabaseEncryptionKeyDetails + .hashCode()); return result; } } diff --git a/bmc-database/src/main/java/com/oracle/bmc/database/requests/RotateAutonomousDatabaseEncryptionKeyRequest.java b/bmc-database/src/main/java/com/oracle/bmc/database/requests/RotateAutonomousDatabaseEncryptionKeyRequest.java index 6ad752b2649..90ddb3f19be 100644 --- a/bmc-database/src/main/java/com/oracle/bmc/database/requests/RotateAutonomousDatabaseEncryptionKeyRequest.java +++ b/bmc-database/src/main/java/com/oracle/bmc/database/requests/RotateAutonomousDatabaseEncryptionKeyRequest.java @@ -13,7 +13,8 @@ */ @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") public class RotateAutonomousDatabaseEncryptionKeyRequest - extends com.oracle.bmc.requests.BmcRequest { + extends com.oracle.bmc.requests.BmcRequest< + com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails> { /** * The database [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm). @@ -69,10 +70,31 @@ public String getOpcRetryToken() { public String getOpcRequestId() { return opcRequestId; } + /** Key details provided by the user for rotate key operation for Autonomous Database. */ + private com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails + rotateAutonomousDatabaseEncryptionKeyDetails; + + /** Key details provided by the user for rotate key operation for Autonomous Database. */ + public com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails + getRotateAutonomousDatabaseEncryptionKeyDetails() { + return rotateAutonomousDatabaseEncryptionKeyDetails; + } + + /** + * Alternative accessor for the body parameter. + * + * @return body parameter + */ + @Override + @com.oracle.bmc.InternalSdk + public com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails getBody$() { + return rotateAutonomousDatabaseEncryptionKeyDetails; + } public static class Builder implements com.oracle.bmc.requests.BmcRequest.Builder< - RotateAutonomousDatabaseEncryptionKeyRequest, java.lang.Void> { + RotateAutonomousDatabaseEncryptionKeyRequest, + com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails> { private com.oracle.bmc.http.client.RequestInterceptor invocationCallback = null; private com.oracle.bmc.retrier.RetryConfiguration retryConfiguration = null; @@ -154,6 +176,24 @@ public Builder opcRequestId(String opcRequestId) { return this; } + /** Key details provided by the user for rotate key operation for Autonomous Database. */ + private com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails + rotateAutonomousDatabaseEncryptionKeyDetails = null; + + /** + * Key details provided by the user for rotate key operation for Autonomous Database. + * + * @param rotateAutonomousDatabaseEncryptionKeyDetails the value to set + * @return this builder instance + */ + public Builder rotateAutonomousDatabaseEncryptionKeyDetails( + com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails + rotateAutonomousDatabaseEncryptionKeyDetails) { + this.rotateAutonomousDatabaseEncryptionKeyDetails = + rotateAutonomousDatabaseEncryptionKeyDetails; + return this; + } + /** * Set the invocation callback for the request to be built. * @@ -188,6 +228,8 @@ public Builder copy(RotateAutonomousDatabaseEncryptionKeyRequest o) { ifMatch(o.getIfMatch()); opcRetryToken(o.getOpcRetryToken()); opcRequestId(o.getOpcRequestId()); + rotateAutonomousDatabaseEncryptionKeyDetails( + o.getRotateAutonomousDatabaseEncryptionKeyDetails()); invocationCallback(o.getInvocationCallback()); retryConfiguration(o.getRetryConfiguration()); return this; @@ -212,6 +254,19 @@ public RotateAutonomousDatabaseEncryptionKeyRequest build() { return request; } + /** + * Alternative setter for the body parameter. + * + * @param body the body parameter + * @return this builder instance + */ + @com.oracle.bmc.InternalSdk + public Builder body$( + com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails body) { + rotateAutonomousDatabaseEncryptionKeyDetails(body); + return this; + } + /** * Build the instance of RotateAutonomousDatabaseEncryptionKeyRequest as configured by this * builder @@ -229,9 +284,11 @@ public RotateAutonomousDatabaseEncryptionKeyRequest buildWithoutInvocationCallba request.ifMatch = ifMatch; request.opcRetryToken = opcRetryToken; request.opcRequestId = opcRequestId; + request.rotateAutonomousDatabaseEncryptionKeyDetails = + rotateAutonomousDatabaseEncryptionKeyDetails; return request; // new RotateAutonomousDatabaseEncryptionKeyRequest(autonomousDatabaseId, ifMatch, - // opcRetryToken, opcRequestId); + // opcRetryToken, opcRequestId, rotateAutonomousDatabaseEncryptionKeyDetails); } } @@ -245,7 +302,9 @@ public Builder toBuilder() { .autonomousDatabaseId(autonomousDatabaseId) .ifMatch(ifMatch) .opcRetryToken(opcRetryToken) - .opcRequestId(opcRequestId); + .opcRequestId(opcRequestId) + .rotateAutonomousDatabaseEncryptionKeyDetails( + rotateAutonomousDatabaseEncryptionKeyDetails); } /** @@ -266,6 +325,8 @@ public String toString() { sb.append(",ifMatch=").append(String.valueOf(this.ifMatch)); sb.append(",opcRetryToken=").append(String.valueOf(this.opcRetryToken)); sb.append(",opcRequestId=").append(String.valueOf(this.opcRequestId)); + sb.append(",rotateAutonomousDatabaseEncryptionKeyDetails=") + .append(String.valueOf(this.rotateAutonomousDatabaseEncryptionKeyDetails)); sb.append(")"); return sb.toString(); } @@ -285,7 +346,10 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.autonomousDatabaseId, other.autonomousDatabaseId) && java.util.Objects.equals(this.ifMatch, other.ifMatch) && java.util.Objects.equals(this.opcRetryToken, other.opcRetryToken) - && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId) + && java.util.Objects.equals( + this.rotateAutonomousDatabaseEncryptionKeyDetails, + other.rotateAutonomousDatabaseEncryptionKeyDetails); } @Override @@ -302,6 +366,11 @@ public int hashCode() { (result * PRIME) + (this.opcRetryToken == null ? 43 : this.opcRetryToken.hashCode()); result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + result = + (result * PRIME) + + (this.rotateAutonomousDatabaseEncryptionKeyDetails == null + ? 43 + : this.rotateAutonomousDatabaseEncryptionKeyDetails.hashCode()); return result; } } diff --git a/bmc-database/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-database/reflect-config.json b/bmc-database/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-database/reflect-config.json index 6a5171f7516..c69e81301bd 100644 --- a/bmc-database/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-database/reflect-config.json +++ b/bmc-database/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-database/reflect-config.json @@ -7497,6 +7497,34 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.database.model.RotateAutonomousContainerDatabaseEncryptionKeyDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.database.model.RotateAutonomousContainerDatabaseEncryptionKeyDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.database.model.RotateAutonomousDatabaseEncryptionKeyDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.database.model.RotateAutonomousVmClusterOrdsCertsDetails", diff --git a/bmc-database/src/main/resources/com/oracle/bmc/database/client.properties b/bmc-database/src/main/resources/com/oracle/bmc/database/client.properties index 73df68dc2f1..0ca15ebfe64 100644 --- a/bmc-database/src/main/resources/com/oracle/bmc/database/client.properties +++ b/bmc-database/src/main/resources/com/oracle/bmc/database/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") \ No newline at end of file diff --git a/bmc-databasemanagement/pom.xml b/bmc-databasemanagement/pom.xml index ab593e132a4..4279ef69c16 100644 --- a/bmc-databasemanagement/pom.xml +++ b/bmc-databasemanagement/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-databasemanagement @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-databasemanagement/src/main/resources/com/oracle/bmc/databasemanagement/client.properties b/bmc-databasemanagement/src/main/resources/com/oracle/bmc/databasemanagement/client.properties index 961255feaf1..e7fd67d26ea 100644 --- a/bmc-databasemanagement/src/main/resources/com/oracle/bmc/databasemanagement/client.properties +++ b/bmc-databasemanagement/src/main/resources/com/oracle/bmc/databasemanagement/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20201101") \ No newline at end of file diff --git a/bmc-databasemigration/pom.xml b/bmc-databasemigration/pom.xml index 807f5cf000c..cf0dac52e43 100644 --- a/bmc-databasemigration/pom.xml +++ b/bmc-databasemigration/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-databasemigration @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-databasemigration/src/main/resources/com/oracle/bmc/databasemigration/client.properties b/bmc-databasemigration/src/main/resources/com/oracle/bmc/databasemigration/client.properties index 9304f0810ea..b6170f2e7b1 100644 --- a/bmc-databasemigration/src/main/resources/com/oracle/bmc/databasemigration/client.properties +++ b/bmc-databasemigration/src/main/resources/com/oracle/bmc/databasemigration/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230518") \ No newline at end of file diff --git a/bmc-databasetools/pom.xml b/bmc-databasetools/pom.xml index 0855d35d2b4..422042571a2 100644 --- a/bmc-databasetools/pom.xml +++ b/bmc-databasetools/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-databasetools @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-databasetools/src/main/resources/com/oracle/bmc/databasetools/client.properties b/bmc-databasetools/src/main/resources/com/oracle/bmc/databasetools/client.properties index a59800f1d07..a47c4067f08 100644 --- a/bmc-databasetools/src/main/resources/com/oracle/bmc/databasetools/client.properties +++ b/bmc-databasetools/src/main/resources/com/oracle/bmc/databasetools/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20201005") \ No newline at end of file diff --git a/bmc-datacatalog/pom.xml b/bmc-datacatalog/pom.xml index 2cfdf2ef1ce..5b40520f4c8 100644 --- a/bmc-datacatalog/pom.xml +++ b/bmc-datacatalog/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-datacatalog @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-datacatalog/src/main/resources/com/oracle/bmc/datacatalog/client.properties b/bmc-datacatalog/src/main/resources/com/oracle/bmc/datacatalog/client.properties index f07ea0a932b..5757401c7db 100644 --- a/bmc-datacatalog/src/main/resources/com/oracle/bmc/datacatalog/client.properties +++ b/bmc-datacatalog/src/main/resources/com/oracle/bmc/datacatalog/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190325") \ No newline at end of file diff --git a/bmc-dataflow/pom.xml b/bmc-dataflow/pom.xml index d1cb2404f38..0bb1d696c15 100644 --- a/bmc-dataflow/pom.xml +++ b/bmc-dataflow/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-dataflow @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlow.java b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlow.java index 657a69696ed..708e90772c9 100644 --- a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlow.java +++ b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlow.java @@ -65,6 +65,24 @@ public interface DataFlow extends AutoCloseable { */ void useRealmSpecificEndpointTemplate(boolean realmSpecificEndpointTemplateEnabled); + /** + * Deletes an application using an `applicationId` and terminates related runs. This operation + * will timeout in approximate 30 minutes if any related Runs are not terminated successfully. + * + * @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. This operation will not retry by default, users + * can also use RetryConfiguration.SDK_DEFAULT_RETRY_CONFIGURATION provided by the SDK to + * enable retries for it. The specifics of the default retry strategy are described here + * https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/javasdkconcepts.htm#javasdkconcepts_topic_Retries + *

Example: Click here to see how to use + * CascadingDeleteApplication API. + */ + CascadingDeleteApplicationResponse cascadingDeleteApplication( + CascadingDeleteApplicationRequest request); + /** * Moves an application into a different compartment. When provided, If-Match is checked against * ETag values of the resource. Associated resources, like runs, will not be automatically diff --git a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowAsync.java b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowAsync.java index 6741f2718ba..9f1f3be6f56 100644 --- a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowAsync.java +++ b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowAsync.java @@ -62,6 +62,23 @@ public interface DataFlowAsync extends AutoCloseable { */ void useRealmSpecificEndpointTemplate(boolean realmSpecificEndpointTemplateEnabled); + /** + * Deletes an application using an `applicationId` and terminates related runs. This operation + * will timeout in approximate 30 minutes if any related Runs are not terminated successfully. + * + * @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 cascadingDeleteApplication( + CascadingDeleteApplicationRequest request, + com.oracle.bmc.responses.AsyncHandler< + CascadingDeleteApplicationRequest, CascadingDeleteApplicationResponse> + handler); + /** * Moves an application into a different compartment. When provided, If-Match is checked against * ETag values of the resource. Associated resources, like runs, will not be automatically diff --git a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowAsyncClient.java b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowAsyncClient.java index 81d930d8d04..93f92207162 100644 --- a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowAsyncClient.java +++ b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowAsyncClient.java @@ -121,6 +121,41 @@ public void setRegion(String regionId) { super.setRegion(regionId); } + @Override + public java.util.concurrent.Future + cascadingDeleteApplication( + CascadingDeleteApplicationRequest request, + final com.oracle.bmc.responses.AsyncHandler< + CascadingDeleteApplicationRequest, + CascadingDeleteApplicationResponse> + handler) { + + Validate.notBlank(request.getApplicationId(), "applicationId must not be blank"); + + return clientCall(request, CascadingDeleteApplicationResponse::builder) + .logger(LOG, "cascadingDeleteApplication") + .serviceDetails( + "DataFlow", + "CascadingDeleteApplication", + "https://docs.oracle.com/iaas/api/#/en/data-flow/20200129/Application/CascadingDeleteApplication") + .method(com.oracle.bmc.http.client.Method.POST) + .requestBuilder(CascadingDeleteApplicationRequest::builder) + .basePath("/20200129") + .appendPathParam("applications") + .appendPathParam(request.getApplicationId()) + .appendPathParam("actions") + .appendPathParam("cascadingDeleteApplication") + .accept("application/json") + .appendHeader("opc-request-id", request.getOpcRequestId()) + .appendHeader("if-match", request.getIfMatch()) + .handleResponseHeaderString( + "opc-work-request-id", + CascadingDeleteApplicationResponse.Builder::opcWorkRequestId) + .handleResponseHeaderString( + "opc-request-id", CascadingDeleteApplicationResponse.Builder::opcRequestId) + .callAsync(handler); + } + @Override public java.util.concurrent.Future changeApplicationCompartment( diff --git a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowClient.java b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowClient.java index 34148d4d5a2..08c20178f10 100644 --- a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowClient.java +++ b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/DataFlowClient.java @@ -148,6 +148,36 @@ public void setRegion(String regionId) { super.setRegion(regionId); } + @Override + public CascadingDeleteApplicationResponse cascadingDeleteApplication( + CascadingDeleteApplicationRequest request) { + + Validate.notBlank(request.getApplicationId(), "applicationId must not be blank"); + + return clientCall(request, CascadingDeleteApplicationResponse::builder) + .logger(LOG, "cascadingDeleteApplication") + .serviceDetails( + "DataFlow", + "CascadingDeleteApplication", + "https://docs.oracle.com/iaas/api/#/en/data-flow/20200129/Application/CascadingDeleteApplication") + .method(com.oracle.bmc.http.client.Method.POST) + .requestBuilder(CascadingDeleteApplicationRequest::builder) + .basePath("/20200129") + .appendPathParam("applications") + .appendPathParam(request.getApplicationId()) + .appendPathParam("actions") + .appendPathParam("cascadingDeleteApplication") + .accept("application/json") + .appendHeader("opc-request-id", request.getOpcRequestId()) + .appendHeader("if-match", request.getIfMatch()) + .handleResponseHeaderString( + "opc-work-request-id", + CascadingDeleteApplicationResponse.Builder::opcWorkRequestId) + .handleResponseHeaderString( + "opc-request-id", CascadingDeleteApplicationResponse.Builder::opcRequestId) + .callSync(); + } + @Override public ChangeApplicationCompartmentResponse changeApplicationCompartment( ChangeApplicationCompartmentRequest request) { diff --git a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/model/ApplicationLifecycleState.java b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/model/ApplicationLifecycleState.java index a55adf890d2..88c1e2db60e 100644 --- a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/model/ApplicationLifecycleState.java +++ b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/model/ApplicationLifecycleState.java @@ -8,6 +8,7 @@ @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200129") public enum ApplicationLifecycleState implements com.oracle.bmc.http.internal.BmcEnum { Active("ACTIVE"), + Deleting("DELETING"), Deleted("DELETED"), Inactive("INACTIVE"), diff --git a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/requests/CascadingDeleteApplicationRequest.java b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/requests/CascadingDeleteApplicationRequest.java new file mode 100644 index 00000000000..516a57628fa --- /dev/null +++ b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/requests/CascadingDeleteApplicationRequest.java @@ -0,0 +1,251 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.dataflow.requests; + +import com.oracle.bmc.dataflow.model.*; +/** + * Example: Click here to see how to use + * CascadingDeleteApplicationRequest. + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200129") +public class CascadingDeleteApplicationRequest + extends com.oracle.bmc.requests.BmcRequest { + + /** The unique ID for an application. */ + private String applicationId; + + /** The unique ID for an application. */ + public String getApplicationId() { + return applicationId; + } + /** + * Unique identifier for the request. If provided, the returned request ID will include this + * value. Otherwise, a random request ID will be generated by the service. + */ + private String opcRequestId; + + /** + * Unique identifier for the request. If provided, the returned request ID will include this + * value. Otherwise, a random request ID will be generated by the service. + */ + public String getOpcRequestId() { + return opcRequestId; + } + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the {@code + * 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; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the {@code + * 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. + */ + public String getIfMatch() { + return ifMatch; + } + + public static class Builder + implements com.oracle.bmc.requests.BmcRequest.Builder< + CascadingDeleteApplicationRequest, java.lang.Void> { + private com.oracle.bmc.http.client.RequestInterceptor invocationCallback = null; + private com.oracle.bmc.retrier.RetryConfiguration retryConfiguration = null; + + /** The unique ID for an application. */ + private String applicationId = null; + + /** + * The unique ID for an application. + * + * @param applicationId the value to set + * @return this builder instance + */ + public Builder applicationId(String applicationId) { + this.applicationId = applicationId; + return this; + } + + /** + * Unique identifier for the request. If provided, the returned request ID will include this + * value. Otherwise, a random request ID will be generated by the service. + */ + private String opcRequestId = null; + + /** + * Unique identifier for the request. If provided, the returned request ID will include this + * value. Otherwise, a random request ID will be generated by the service. + * + * @param opcRequestId the value to set + * @return this builder instance + */ + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the + * {@code 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 = null; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the + * {@code 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. + * + * @param ifMatch the value to set + * @return this builder instance + */ + public Builder ifMatch(String ifMatch) { + this.ifMatch = ifMatch; + return this; + } + + /** + * 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.http.client.RequestInterceptor invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Set the retry configuration for the request to be built. + * + * @param retryConfiguration the retry configuration to be used for the request + * @return this builder instance + */ + public Builder retryConfiguration( + com.oracle.bmc.retrier.RetryConfiguration retryConfiguration) { + this.retryConfiguration = retryConfiguration; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * + * @return this builder instance + */ + public Builder copy(CascadingDeleteApplicationRequest o) { + applicationId(o.getApplicationId()); + opcRequestId(o.getOpcRequestId()); + ifMatch(o.getIfMatch()); + invocationCallback(o.getInvocationCallback()); + retryConfiguration(o.getRetryConfiguration()); + return this; + } + + /** + * Build the instance of CascadingDeleteApplicationRequest as configured by this builder + * + *

Note that this method takes calls to {@link + * Builder#invocationCallback(com.oracle.bmc.http.client.RequestInterceptor)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + *

This is the preferred method to build an instance. + * + * @return instance of CascadingDeleteApplicationRequest + */ + public CascadingDeleteApplicationRequest build() { + CascadingDeleteApplicationRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + request.setRetryConfiguration(retryConfiguration); + return request; + } + + /** + * Build the instance of CascadingDeleteApplicationRequest as configured by this builder + * + *

Note that this method does not take calls to {@link + * Builder#invocationCallback(com.oracle.bmc.http.client.RequestInterceptor)} into account, + * while the method {@link Builder#build} does + * + * @return instance of CascadingDeleteApplicationRequest + */ + public CascadingDeleteApplicationRequest buildWithoutInvocationCallback() { + CascadingDeleteApplicationRequest request = new CascadingDeleteApplicationRequest(); + request.applicationId = applicationId; + request.opcRequestId = opcRequestId; + request.ifMatch = ifMatch; + return request; + // new CascadingDeleteApplicationRequest(applicationId, opcRequestId, ifMatch); + } + } + + /** + * Return an instance of {@link Builder} that allows you to modify request properties. + * + * @return instance of {@link Builder} that allows you to modify request properties. + */ + public Builder toBuilder() { + return new Builder() + .applicationId(applicationId) + .opcRequestId(opcRequestId) + .ifMatch(ifMatch); + } + + /** + * Return a new builder for this request object. + * + * @return builder for the request object + */ + public static Builder builder() { + return new Builder(); + } + + @Override + public String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("("); + sb.append("super=").append(super.toString()); + sb.append(",applicationId=").append(String.valueOf(this.applicationId)); + sb.append(",opcRequestId=").append(String.valueOf(this.opcRequestId)); + sb.append(",ifMatch=").append(String.valueOf(this.ifMatch)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof CascadingDeleteApplicationRequest)) { + return false; + } + + CascadingDeleteApplicationRequest other = (CascadingDeleteApplicationRequest) o; + return super.equals(o) + && java.util.Objects.equals(this.applicationId, other.applicationId) + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId) + && java.util.Objects.equals(this.ifMatch, other.ifMatch); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.applicationId == null ? 43 : this.applicationId.hashCode()); + result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + result = (result * PRIME) + (this.ifMatch == null ? 43 : this.ifMatch.hashCode()); + return result; + } +} diff --git a/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/responses/CascadingDeleteApplicationResponse.java b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/responses/CascadingDeleteApplicationResponse.java new file mode 100644 index 00000000000..08341db3e62 --- /dev/null +++ b/bmc-dataflow/src/main/java/com/oracle/bmc/dataflow/responses/CascadingDeleteApplicationResponse.java @@ -0,0 +1,178 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.dataflow.responses; + +import com.oracle.bmc.dataflow.model.*; + +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200129") +public class CascadingDeleteApplicationResponse extends com.oracle.bmc.responses.BmcResponse { + /** Unique Oracle assigned identifier for a work request. */ + private String opcWorkRequestId; + + /** + * Unique Oracle assigned identifier for a work request. + * + * @return the value + */ + public String getOpcWorkRequestId() { + return opcWorkRequestId; + } + + /** + * 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; + + /** + * Unique Oracle assigned identifier for the request. If you need to contact Oracle about a + * particular request, please provide the request ID. + * + * @return the value + */ + public String getOpcRequestId() { + return opcRequestId; + } + + @java.beans.ConstructorProperties({ + "__httpStatusCode__", + "headers", + "opcWorkRequestId", + "opcRequestId" + }) + private CascadingDeleteApplicationResponse( + int __httpStatusCode__, + java.util.Map> headers, + String opcWorkRequestId, + String opcRequestId) { + super(__httpStatusCode__, headers); + this.opcWorkRequestId = opcWorkRequestId; + this.opcRequestId = opcRequestId; + } + + public static class Builder + implements com.oracle.bmc.responses.BmcResponse.Builder< + CascadingDeleteApplicationResponse> { + private int __httpStatusCode__; + + @Override + public Builder __httpStatusCode__(int __httpStatusCode__) { + this.__httpStatusCode__ = __httpStatusCode__; + return this; + } + + private java.util.Map> headers; + + @Override + public Builder headers(java.util.Map> headers) { + this.headers = headers; + return this; + } + + /** Unique Oracle assigned identifier for a work request. */ + private String opcWorkRequestId; + + /** + * Unique Oracle assigned identifier for a work request. + * + * @param opcWorkRequestId the value to set + * @return this builder + */ + public Builder opcWorkRequestId(String opcWorkRequestId) { + this.opcWorkRequestId = opcWorkRequestId; + return this; + } + + /** + * 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; + + /** + * Unique Oracle assigned identifier for the request. If you need to contact Oracle about a + * particular request, please provide the request ID. + * + * @param opcRequestId the value to set + * @return this builder + */ + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * + * @return this builder instance + */ + @Override + public Builder copy(CascadingDeleteApplicationResponse o) { + __httpStatusCode__(o.get__httpStatusCode__()); + headers(o.getHeaders()); + opcWorkRequestId(o.getOpcWorkRequestId()); + opcRequestId(o.getOpcRequestId()); + + return this; + } + + /** + * Build the response object. + * + * @return the response object + */ + @Override + public CascadingDeleteApplicationResponse build() { + return new CascadingDeleteApplicationResponse( + __httpStatusCode__, headers, opcWorkRequestId, opcRequestId); + } + } + + /** + * Return a new builder for this response object. + * + * @return builder for the response object + */ + public static Builder builder() { + return new Builder(); + } + + @Override + public String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("("); + sb.append("super=").append(super.toString()); + sb.append(",opcWorkRequestId=").append(String.valueOf(opcWorkRequestId)); + sb.append(",opcRequestId=").append(String.valueOf(opcRequestId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof CascadingDeleteApplicationResponse)) { + return false; + } + + CascadingDeleteApplicationResponse other = (CascadingDeleteApplicationResponse) o; + return super.equals(o) + && java.util.Objects.equals(this.opcWorkRequestId, other.opcWorkRequestId) + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.opcWorkRequestId == null ? 43 : this.opcWorkRequestId.hashCode()); + result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + return result; + } +} diff --git a/bmc-dataflow/src/main/resources/com/oracle/bmc/dataflow/client.properties b/bmc-dataflow/src/main/resources/com/oracle/bmc/dataflow/client.properties index f6bfedea309..e6afb7c5349 100644 --- a/bmc-dataflow/src/main/resources/com/oracle/bmc/dataflow/client.properties +++ b/bmc-dataflow/src/main/resources/com/oracle/bmc/dataflow/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200129") \ No newline at end of file diff --git a/bmc-dataintegration/pom.xml b/bmc-dataintegration/pom.xml index eca2bcdec48..880721e4aee 100644 --- a/bmc-dataintegration/pom.xml +++ b/bmc-dataintegration/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-dataintegration @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-dataintegration/src/main/resources/com/oracle/bmc/dataintegration/client.properties b/bmc-dataintegration/src/main/resources/com/oracle/bmc/dataintegration/client.properties index b5d9eac8f8a..dc8dd144906 100644 --- a/bmc-dataintegration/src/main/resources/com/oracle/bmc/dataintegration/client.properties +++ b/bmc-dataintegration/src/main/resources/com/oracle/bmc/dataintegration/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200430") \ No newline at end of file diff --git a/bmc-datalabelingservice/pom.xml b/bmc-datalabelingservice/pom.xml index ebd91cc94af..78e3e758db3 100644 --- a/bmc-datalabelingservice/pom.xml +++ b/bmc-datalabelingservice/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-datalabelingservice @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-datalabelingservice/src/main/resources/com/oracle/bmc/datalabelingservice/client.properties b/bmc-datalabelingservice/src/main/resources/com/oracle/bmc/datalabelingservice/client.properties index bec244aded0..b1d9f6bfa28 100644 --- a/bmc-datalabelingservice/src/main/resources/com/oracle/bmc/datalabelingservice/client.properties +++ b/bmc-datalabelingservice/src/main/resources/com/oracle/bmc/datalabelingservice/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20211001") \ No newline at end of file diff --git a/bmc-datalabelingservicedataplane/pom.xml b/bmc-datalabelingservicedataplane/pom.xml index 2c2e52b863b..f3b37821219 100644 --- a/bmc-datalabelingservicedataplane/pom.xml +++ b/bmc-datalabelingservicedataplane/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-datalabelingservicedataplane @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-datalabelingservicedataplane/src/main/resources/com/oracle/bmc/datalabelingservicedataplane/client.properties b/bmc-datalabelingservicedataplane/src/main/resources/com/oracle/bmc/datalabelingservicedataplane/client.properties index bec244aded0..b1d9f6bfa28 100644 --- a/bmc-datalabelingservicedataplane/src/main/resources/com/oracle/bmc/datalabelingservicedataplane/client.properties +++ b/bmc-datalabelingservicedataplane/src/main/resources/com/oracle/bmc/datalabelingservicedataplane/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20211001") \ No newline at end of file diff --git a/bmc-datasafe/pom.xml b/bmc-datasafe/pom.xml index 06cb91c370a..ae3fbad8bf2 100644 --- a/bmc-datasafe/pom.xml +++ b/bmc-datasafe/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-datasafe @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-datasafe/src/main/resources/com/oracle/bmc/datasafe/client.properties b/bmc-datasafe/src/main/resources/com/oracle/bmc/datasafe/client.properties index f5c0d9ad84f..758eca6b499 100644 --- a/bmc-datasafe/src/main/resources/com/oracle/bmc/datasafe/client.properties +++ b/bmc-datasafe/src/main/resources/com/oracle/bmc/datasafe/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181201") \ No newline at end of file diff --git a/bmc-datascience/pom.xml b/bmc-datascience/pom.xml index 1f80073d533..9921854cf40 100644 --- a/bmc-datascience/pom.xml +++ b/bmc-datascience/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-datascience @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-datascience/src/main/resources/com/oracle/bmc/datascience/client.properties b/bmc-datascience/src/main/resources/com/oracle/bmc/datascience/client.properties index b2ffe0b1801..1228fc727a7 100644 --- a/bmc-datascience/src/main/resources/com/oracle/bmc/datascience/client.properties +++ b/bmc-datascience/src/main/resources/com/oracle/bmc/datascience/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190101") \ No newline at end of file diff --git a/bmc-delegateaccesscontrol/pom.xml b/bmc-delegateaccesscontrol/pom.xml index 67aae6d0068..3654cb8a190 100644 --- a/bmc-delegateaccesscontrol/pom.xml +++ b/bmc-delegateaccesscontrol/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-delegateaccesscontrol @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-delegateaccesscontrol/src/main/resources/com/oracle/bmc/delegateaccesscontrol/client.properties b/bmc-delegateaccesscontrol/src/main/resources/com/oracle/bmc/delegateaccesscontrol/client.properties index 0447d7c5238..82792b34625 100644 --- a/bmc-delegateaccesscontrol/src/main/resources/com/oracle/bmc/delegateaccesscontrol/client.properties +++ b/bmc-delegateaccesscontrol/src/main/resources/com/oracle/bmc/delegateaccesscontrol/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230801") \ No newline at end of file diff --git a/bmc-demandsignal/pom.xml b/bmc-demandsignal/pom.xml index 8944503b8e8..d4910b9e7ab 100644 --- a/bmc-demandsignal/pom.xml +++ b/bmc-demandsignal/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-demandsignal @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-demandsignal/src/main/resources/com/oracle/bmc/demandsignal/client.properties b/bmc-demandsignal/src/main/resources/com/oracle/bmc/demandsignal/client.properties index 50b50b22f0d..be82145b2f3 100644 --- a/bmc-demandsignal/src/main/resources/com/oracle/bmc/demandsignal/client.properties +++ b/bmc-demandsignal/src/main/resources/com/oracle/bmc/demandsignal/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20240430") \ No newline at end of file diff --git a/bmc-desktops/pom.xml b/bmc-desktops/pom.xml index 4a3fcfd682f..71e8d7b7d0e 100644 --- a/bmc-desktops/pom.xml +++ b/bmc-desktops/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-desktops @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-desktops/src/main/resources/com/oracle/bmc/desktops/client.properties b/bmc-desktops/src/main/resources/com/oracle/bmc/desktops/client.properties index 55299c1b1f5..85cdc7a9eb8 100644 --- a/bmc-desktops/src/main/resources/com/oracle/bmc/desktops/client.properties +++ b/bmc-desktops/src/main/resources/com/oracle/bmc/desktops/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220618") \ No newline at end of file diff --git a/bmc-devops/pom.xml b/bmc-devops/pom.xml index 8867fdd9598..608a68e5d57 100644 --- a/bmc-devops/pom.xml +++ b/bmc-devops/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-devops @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-devops/src/main/resources/com/oracle/bmc/devops/client.properties b/bmc-devops/src/main/resources/com/oracle/bmc/devops/client.properties index 657d8786311..46ea16ba359 100644 --- a/bmc-devops/src/main/resources/com/oracle/bmc/devops/client.properties +++ b/bmc-devops/src/main/resources/com/oracle/bmc/devops/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210630") \ No newline at end of file diff --git a/bmc-disasterrecovery/pom.xml b/bmc-disasterrecovery/pom.xml index 54b09edca01..5cac4d9a7a9 100644 --- a/bmc-disasterrecovery/pom.xml +++ b/bmc-disasterrecovery/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-disasterrecovery @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecovery.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecovery.java index 87907350573..f8200c9ec45 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecovery.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecovery.java @@ -436,6 +436,21 @@ DisassociateDrProtectionGroupResponse disassociateDrProtectionGroup( */ PauseDrPlanExecutionResponse pauseDrPlanExecution(PauseDrPlanExecutionRequest request); + /** + * Refresh DR Plan identified by *drPlanId*. + * + * @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. This operation uses + * RetryConfiguration.SDK_DEFAULT_RETRY_CONFIGURATION as default if no retry strategy is + * provided. The specifics of the default retry strategy are described here + * https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/javasdkconcepts.htm#javasdkconcepts_topic_Retries + *

Example: Click here to see how to use RefreshDrPlan API. + */ + RefreshDrPlanResponse refreshDrPlan(RefreshDrPlanRequest request); + /** * Resume the DR plan execution identified by *drPlanExecutionId*. * @@ -533,6 +548,21 @@ DisassociateDrProtectionGroupResponse disassociateDrProtectionGroup( UpdateDrProtectionGroupRoleResponse updateDrProtectionGroupRole( UpdateDrProtectionGroupRoleRequest request); + /** + * Verify DR Plan identified by *drPlanId*. + * + * @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. This operation uses + * RetryConfiguration.SDK_DEFAULT_RETRY_CONFIGURATION as default if no retry strategy is + * provided. The specifics of the default retry strategy are described here + * https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/javasdkconcepts.htm#javasdkconcepts_topic_Retries + *

Example: Click here to see how to use VerifyDrPlan API. + */ + VerifyDrPlanResponse verifyDrPlan(VerifyDrPlanRequest request); + /** * Gets the pre-configured waiters available for resources for this service. * diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryAsync.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryAsync.java index fa43ca70c3f..9b984764eca 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryAsync.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryAsync.java @@ -431,6 +431,21 @@ java.util.concurrent.Future pauseDrPlanExecution( PauseDrPlanExecutionRequest, PauseDrPlanExecutionResponse> handler); + /** + * Refresh DR Plan identified by *drPlanId*. + * + * @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 refreshDrPlan( + RefreshDrPlanRequest request, + com.oracle.bmc.responses.AsyncHandler + handler); + /** * Resume the DR plan execution identified by *drPlanExecutionId*. * @@ -526,4 +541,19 @@ java.util.concurrent.Future updateDrProtect com.oracle.bmc.responses.AsyncHandler< UpdateDrProtectionGroupRoleRequest, UpdateDrProtectionGroupRoleResponse> handler); + + /** + * Verify DR Plan identified by *drPlanId*. + * + * @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 verifyDrPlan( + VerifyDrPlanRequest request, + com.oracle.bmc.responses.AsyncHandler + handler); } diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryAsyncClient.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryAsyncClient.java index 0ec4779e0c3..c5dcde71be1 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryAsyncClient.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryAsyncClient.java @@ -714,6 +714,7 @@ public java.util.concurrent.Future listDrPlans( .appendQueryParam("page", request.getPage()) .appendEnumQueryParam("sortOrder", request.getSortOrder()) .appendEnumQueryParam("sortBy", request.getSortBy()) + .appendEnumQueryParam("lifecycleSubState", request.getLifecycleSubState()) .accept("application/json") .appendHeader("opc-request-id", request.getOpcRequestId()) .handleBody( @@ -915,6 +916,41 @@ public java.util.concurrent.Future pauseDrPlanExec .callAsync(handler); } + @Override + public java.util.concurrent.Future refreshDrPlan( + RefreshDrPlanRequest request, + final com.oracle.bmc.responses.AsyncHandler + handler) { + Objects.requireNonNull( + request.getRefreshDrPlanDetails(), "refreshDrPlanDetails is required"); + + Validate.notBlank(request.getDrPlanId(), "drPlanId must not be blank"); + + return clientCall(request, RefreshDrPlanResponse::builder) + .logger(LOG, "refreshDrPlan") + .serviceDetails( + "DisasterRecovery", + "RefreshDrPlan", + "https://docs.oracle.com/iaas/api/#/en/disaster-recovery/20220125/DrPlan/RefreshDrPlan") + .method(com.oracle.bmc.http.client.Method.POST) + .requestBuilder(RefreshDrPlanRequest::builder) + .basePath("/20220125") + .appendPathParam("drPlans") + .appendPathParam(request.getDrPlanId()) + .appendPathParam("actions") + .appendPathParam("refresh") + .accept("application/json") + .appendHeader("if-match", request.getIfMatch()) + .appendHeader("opc-retry-token", request.getOpcRetryToken()) + .appendHeader("opc-request-id", request.getOpcRequestId()) + .hasBody() + .handleResponseHeaderString( + "opc-work-request-id", RefreshDrPlanResponse.Builder::opcWorkRequestId) + .handleResponseHeaderString( + "opc-request-id", RefreshDrPlanResponse.Builder::opcRequestId) + .callAsync(handler); + } + @Override public java.util.concurrent.Future resumeDrPlanExecution( ResumeDrPlanExecutionRequest request, @@ -1134,6 +1170,40 @@ public java.util.concurrent.Future updateDrProt .callAsync(handler); } + @Override + public java.util.concurrent.Future verifyDrPlan( + VerifyDrPlanRequest request, + final com.oracle.bmc.responses.AsyncHandler + handler) { + Objects.requireNonNull(request.getVerifyDrPlanDetails(), "verifyDrPlanDetails is required"); + + Validate.notBlank(request.getDrPlanId(), "drPlanId must not be blank"); + + return clientCall(request, VerifyDrPlanResponse::builder) + .logger(LOG, "verifyDrPlan") + .serviceDetails( + "DisasterRecovery", + "VerifyDrPlan", + "https://docs.oracle.com/iaas/api/#/en/disaster-recovery/20220125/DrPlan/VerifyDrPlan") + .method(com.oracle.bmc.http.client.Method.POST) + .requestBuilder(VerifyDrPlanRequest::builder) + .basePath("/20220125") + .appendPathParam("drPlans") + .appendPathParam(request.getDrPlanId()) + .appendPathParam("actions") + .appendPathParam("verify") + .accept("application/json") + .appendHeader("if-match", request.getIfMatch()) + .appendHeader("opc-retry-token", request.getOpcRetryToken()) + .appendHeader("opc-request-id", request.getOpcRequestId()) + .hasBody() + .handleResponseHeaderString( + "opc-work-request-id", VerifyDrPlanResponse.Builder::opcWorkRequestId) + .handleResponseHeaderString( + "opc-request-id", VerifyDrPlanResponse.Builder::opcRequestId) + .callAsync(handler); + } + /** * Create a new client instance. * diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryClient.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryClient.java index 5276c6f798b..671afbf351d 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryClient.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/DisasterRecoveryClient.java @@ -693,6 +693,7 @@ public ListDrPlansResponse listDrPlans(ListDrPlansRequest request) { .appendQueryParam("page", request.getPage()) .appendEnumQueryParam("sortOrder", request.getSortOrder()) .appendEnumQueryParam("sortBy", request.getSortBy()) + .appendEnumQueryParam("lifecycleSubState", request.getLifecycleSubState()) .accept("application/json") .appendHeader("opc-request-id", request.getOpcRequestId()) .operationUsesDefaultRetries() @@ -882,6 +883,39 @@ public PauseDrPlanExecutionResponse pauseDrPlanExecution(PauseDrPlanExecutionReq .callSync(); } + @Override + public RefreshDrPlanResponse refreshDrPlan(RefreshDrPlanRequest request) { + Objects.requireNonNull( + request.getRefreshDrPlanDetails(), "refreshDrPlanDetails is required"); + + Validate.notBlank(request.getDrPlanId(), "drPlanId must not be blank"); + + return clientCall(request, RefreshDrPlanResponse::builder) + .logger(LOG, "refreshDrPlan") + .serviceDetails( + "DisasterRecovery", + "RefreshDrPlan", + "https://docs.oracle.com/iaas/api/#/en/disaster-recovery/20220125/DrPlan/RefreshDrPlan") + .method(com.oracle.bmc.http.client.Method.POST) + .requestBuilder(RefreshDrPlanRequest::builder) + .basePath("/20220125") + .appendPathParam("drPlans") + .appendPathParam(request.getDrPlanId()) + .appendPathParam("actions") + .appendPathParam("refresh") + .accept("application/json") + .appendHeader("if-match", request.getIfMatch()) + .appendHeader("opc-retry-token", request.getOpcRetryToken()) + .appendHeader("opc-request-id", request.getOpcRequestId()) + .operationUsesDefaultRetries() + .hasBody() + .handleResponseHeaderString( + "opc-work-request-id", RefreshDrPlanResponse.Builder::opcWorkRequestId) + .handleResponseHeaderString( + "opc-request-id", RefreshDrPlanResponse.Builder::opcRequestId) + .callSync(); + } + @Override public ResumeDrPlanExecutionResponse resumeDrPlanExecution( ResumeDrPlanExecutionRequest request) { @@ -1086,6 +1120,38 @@ public UpdateDrProtectionGroupRoleResponse updateDrProtectionGroupRole( .callSync(); } + @Override + public VerifyDrPlanResponse verifyDrPlan(VerifyDrPlanRequest request) { + Objects.requireNonNull(request.getVerifyDrPlanDetails(), "verifyDrPlanDetails is required"); + + Validate.notBlank(request.getDrPlanId(), "drPlanId must not be blank"); + + return clientCall(request, VerifyDrPlanResponse::builder) + .logger(LOG, "verifyDrPlan") + .serviceDetails( + "DisasterRecovery", + "VerifyDrPlan", + "https://docs.oracle.com/iaas/api/#/en/disaster-recovery/20220125/DrPlan/VerifyDrPlan") + .method(com.oracle.bmc.http.client.Method.POST) + .requestBuilder(VerifyDrPlanRequest::builder) + .basePath("/20220125") + .appendPathParam("drPlans") + .appendPathParam(request.getDrPlanId()) + .appendPathParam("actions") + .appendPathParam("verify") + .accept("application/json") + .appendHeader("if-match", request.getIfMatch()) + .appendHeader("opc-retry-token", request.getOpcRetryToken()) + .appendHeader("opc-request-id", request.getOpcRequestId()) + .operationUsesDefaultRetries() + .hasBody() + .handleResponseHeaderString( + "opc-work-request-id", VerifyDrPlanResponse.Builder::opcWorkRequestId) + .handleResponseHeaderString( + "opc-request-id", VerifyDrPlanResponse.Builder::opcRequestId) + .callSync(); + } + @Override public DisasterRecoveryWaiters getWaiters() { return waiters; diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/CreateDrPlanDetails.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/CreateDrPlanDetails.java index 263dc6f8a10..1f80c1e24d0 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/CreateDrPlanDetails.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/CreateDrPlanDetails.java @@ -27,6 +27,7 @@ public final class CreateDrPlanDetails "displayName", "type", "drProtectionGroupId", + "sourcePlanId", "freeformTags", "definedTags" }) @@ -34,12 +35,14 @@ public CreateDrPlanDetails( String displayName, DrPlanType type, String drProtectionGroupId, + String sourcePlanId, java.util.Map freeformTags, java.util.Map> definedTags) { super(); this.displayName = displayName; this.type = type; this.drProtectionGroupId = drProtectionGroupId; + this.sourcePlanId = sourcePlanId; this.freeformTags = freeformTags; this.definedTags = definedTags; } @@ -103,6 +106,27 @@ public Builder drProtectionGroupId(String drProtectionGroupId) { this.__explicitlySet__.add("drProtectionGroupId"); return this; } + /** + * The OCID of the source DR plan that should be cloned. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + @com.fasterxml.jackson.annotation.JsonProperty("sourcePlanId") + private String sourcePlanId; + + /** + * The OCID of the source DR plan that should be cloned. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + * + * @param sourcePlanId the value to set + * @return this builder + */ + public Builder sourcePlanId(String sourcePlanId) { + this.sourcePlanId = sourcePlanId; + this.__explicitlySet__.add("sourcePlanId"); + return this; + } /** * Simple key-value pair that is applied without any predefined name, type or scope. Exists * for cross-compatibility only. @@ -158,6 +182,7 @@ public CreateDrPlanDetails build() { this.displayName, this.type, this.drProtectionGroupId, + this.sourcePlanId, this.freeformTags, this.definedTags); for (String explicitlySetProperty : this.__explicitlySet__) { @@ -177,6 +202,9 @@ public Builder copy(CreateDrPlanDetails model) { if (model.wasPropertyExplicitlySet("drProtectionGroupId")) { this.drProtectionGroupId(model.getDrProtectionGroupId()); } + if (model.wasPropertyExplicitlySet("sourcePlanId")) { + this.sourcePlanId(model.getSourcePlanId()); + } if (model.wasPropertyExplicitlySet("freeformTags")) { this.freeformTags(model.getFreeformTags()); } @@ -247,6 +275,25 @@ public String getDrProtectionGroupId() { return drProtectionGroupId; } + /** + * The OCID of the source DR plan that should be cloned. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + @com.fasterxml.jackson.annotation.JsonProperty("sourcePlanId") + private final String sourcePlanId; + + /** + * The OCID of the source DR plan that should be cloned. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + * + * @return the value + */ + public String getSourcePlanId() { + return sourcePlanId; + } + /** * Simple key-value pair that is applied without any predefined name, type or scope. Exists for * cross-compatibility only. @@ -305,6 +352,7 @@ public String toString(boolean includeByteArrayContents) { sb.append("displayName=").append(String.valueOf(this.displayName)); sb.append(", type=").append(String.valueOf(this.type)); sb.append(", drProtectionGroupId=").append(String.valueOf(this.drProtectionGroupId)); + sb.append(", sourcePlanId=").append(String.valueOf(this.sourcePlanId)); sb.append(", freeformTags=").append(String.valueOf(this.freeformTags)); sb.append(", definedTags=").append(String.valueOf(this.definedTags)); sb.append(")"); @@ -324,6 +372,7 @@ public boolean equals(Object o) { return java.util.Objects.equals(this.displayName, other.displayName) && java.util.Objects.equals(this.type, other.type) && java.util.Objects.equals(this.drProtectionGroupId, other.drProtectionGroupId) + && java.util.Objects.equals(this.sourcePlanId, other.sourcePlanId) && java.util.Objects.equals(this.freeformTags, other.freeformTags) && java.util.Objects.equals(this.definedTags, other.definedTags) && super.equals(other); @@ -340,6 +389,7 @@ public int hashCode() { + (this.drProtectionGroupId == null ? 43 : this.drProtectionGroupId.hashCode()); + result = (result * PRIME) + (this.sourcePlanId == null ? 43 : this.sourcePlanId.hashCode()); result = (result * PRIME) + (this.freeformTags == null ? 43 : this.freeformTags.hashCode()); result = (result * PRIME) + (this.definedTags == null ? 43 : this.definedTags.hashCode()); result = (result * PRIME) + super.hashCode(); diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlan.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlan.java index efbd241d2dc..7f155500978 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlan.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlan.java @@ -31,8 +31,10 @@ public final class DrPlan extends com.oracle.bmc.http.client.internal.Explicitly "drProtectionGroupId", "peerDrProtectionGroupId", "peerRegion", + "sourcePlanId", "planGroups", "lifecycleState", + "lifecycleSubState", "lifeCycleDetails", "freeformTags", "definedTags", @@ -48,8 +50,10 @@ public DrPlan( String drProtectionGroupId, String peerDrProtectionGroupId, String peerRegion, + String sourcePlanId, java.util.List planGroups, DrPlanLifecycleState lifecycleState, + DrPlanLifecycleSubState lifecycleSubState, String lifeCycleDetails, java.util.Map freeformTags, java.util.Map> definedTags, @@ -64,8 +68,10 @@ public DrPlan( this.drProtectionGroupId = drProtectionGroupId; this.peerDrProtectionGroupId = peerDrProtectionGroupId; this.peerRegion = peerRegion; + this.sourcePlanId = sourcePlanId; this.planGroups = planGroups; this.lifecycleState = lifecycleState; + this.lifecycleSubState = lifecycleSubState; this.lifeCycleDetails = lifeCycleDetails; this.freeformTags = freeformTags; this.definedTags = definedTags; @@ -259,6 +265,29 @@ public Builder peerRegion(String peerRegion) { this.__explicitlySet__.add("peerRegion"); return this; } + /** + * If this is a cloned DR plan, the OCID of the source DR plan that was used to clone this + * DR plan. If this DR plan was not cloned, then the value for this will be {@code null}. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + @com.fasterxml.jackson.annotation.JsonProperty("sourcePlanId") + private String sourcePlanId; + + /** + * If this is a cloned DR plan, the OCID of the source DR plan that was used to clone this + * DR plan. If this DR plan was not cloned, then the value for this will be {@code null}. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + * + * @param sourcePlanId the value to set + * @return this builder + */ + public Builder sourcePlanId(String sourcePlanId) { + this.sourcePlanId = sourcePlanId; + this.__explicitlySet__.add("sourcePlanId"); + return this; + } /** The list of groups in this DR plan. */ @com.fasterxml.jackson.annotation.JsonProperty("planGroups") private java.util.List planGroups; @@ -289,6 +318,21 @@ public Builder lifecycleState(DrPlanLifecycleState lifecycleState) { this.__explicitlySet__.add("lifecycleState"); return this; } + /** The current state of the DR plan. */ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleSubState") + private DrPlanLifecycleSubState lifecycleSubState; + + /** + * The current state of the DR plan. + * + * @param lifecycleSubState the value to set + * @return this builder + */ + public Builder lifecycleSubState(DrPlanLifecycleSubState lifecycleSubState) { + this.lifecycleSubState = lifecycleSubState; + this.__explicitlySet__.add("lifecycleSubState"); + return this; + } /** A message describing the DR plan's current state in more detail. */ @com.fasterxml.jackson.annotation.JsonProperty("lifeCycleDetails") private String lifeCycleDetails; @@ -386,8 +430,10 @@ public DrPlan build() { this.drProtectionGroupId, this.peerDrProtectionGroupId, this.peerRegion, + this.sourcePlanId, this.planGroups, this.lifecycleState, + this.lifecycleSubState, this.lifeCycleDetails, this.freeformTags, this.definedTags, @@ -427,12 +473,18 @@ public Builder copy(DrPlan model) { if (model.wasPropertyExplicitlySet("peerRegion")) { this.peerRegion(model.getPeerRegion()); } + if (model.wasPropertyExplicitlySet("sourcePlanId")) { + this.sourcePlanId(model.getSourcePlanId()); + } if (model.wasPropertyExplicitlySet("planGroups")) { this.planGroups(model.getPlanGroups()); } if (model.wasPropertyExplicitlySet("lifecycleState")) { this.lifecycleState(model.getLifecycleState()); } + if (model.wasPropertyExplicitlySet("lifecycleSubState")) { + this.lifecycleSubState(model.getLifecycleSubState()); + } if (model.wasPropertyExplicitlySet("lifeCycleDetails")) { this.lifeCycleDetails(model.getLifeCycleDetails()); } @@ -623,6 +675,27 @@ public String getPeerRegion() { return peerRegion; } + /** + * If this is a cloned DR plan, the OCID of the source DR plan that was used to clone this DR + * plan. If this DR plan was not cloned, then the value for this will be {@code null}. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + @com.fasterxml.jackson.annotation.JsonProperty("sourcePlanId") + private final String sourcePlanId; + + /** + * If this is a cloned DR plan, the OCID of the source DR plan that was used to clone this DR + * plan. If this DR plan was not cloned, then the value for this will be {@code null}. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + * + * @return the value + */ + public String getSourcePlanId() { + return sourcePlanId; + } + /** The list of groups in this DR plan. */ @com.fasterxml.jackson.annotation.JsonProperty("planGroups") private final java.util.List planGroups; @@ -649,6 +722,19 @@ public DrPlanLifecycleState getLifecycleState() { return lifecycleState; } + /** The current state of the DR plan. */ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleSubState") + private final DrPlanLifecycleSubState lifecycleSubState; + + /** + * The current state of the DR plan. + * + * @return the value + */ + public DrPlanLifecycleSubState getLifecycleSubState() { + return lifecycleSubState; + } + /** A message describing the DR plan's current state in more detail. */ @com.fasterxml.jackson.annotation.JsonProperty("lifeCycleDetails") private final String lifeCycleDetails; @@ -746,8 +832,10 @@ public String toString(boolean includeByteArrayContents) { sb.append(", peerDrProtectionGroupId=") .append(String.valueOf(this.peerDrProtectionGroupId)); sb.append(", peerRegion=").append(String.valueOf(this.peerRegion)); + sb.append(", sourcePlanId=").append(String.valueOf(this.sourcePlanId)); sb.append(", planGroups=").append(String.valueOf(this.planGroups)); sb.append(", lifecycleState=").append(String.valueOf(this.lifecycleState)); + sb.append(", lifecycleSubState=").append(String.valueOf(this.lifecycleSubState)); sb.append(", lifeCycleDetails=").append(String.valueOf(this.lifeCycleDetails)); sb.append(", freeformTags=").append(String.valueOf(this.freeformTags)); sb.append(", definedTags=").append(String.valueOf(this.definedTags)); @@ -776,8 +864,10 @@ public boolean equals(Object o) { && java.util.Objects.equals( this.peerDrProtectionGroupId, other.peerDrProtectionGroupId) && java.util.Objects.equals(this.peerRegion, other.peerRegion) + && java.util.Objects.equals(this.sourcePlanId, other.sourcePlanId) && java.util.Objects.equals(this.planGroups, other.planGroups) && java.util.Objects.equals(this.lifecycleState, other.lifecycleState) + && java.util.Objects.equals(this.lifecycleSubState, other.lifecycleSubState) && java.util.Objects.equals(this.lifeCycleDetails, other.lifeCycleDetails) && java.util.Objects.equals(this.freeformTags, other.freeformTags) && java.util.Objects.equals(this.definedTags, other.definedTags) @@ -808,10 +898,14 @@ public int hashCode() { ? 43 : this.peerDrProtectionGroupId.hashCode()); result = (result * PRIME) + (this.peerRegion == null ? 43 : this.peerRegion.hashCode()); + result = (result * PRIME) + (this.sourcePlanId == null ? 43 : this.sourcePlanId.hashCode()); result = (result * PRIME) + (this.planGroups == null ? 43 : this.planGroups.hashCode()); result = (result * PRIME) + (this.lifecycleState == null ? 43 : this.lifecycleState.hashCode()); + result = + (result * PRIME) + + (this.lifecycleSubState == null ? 43 : this.lifecycleSubState.hashCode()); result = (result * PRIME) + (this.lifeCycleDetails == null ? 43 : this.lifeCycleDetails.hashCode()); diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanGroup.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanGroup.java index 68c8f1bed27..0b7616d03a7 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanGroup.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanGroup.java @@ -21,16 +21,25 @@ com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) public final class DrPlanGroup extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { @Deprecated - @java.beans.ConstructorProperties({"id", "type", "displayName", "isPauseEnabled", "steps"}) + @java.beans.ConstructorProperties({ + "id", + "type", + "refreshStatus", + "displayName", + "isPauseEnabled", + "steps" + }) public DrPlanGroup( String id, DrPlanGroupType type, + DrPlanGroupRefreshStatus refreshStatus, String displayName, Boolean isPauseEnabled, java.util.List steps) { super(); this.id = id; this.type = type; + this.refreshStatus = refreshStatus; this.displayName = displayName; this.isPauseEnabled = isPauseEnabled; this.steps = steps; @@ -80,6 +89,27 @@ public Builder type(DrPlanGroupType type) { this.__explicitlySet__.add("type"); return this; } + /** + * The DR plan group refresh status. + * + *

Example: {@code GROUP_MODIFIED} + */ + @com.fasterxml.jackson.annotation.JsonProperty("refreshStatus") + private DrPlanGroupRefreshStatus refreshStatus; + + /** + * The DR plan group refresh status. + * + *

Example: {@code GROUP_MODIFIED} + * + * @param refreshStatus the value to set + * @return this builder + */ + public Builder refreshStatus(DrPlanGroupRefreshStatus refreshStatus) { + this.refreshStatus = refreshStatus; + this.__explicitlySet__.add("refreshStatus"); + return this; + } /** * The display name of the group. * @@ -148,7 +178,12 @@ public Builder steps(java.util.List steps) { public DrPlanGroup build() { DrPlanGroup model = new DrPlanGroup( - this.id, this.type, this.displayName, this.isPauseEnabled, this.steps); + this.id, + this.type, + this.refreshStatus, + this.displayName, + this.isPauseEnabled, + this.steps); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -163,6 +198,9 @@ public Builder copy(DrPlanGroup model) { if (model.wasPropertyExplicitlySet("type")) { this.type(model.getType()); } + if (model.wasPropertyExplicitlySet("refreshStatus")) { + this.refreshStatus(model.getRefreshStatus()); + } if (model.wasPropertyExplicitlySet("displayName")) { this.displayName(model.getDisplayName()); } @@ -223,6 +261,25 @@ public DrPlanGroupType getType() { return type; } + /** + * The DR plan group refresh status. + * + *

Example: {@code GROUP_MODIFIED} + */ + @com.fasterxml.jackson.annotation.JsonProperty("refreshStatus") + private final DrPlanGroupRefreshStatus refreshStatus; + + /** + * The DR plan group refresh status. + * + *

Example: {@code GROUP_MODIFIED} + * + * @return the value + */ + public DrPlanGroupRefreshStatus getRefreshStatus() { + return refreshStatus; + } + /** * The display name of the group. * @@ -295,6 +352,7 @@ public String toString(boolean includeByteArrayContents) { sb.append("super=").append(super.toString()); sb.append("id=").append(String.valueOf(this.id)); sb.append(", type=").append(String.valueOf(this.type)); + sb.append(", refreshStatus=").append(String.valueOf(this.refreshStatus)); sb.append(", displayName=").append(String.valueOf(this.displayName)); sb.append(", isPauseEnabled=").append(String.valueOf(this.isPauseEnabled)); sb.append(", steps=").append(String.valueOf(this.steps)); @@ -314,6 +372,7 @@ public boolean equals(Object o) { DrPlanGroup other = (DrPlanGroup) o; return java.util.Objects.equals(this.id, other.id) && java.util.Objects.equals(this.type, other.type) + && java.util.Objects.equals(this.refreshStatus, other.refreshStatus) && java.util.Objects.equals(this.displayName, other.displayName) && java.util.Objects.equals(this.isPauseEnabled, other.isPauseEnabled) && java.util.Objects.equals(this.steps, other.steps) @@ -326,6 +385,9 @@ public int hashCode() { int result = 1; result = (result * PRIME) + (this.id == null ? 43 : this.id.hashCode()); result = (result * PRIME) + (this.type == null ? 43 : this.type.hashCode()); + result = + (result * PRIME) + + (this.refreshStatus == null ? 43 : this.refreshStatus.hashCode()); result = (result * PRIME) + (this.displayName == null ? 43 : this.displayName.hashCode()); result = (result * PRIME) diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanGroupRefreshStatus.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanGroupRefreshStatus.java new file mode 100644 index 00000000000..84118f59373 --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanGroupRefreshStatus.java @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.model; + +/** + * The refresh status of a DR plan group. - GROUP_ADDED - DR plan group was added to the plan. - + * GROUP_DELETED - DR plan group was deleted from the plan. - GROUP_MODIFIED - DR plan group was + * modified. + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +public enum DrPlanGroupRefreshStatus implements com.oracle.bmc.http.internal.BmcEnum { + GroupAdded("GROUP_ADDED"), + GroupDeleted("GROUP_DELETED"), + GroupModified("GROUP_MODIFIED"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(DrPlanGroupRefreshStatus.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (DrPlanGroupRefreshStatus v : DrPlanGroupRefreshStatus.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + DrPlanGroupRefreshStatus(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static DrPlanGroupRefreshStatus create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'DrPlanGroupRefreshStatus', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanLifecycleSubState.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanLifecycleSubState.java new file mode 100644 index 00000000000..af043edfa99 --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanLifecycleSubState.java @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.model; + +/** + * The secondary lifecycle states of a DR plan. Provides information in addition to the lifecycle + * state. - NEEDS_REFRESH - The DR plan needs a refresh. - NEEDS_VERIFICATION - The DR plan needs + * verification. - REFRESHING - The DR plan is being updated due to a plan refresh. - VERIFYING - + * The DR plan is being updated due to a plan verification. + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +public enum DrPlanLifecycleSubState implements com.oracle.bmc.http.internal.BmcEnum { + NeedsRefresh("NEEDS_REFRESH"), + NeedsVerification("NEEDS_VERIFICATION"), + Refreshing("REFRESHING"), + Verifying("VERIFYING"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(DrPlanLifecycleSubState.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (DrPlanLifecycleSubState v : DrPlanLifecycleSubState.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + DrPlanLifecycleSubState(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static DrPlanLifecycleSubState create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'DrPlanLifecycleSubState', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStep.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStep.java index d400bb54daa..cb3b299d341 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStep.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStep.java @@ -26,6 +26,7 @@ public final class DrPlanStep extends com.oracle.bmc.http.client.internal.Explic "groupId", "memberId", "type", + "refreshStatus", "displayName", "errorMode", "timeout", @@ -37,6 +38,7 @@ public DrPlanStep( String groupId, String memberId, DrPlanStepType type, + DrPlanStepRefreshStatus refreshStatus, String displayName, DrPlanStepErrorMode errorMode, Integer timeout, @@ -47,6 +49,7 @@ public DrPlanStep( this.groupId = groupId; this.memberId = memberId; this.type = type; + this.refreshStatus = refreshStatus; this.displayName = displayName; this.errorMode = errorMode; this.timeout = timeout; @@ -134,6 +137,27 @@ public Builder type(DrPlanStepType type) { this.__explicitlySet__.add("type"); return this; } + /** + * The DR plan step refresh status. + * + *

Example: {@code STEP_ADDED} + */ + @com.fasterxml.jackson.annotation.JsonProperty("refreshStatus") + private DrPlanStepRefreshStatus refreshStatus; + + /** + * The DR plan step refresh status. + * + *

Example: {@code STEP_ADDED} + * + * @param refreshStatus the value to set + * @return this builder + */ + public Builder refreshStatus(DrPlanStepRefreshStatus refreshStatus) { + this.refreshStatus = refreshStatus; + this.__explicitlySet__.add("refreshStatus"); + return this; + } /** * The display name of the group. * @@ -232,6 +256,7 @@ public DrPlanStep build() { this.groupId, this.memberId, this.type, + this.refreshStatus, this.displayName, this.errorMode, this.timeout, @@ -257,6 +282,9 @@ public Builder copy(DrPlanStep model) { if (model.wasPropertyExplicitlySet("type")) { this.type(model.getType()); } + if (model.wasPropertyExplicitlySet("refreshStatus")) { + this.refreshStatus(model.getRefreshStatus()); + } if (model.wasPropertyExplicitlySet("displayName")) { this.displayName(model.getDisplayName()); } @@ -355,6 +383,25 @@ public DrPlanStepType getType() { return type; } + /** + * The DR plan step refresh status. + * + *

Example: {@code STEP_ADDED} + */ + @com.fasterxml.jackson.annotation.JsonProperty("refreshStatus") + private final DrPlanStepRefreshStatus refreshStatus; + + /** + * The DR plan step refresh status. + * + *

Example: {@code STEP_ADDED} + * + * @return the value + */ + public DrPlanStepRefreshStatus getRefreshStatus() { + return refreshStatus; + } + /** * The display name of the group. * @@ -451,6 +498,7 @@ public String toString(boolean includeByteArrayContents) { sb.append(", groupId=").append(String.valueOf(this.groupId)); sb.append(", memberId=").append(String.valueOf(this.memberId)); sb.append(", type=").append(String.valueOf(this.type)); + sb.append(", refreshStatus=").append(String.valueOf(this.refreshStatus)); sb.append(", displayName=").append(String.valueOf(this.displayName)); sb.append(", errorMode=").append(String.valueOf(this.errorMode)); sb.append(", timeout=").append(String.valueOf(this.timeout)); @@ -474,6 +522,7 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.groupId, other.groupId) && java.util.Objects.equals(this.memberId, other.memberId) && java.util.Objects.equals(this.type, other.type) + && java.util.Objects.equals(this.refreshStatus, other.refreshStatus) && java.util.Objects.equals(this.displayName, other.displayName) && java.util.Objects.equals(this.errorMode, other.errorMode) && java.util.Objects.equals(this.timeout, other.timeout) @@ -490,6 +539,9 @@ public int hashCode() { result = (result * PRIME) + (this.groupId == null ? 43 : this.groupId.hashCode()); result = (result * PRIME) + (this.memberId == null ? 43 : this.memberId.hashCode()); result = (result * PRIME) + (this.type == null ? 43 : this.type.hashCode()); + result = + (result * PRIME) + + (this.refreshStatus == null ? 43 : this.refreshStatus.hashCode()); result = (result * PRIME) + (this.displayName == null ? 43 : this.displayName.hashCode()); result = (result * PRIME) + (this.errorMode == null ? 43 : this.errorMode.hashCode()); result = (result * PRIME) + (this.timeout == null ? 43 : this.timeout.hashCode()); diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStepRefreshStatus.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStepRefreshStatus.java new file mode 100644 index 00000000000..36a54be15ee --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStepRefreshStatus.java @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.model; + +/** + * The refresh status of a DR plan step. - STEP_ADDED - DR plan step was added to the group. - + * STEP_DELETED - DR plan step was deleted from the group. + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +public enum DrPlanStepRefreshStatus implements com.oracle.bmc.http.internal.BmcEnum { + StepAdded("STEP_ADDED"), + StepDeleted("STEP_DELETED"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(DrPlanStepRefreshStatus.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (DrPlanStepRefreshStatus v : DrPlanStepRefreshStatus.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + DrPlanStepRefreshStatus(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static DrPlanStepRefreshStatus create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'DrPlanStepRefreshStatus', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStepType.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStepType.java index 271928626e8..04fd762ab44 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStepType.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanStepType.java @@ -4,7 +4,130 @@ */ package com.oracle.bmc.disasterrecovery.model; -/** The types of steps in a DR plan. */ +/** + * The types of steps in a DR plan. - COMPUTE_INSTANCE_STOP_PRECHECK - A precheck step for + * validating a compute instance stop. - COMPUTE_INSTANCE_LAUNCH_PRECHECK - A precheck step for + * validating a compute instance launch. - COMPUTE_INSTANCE_TERMINATE_PRECHECK - A precheck step for + * validating a compute instance termination. - COMPUTE_INSTANCE_REMOVE_PRECHECK - A precheck step + * for validating a compute instance removal. - VOLUME_GROUP_RESTORE_SWITCHOVER_PRECHECK - A + * precheck step for validating a volume group restoration during a switchover. - + * VOLUME_GROUP_RESTORE_FAILOVER_PRECHECK - A precheck step for validating a volume group + * restoration during a failover. - DATABASE_SWITCHOVER_PRECHECK - A precheck step for validating + * the database during a switchover. - DATABASE_FAILOVER_PRECHECK - A precheck step for validating + * the database during a failover. - AUTONOMOUS_DATABASE_SWITCHOVER_PRECHECK - A precheck step for + * validating an autonomous database during a switchover. - AUTONOMOUS_DATABASE_FAILOVER_PRECHECK - + * A precheck step for validating an autonomous database during a failover. - + * AUTONOMOUS_CONTAINER_DATABASE_SWITCHOVER_PRECHECK - A precheck step for validating an autonomous + * container database during a switchover. - AUTONOMOUS_CONTAINER_DATABASE_FAILOVER_PRECHECK - A + * precheck step for validating an autonomous container database during a failover. - + * AUTONOMOUS_CONTAINER_DATABASE_START_DRILL_CONVERT_TO_SNAPSHOT_STANDBY_PRECHECK - A precheck step + * for validating the conversion of an autonomous container database to a snapshot at standby for a + * start drill. - AUTONOMOUS_CONTAINER_DATABASE_STOP_DRILL_CONVERT_TO_PHYSICAL_STANDBY_PRECHECK - A + * precheck step for validating the conversion of an autonomous container database to a physical + * instance at standby for a stop drill. - AUTONOMOUS_CONTAINER_DATABASE_SWITCHOVER - A DR plan step + * to perform an autonomous container database switchover. - AUTONOMOUS_CONTAINER_DATABASE_FAILOVER + * - A DR plan step to perform an autonomous container database failover. - + * AUTONOMOUS_CONTAINER_DATABASE_START_DRILL_CONVERT_TO_SNAPSHOT_STANDBY - A DR plan step to convert + * an autonomous container database to a snapshot at standby during a start drill. - + * AUTONOMOUS_CONTAINER_DATABASE_STOP_DRILL_CONVERT_TO_PHYSICAL_STANDBY - A DR plan step to convert + * an autonomous container database to a physical instance at standby during a stop drill. - + * AUTONOMOUS_DATABASE_START_DRILL_CREATE_CLONE_STANDBY_PRECHECK - A precheck step for validating + * the creation of an autonomous database clone at standby during a start drill. - + * AUTONOMOUS_DATABASE_STOP_DRILL_DELETE_CLONE_STANDBY_PRECHECK - A precheck step for validating the + * deletion of an autonomous database clone at standby during a stop drill. - + * AUTONOMOUS_DATABASE_START_DRILL_CONVERT_TO_SNAPSHOT_STANDBY_PRECHECK - A precheck step for + * validating the conversion of an autonomous database to snapshot at standby during a start drill. + * - AUTONOMOUS_DATABASE_STOP_DRILL_CONVERT_TO_PHYSICAL_STANDBY_PRECHECK - A precheck step for + * validating the conversion of an autonomous database to a physical instance at standby during a + * start drill. - AUTONOMOUS_DATABASE_START_DRILL_CREATE_CLONE_STANDBY - A DR plan step to create an + * autonomous database clone at standby during a start drill. - + * AUTONOMOUS_DATABASE_STOP_DRILL_DELETE_CLONE_STANDBY - A DR plan step to delete an autonomous + * database clone at standby during a stop drill. - + * AUTONOMOUS_DATABASE_START_DRILL_CONVERT_TO_SNAPSHOT_STANDBY - A DR plan step to convert an + * autonomous database to a snapshot at standby during a start drill. - + * AUTONOMOUS_DATABASE_STOP_DRILL_CONVERT_TO_PHYSICAL_STANDBY - A DR plan step to convert an + * autonomous database to a physical instance at standby during a stop drill. - + * USER_DEFINED_PRECHECK - A precheck step for validating a user-defined step. - + * COMPUTE_INSTANCE_LAUNCH - A DR plan step to launch a compute instance. - COMPUTE_INSTANCE_STOP - + * A DR plan step to stop a compute instance. - COMPUTE_INSTANCE_TERMINATE - A DR plan step to + * terminate a compute instance. - COMPUTE_INSTANCE_REMOVE - A DR plan step to remove a compute + * instance. - DATABASE_SWITCHOVER - A DR plan step to perform a database switchover. - + * DATABASE_FAILOVER - A DR plan step to perform a database failover. - + * AUTONOMOUS_DATABASE_SWITCHOVER - A DR plan step to perform an autonomous database switchover. - + * AUTONOMOUS_DATABASE_FAILOVER - A DR plan step to perform an autonomous database failover. - + * VOLUME_GROUP_RESTORE_SWITCHOVER - A DR plan step to perform a volume group restoration during a + * switchover. - VOLUME_GROUP_RESTORE_FAILOVER - A DR plan step to perform a volume group + * restoration during a failover. - VOLUME_GROUP_REVERSE - A DR plan step to reverse a volume group. + * - VOLUME_GROUP_DELETE - A DR plan step to delete a volume group. - VOLUME_GROUP_REMOVE - A DR + * plan step to remove a volume group. - VOLUME_GROUP_TERMINATE - A DR plan step to terminate a + * volume group. - USER_DEFINED - User-defined step - VOLUME_GROUP_RESTORE_START_DRILL_PRECHECK - A + * precheck step for validating a volume group restoration during a start drill. - + * VOLUME_GROUP_REMOVE_PRECHECK - A precheck step for validating a volume group removal. - + * VOLUME_GROUP_TERMINATE_PRECHECK - A precheck step for validating a volume group termination. - + * VOLUME_GROUP_RESTORE_START_DRILL - A DR plan step for volume group restoration during a start + * drill. - AUTONOMOUS_DATABASE_CREATE_CLONE_PRECHECK - A precheck step for validating the creation + * of an autonomous database clone. - AUTONOMOUS_DATABASE_DELETE_CLONE_PRECHECK - A precheck step + * for validating the deletion of an autonomous database clone. - + * LOAD_BALANCER_UPDATE_PRIMARY_BACKEND_SET_PRECHECK - A precheck step for validating the update of + * primary load balancer backend set. - LOAD_BALANCER_UPDATE_STANDBY_BACKEND_SET_PRECHECK - A + * precheck step for validating the update of standby load balancer backend set. - + * FILE_SYSTEM_SWITCHOVER_PRECHECK - A precheck step for validating a file system during a + * switchover. - FILE_SYSTEM_FAILOVER_PRECHECK - A precheck step for validating a file system during + * a failover. - FILE_SYSTEM_START_DRILL_PRECHECK - A precheck step for validating a file system + * during a start drill. - FILE_SYSTEM_STOP_DRILL_PRECHECK - A precheck step for validating a file + * system during a stop drill. - FILE_SYSTEM_REMOVE_PRECHECK - A precheck step for validating a file + * system removal. - FILE_SYSTEM_TERMINATE_PRECHECK - A precheck step for validating a file system + * termination. - FILE_SYSTEM_MOUNT_PRECHECK - A precheck step for validating a file system to be + * mounted. - FILE_SYSTEM_UNMOUNT_PRECHECK - A precheck step for validating a file system to be + * unmounted. - COMPUTE_INSTANCE_START_PRECHECK - A precheck step for validating the start of a + * compute instance. - COMPUTE_INSTANCE_ATTACH_BLOCK_VOLUMES_PRECHECK - A precheck step for + * validating the attachment of block volumes to a compute instance. - + * COMPUTE_INSTANCE_DETACH_BLOCK_VOLUMES_PRECHECK - A precheck step for validating the detachment of + * block volumes from a compute instance. - COMPUTE_INSTANCE_MOUNT_BLOCK_VOLUMES_PRECHECK - A + * precheck step for validating the mounting of block volumes on a compute instance. - + * COMPUTE_INSTANCE_UNMOUNT_BLOCK_VOLUMES_PRECHECK - A precheck step for validating the unmounting + * of block volumes from a compute instance. - COMPUTE_CAPACITY_RESERVATION_START_DRILL_PRECHECK - A + * precheck step for validating a compute capacity reservation during a start drill. - + * COMPUTE_CAPACITY_AVAILABILITY_START_DRILL_PRECHECK - A precheck step for validating a compute + * capacity availability during a start drill . - AUTONOMOUS_DATABASE_CREATE_CLONE - A DR plan step + * to create an autonomous database clone. - AUTONOMOUS_DATABASE_DELETE_CLONE - A DR plan step to + * delete an autonomous database clone. - LOAD_BALANCER_UPDATE_PRIMARY_BACKEND_SET - A DR plan step + * to update a primary load balancer backend set. - LOAD_BALANCER_UPDATE_STANDBY_BACKEND_SET - A DR + * plan step to update a standby load balancer backend set. - FILE_SYSTEM_SWITCHOVER - A DR plan + * step to perform a file system switchover. - FILE_SYSTEM_FAILOVER - A DR plan step to perform a + * file system failover. - FILE_SYSTEM_REMOVE - A DR plan step to remove a file system. - + * FILE_SYSTEM_REVERSE - A DR plan step to reverse replication in a file system. - + * FILE_SYSTEM_TERMINATE - A DR plan step to terminate a file system. - FILE_SYSTEM_START_DRILL - A + * DR plan step to perform a start drill operation for a file system. - FILE_SYSTEM_STOP_DRILL - A + * DR plan step to perform a stop drill operation for a file system. - COMPUTE_INSTANCE_START - A DR + * plan step to start a compute instance. - COMPUTE_INSTANCE_ATTACH_BLOCK_VOLUMES - A DR plan step + * to attach block volumes to a compute instance. - COMPUTE_INSTANCE_DETACH_BLOCK_VOLUMES - A DR + * plan step to detach block volumes from a compute instance. - FILE_SYSTEM_MOUNT - A DR plan step + * to mount a file system. - FILE_SYSTEM_UNMOUNT - A DR plan step to unmount a file system. - + * COMPUTE_CAPACITY_RESERVATION_SWITCHOVER_PRECHECK - A precheck step for validating a compute + * capacity reservation during a switchover. - COMPUTE_CAPACITY_RESERVATION_FAILOVER_PRECHECK - A + * precheck step for validating a capacity reservation during a failover. - + * COMPUTE_CAPACITY_AVAILABILITY_SWITCHOVER_PRECHECK - A precheck step for validating a compute + * capacity availability during a switchover. - COMPUTE_CAPACITY_AVAILABILITY_FAILOVER_PRECHECK - A + * precheck step for validating a compute capacity availability during a failover. - + * OBJECT_STORAGE_BUCKET_SWITCHOVER_DELETE_REPLICATION_PRIMARY_PRECHECK - A precheck step for + * validating the deletion of an object storage bucket replication in the primary region during a + * switchover. - OBJECT_STORAGE_BUCKET_SWITCHOVER_SETUP_REVERSE_REPLICATION_STANDBY_PRECHECK - A + * precheck step for validating an object storage bucket reverse replication set up in the standby + * region during a switchover. - OBJECT_STORAGE_BUCKET_FAILOVER_DELETE_REPLICATION_STANDBY_PRECHECK + * - A precheck step for validating the deletion of an object storage bucket replication in the + * standby region during a failover. - + * OBJECT_STORAGE_BUCKET_FAILOVER_SETUP_REVERSE_REPLICATION_STANDBY_PRECHECK - A precheck step for + * validating an object storage bucket reverse replication set up in the standby region during a + * failover. - OBJECT_STORAGE_BUCKET_SWITCHOVER_DELETE_REPLICATION_PRIMARY - A DR plan step to + * delete an object storage bucket replication in the primary region during a switchover. - + * OBJECT_STORAGE_BUCKET_SWITCHOVER_SETUP_REVERSE_REPLICATION_STANDBY - A DR plan step to set up an + * object storage bucket reverse replication in the standby region during a switchover. - + * OBJECT_STORAGE_BUCKET_FAILOVER_DELETE_REPLICATION_STANDBY - A DR plan step to delete an object + * storage bucket replication in the standby region during a failover. - + * OBJECT_STORAGE_BUCKET_FAILOVER_SETUP_REVERSE_REPLICATION_STANDBY - A DR plan step to set up an + * object storage bucket reverse replication in the standby region during a failover. + */ @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") public enum DrPlanStepType implements com.oracle.bmc.http.internal.BmcEnum { ComputeInstanceStopPrecheck("COMPUTE_INSTANCE_STOP_PRECHECK"), diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanSummary.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanSummary.java index 587b2ac6451..6f3e1a19df9 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanSummary.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/DrPlanSummary.java @@ -32,6 +32,7 @@ public final class DrPlanSummary extends com.oracle.bmc.http.client.internal.Exp "timeCreated", "timeUpdated", "lifecycleState", + "lifecycleSubState", "lifeCycleDetails", "freeformTags", "definedTags", @@ -48,6 +49,7 @@ public DrPlanSummary( java.util.Date timeCreated, java.util.Date timeUpdated, DrPlanLifecycleState lifecycleState, + DrPlanLifecycleSubState lifecycleSubState, String lifeCycleDetails, java.util.Map freeformTags, java.util.Map> definedTags, @@ -63,6 +65,7 @@ public DrPlanSummary( this.timeCreated = timeCreated; this.timeUpdated = timeUpdated; this.lifecycleState = lifecycleState; + this.lifecycleSubState = lifecycleSubState; this.lifeCycleDetails = lifeCycleDetails; this.freeformTags = freeformTags; this.definedTags = definedTags; @@ -283,6 +286,27 @@ public Builder lifecycleState(DrPlanLifecycleState lifecycleState) { this.__explicitlySet__.add("lifecycleState"); return this; } + /** + * The current sub state of the DR plan. + * + *

Example: {@code NEEDS_REFRESH} + */ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleSubState") + private DrPlanLifecycleSubState lifecycleSubState; + + /** + * The current sub state of the DR plan. + * + *

Example: {@code NEEDS_REFRESH} + * + * @param lifecycleSubState the value to set + * @return this builder + */ + public Builder lifecycleSubState(DrPlanLifecycleSubState lifecycleSubState) { + this.lifecycleSubState = lifecycleSubState; + this.__explicitlySet__.add("lifecycleSubState"); + return this; + } /** A message describing the DR plan's current state in more detail. */ @com.fasterxml.jackson.annotation.JsonProperty("lifeCycleDetails") private String lifeCycleDetails; @@ -381,6 +405,7 @@ public DrPlanSummary build() { this.timeCreated, this.timeUpdated, this.lifecycleState, + this.lifecycleSubState, this.lifeCycleDetails, this.freeformTags, this.definedTags, @@ -423,6 +448,9 @@ public Builder copy(DrPlanSummary model) { if (model.wasPropertyExplicitlySet("lifecycleState")) { this.lifecycleState(model.getLifecycleState()); } + if (model.wasPropertyExplicitlySet("lifecycleSubState")) { + this.lifecycleSubState(model.getLifecycleSubState()); + } if (model.wasPropertyExplicitlySet("lifeCycleDetails")) { this.lifeCycleDetails(model.getLifeCycleDetails()); } @@ -638,6 +666,25 @@ public DrPlanLifecycleState getLifecycleState() { return lifecycleState; } + /** + * The current sub state of the DR plan. + * + *

Example: {@code NEEDS_REFRESH} + */ + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleSubState") + private final DrPlanLifecycleSubState lifecycleSubState; + + /** + * The current sub state of the DR plan. + * + *

Example: {@code NEEDS_REFRESH} + * + * @return the value + */ + public DrPlanLifecycleSubState getLifecycleSubState() { + return lifecycleSubState; + } + /** A message describing the DR plan's current state in more detail. */ @com.fasterxml.jackson.annotation.JsonProperty("lifeCycleDetails") private final String lifeCycleDetails; @@ -736,6 +783,7 @@ public String toString(boolean includeByteArrayContents) { sb.append(", timeCreated=").append(String.valueOf(this.timeCreated)); sb.append(", timeUpdated=").append(String.valueOf(this.timeUpdated)); sb.append(", lifecycleState=").append(String.valueOf(this.lifecycleState)); + sb.append(", lifecycleSubState=").append(String.valueOf(this.lifecycleSubState)); sb.append(", lifeCycleDetails=").append(String.valueOf(this.lifeCycleDetails)); sb.append(", freeformTags=").append(String.valueOf(this.freeformTags)); sb.append(", definedTags=").append(String.valueOf(this.definedTags)); @@ -765,6 +813,7 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.timeCreated, other.timeCreated) && java.util.Objects.equals(this.timeUpdated, other.timeUpdated) && java.util.Objects.equals(this.lifecycleState, other.lifecycleState) + && java.util.Objects.equals(this.lifecycleSubState, other.lifecycleSubState) && java.util.Objects.equals(this.lifeCycleDetails, other.lifeCycleDetails) && java.util.Objects.equals(this.freeformTags, other.freeformTags) && java.util.Objects.equals(this.definedTags, other.definedTags) @@ -798,6 +847,9 @@ public int hashCode() { result = (result * PRIME) + (this.lifecycleState == null ? 43 : this.lifecycleState.hashCode()); + result = + (result * PRIME) + + (this.lifecycleSubState == null ? 43 : this.lifecycleSubState.hashCode()); result = (result * PRIME) + (this.lifeCycleDetails == null ? 43 : this.lifeCycleDetails.hashCode()); diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/OperationType.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/OperationType.java index 1038c2b11c3..c610f02e3c6 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/OperationType.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/OperationType.java @@ -17,6 +17,8 @@ public enum OperationType implements com.oracle.bmc.http.internal.BmcEnum { CreateDrPlan("CREATE_DR_PLAN"), UpdateDrPlan("UPDATE_DR_PLAN"), DeleteDrPlan("DELETE_DR_PLAN"), + RefreshDrPlan("REFRESH_DR_PLAN"), + VerifyDrPlan("VERIFY_DR_PLAN"), CreateDrPlanExecution("CREATE_DR_PLAN_EXECUTION"), UpdateDrPlanExecution("UPDATE_DR_PLAN_EXECUTION"), DeleteDrPlanExecution("DELETE_DR_PLAN_EXECUTION"), diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/RefreshDrPlanDefaultDetails.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/RefreshDrPlanDefaultDetails.java new file mode 100644 index 00000000000..a2de01e59bb --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/RefreshDrPlanDefaultDetails.java @@ -0,0 +1,100 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.model; + +/** + * The default type.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = RefreshDrPlanDefaultDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class RefreshDrPlanDefaultDetails extends RefreshDrPlanDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public RefreshDrPlanDefaultDetails build() { + RefreshDrPlanDefaultDetails model = new RefreshDrPlanDefaultDetails(); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(RefreshDrPlanDefaultDetails model) { + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public RefreshDrPlanDefaultDetails() { + super(); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("RefreshDrPlanDefaultDetails("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RefreshDrPlanDefaultDetails)) { + return false; + } + + RefreshDrPlanDefaultDetails other = (RefreshDrPlanDefaultDetails) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + return result; + } +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/RefreshDrPlanDetails.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/RefreshDrPlanDetails.java new file mode 100644 index 00000000000..e81fa41f640 --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/RefreshDrPlanDetails.java @@ -0,0 +1,111 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.model; + +/** + * The details for refreshing a DR plan.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type", + defaultImpl = RefreshDrPlanDetails.class) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = RefreshDrPlanDefaultDetails.class, + name = "DEFAULT") +}) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public class RefreshDrPlanDetails + extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({}) + protected RefreshDrPlanDetails() { + super(); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("RefreshDrPlanDetails("); + sb.append("super=").append(super.toString()); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RefreshDrPlanDetails)) { + return false; + } + + RefreshDrPlanDetails other = (RefreshDrPlanDetails) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + super.hashCode(); + return result; + } + + /** The default type. */ + public enum Type implements com.oracle.bmc.http.internal.BmcEnum { + Default("DEFAULT"), + ; + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (Type v : Type.values()) { + map.put(v.getValue(), v); + } + } + + Type(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + throw new IllegalArgumentException("Invalid Type: " + key); + } + }; +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/VerifyDrPlanDefaultDetails.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/VerifyDrPlanDefaultDetails.java new file mode 100644 index 00000000000..f5a8365510a --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/VerifyDrPlanDefaultDetails.java @@ -0,0 +1,100 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.model; + +/** + * The default type.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = VerifyDrPlanDefaultDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class VerifyDrPlanDefaultDetails extends VerifyDrPlanDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public VerifyDrPlanDefaultDetails build() { + VerifyDrPlanDefaultDetails model = new VerifyDrPlanDefaultDetails(); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(VerifyDrPlanDefaultDetails model) { + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public VerifyDrPlanDefaultDetails() { + super(); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("VerifyDrPlanDefaultDetails("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof VerifyDrPlanDefaultDetails)) { + return false; + } + + VerifyDrPlanDefaultDetails other = (VerifyDrPlanDefaultDetails) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + return result; + } +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/VerifyDrPlanDetails.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/VerifyDrPlanDetails.java new file mode 100644 index 00000000000..33f3db42250 --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/model/VerifyDrPlanDetails.java @@ -0,0 +1,110 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.model; + +/** + * The details for verifying a DR plan.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type", + defaultImpl = VerifyDrPlanDetails.class) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = VerifyDrPlanDefaultDetails.class, + name = "DEFAULT") +}) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public class VerifyDrPlanDetails extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({}) + protected VerifyDrPlanDetails() { + super(); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("VerifyDrPlanDetails("); + sb.append("super=").append(super.toString()); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof VerifyDrPlanDetails)) { + return false; + } + + VerifyDrPlanDetails other = (VerifyDrPlanDetails) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + super.hashCode(); + return result; + } + + /** The default type. */ + public enum Type implements com.oracle.bmc.http.internal.BmcEnum { + Default("DEFAULT"), + ; + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (Type v : Type.values()) { + map.put(v.getValue(), v); + } + } + + Type(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + throw new IllegalArgumentException("Invalid Type: " + key); + } + }; +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/ListDrPlansRequest.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/ListDrPlansRequest.java index 98f49173223..14d84ee293a 100644 --- a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/ListDrPlansRequest.java +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/ListDrPlansRequest.java @@ -187,6 +187,13 @@ public SortBy getSortBy() { public String getOpcRequestId() { return opcRequestId; } + /** A filter to return only DR plans that match the given lifecycle sub-state. */ + private com.oracle.bmc.disasterrecovery.model.DrPlanLifecycleSubState lifecycleSubState; + + /** A filter to return only DR plans that match the given lifecycle sub-state. */ + public com.oracle.bmc.disasterrecovery.model.DrPlanLifecycleSubState getLifecycleSubState() { + return lifecycleSubState; + } public static class Builder implements com.oracle.bmc.requests.BmcRequest.Builder< @@ -387,6 +394,22 @@ public Builder opcRequestId(String opcRequestId) { return this; } + /** A filter to return only DR plans that match the given lifecycle sub-state. */ + private com.oracle.bmc.disasterrecovery.model.DrPlanLifecycleSubState lifecycleSubState = + null; + + /** + * A filter to return only DR plans that match the given lifecycle sub-state. + * + * @param lifecycleSubState the value to set + * @return this builder instance + */ + public Builder lifecycleSubState( + com.oracle.bmc.disasterrecovery.model.DrPlanLifecycleSubState lifecycleSubState) { + this.lifecycleSubState = lifecycleSubState; + return this; + } + /** * Set the invocation callback for the request to be built. * @@ -427,6 +450,7 @@ public Builder copy(ListDrPlansRequest o) { sortOrder(o.getSortOrder()); sortBy(o.getSortBy()); opcRequestId(o.getOpcRequestId()); + lifecycleSubState(o.getLifecycleSubState()); invocationCallback(o.getInvocationCallback()); retryConfiguration(o.getRetryConfiguration()); return this; @@ -471,9 +495,10 @@ public ListDrPlansRequest buildWithoutInvocationCallback() { request.sortOrder = sortOrder; request.sortBy = sortBy; request.opcRequestId = opcRequestId; + request.lifecycleSubState = lifecycleSubState; return request; // new ListDrPlansRequest(drProtectionGroupId, lifecycleState, drPlanId, drPlanType, - // displayName, limit, page, sortOrder, sortBy, opcRequestId); + // displayName, limit, page, sortOrder, sortBy, opcRequestId, lifecycleSubState); } } @@ -493,7 +518,8 @@ public Builder toBuilder() { .page(page) .sortOrder(sortOrder) .sortBy(sortBy) - .opcRequestId(opcRequestId); + .opcRequestId(opcRequestId) + .lifecycleSubState(lifecycleSubState); } /** @@ -520,6 +546,7 @@ public String toString() { sb.append(",sortOrder=").append(String.valueOf(this.sortOrder)); sb.append(",sortBy=").append(String.valueOf(this.sortBy)); sb.append(",opcRequestId=").append(String.valueOf(this.opcRequestId)); + sb.append(",lifecycleSubState=").append(String.valueOf(this.lifecycleSubState)); sb.append(")"); return sb.toString(); } @@ -544,7 +571,8 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.page, other.page) && java.util.Objects.equals(this.sortOrder, other.sortOrder) && java.util.Objects.equals(this.sortBy, other.sortBy) - && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId) + && java.util.Objects.equals(this.lifecycleSubState, other.lifecycleSubState); } @Override @@ -567,6 +595,9 @@ public int hashCode() { result = (result * PRIME) + (this.sortOrder == null ? 43 : this.sortOrder.hashCode()); result = (result * PRIME) + (this.sortBy == null ? 43 : this.sortBy.hashCode()); result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + result = + (result * PRIME) + + (this.lifecycleSubState == null ? 43 : this.lifecycleSubState.hashCode()); return result; } } diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/RefreshDrPlanRequest.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/RefreshDrPlanRequest.java new file mode 100644 index 00000000000..030904f2cf8 --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/RefreshDrPlanRequest.java @@ -0,0 +1,362 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.requests; + +import com.oracle.bmc.disasterrecovery.model.*; +/** + * Example: Click here to see how to use RefreshDrPlanRequest. + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +public class RefreshDrPlanRequest + extends com.oracle.bmc.requests.BmcRequest< + com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails> { + + /** Details for refreshing a DR plan. */ + private com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails refreshDrPlanDetails; + + /** Details for refreshing a DR plan. */ + public com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails getRefreshDrPlanDetails() { + return refreshDrPlanDetails; + } + /** + * The OCID of the DR plan. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + private String drPlanId; + + /** + * The OCID of the DR plan. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + public String getDrPlanId() { + return drPlanId; + } + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the {@code + * 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; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the {@code + * 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. + */ + public String getIfMatch() { + return ifMatch; + } + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after 24 + * hours, but can be invalidated before then due to conflicting operations. For example, if a + * resource has been deleted and purged from the system, then a retry of the original creation + * request might be rejected. + */ + private String opcRetryToken; + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after 24 + * hours, but can be invalidated before then due to conflicting operations. For example, if a + * resource has been deleted and purged from the system, then a retry of the original creation + * request might be rejected. + */ + public String getOpcRetryToken() { + return opcRetryToken; + } + /** The client request ID for tracing. */ + private String opcRequestId; + + /** The client request ID for tracing. */ + public String getOpcRequestId() { + return opcRequestId; + } + + /** + * Alternative accessor for the body parameter. + * + * @return body parameter + */ + @Override + @com.oracle.bmc.InternalSdk + public com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails getBody$() { + return refreshDrPlanDetails; + } + + public static class Builder + implements com.oracle.bmc.requests.BmcRequest.Builder< + RefreshDrPlanRequest, + com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails> { + private com.oracle.bmc.http.client.RequestInterceptor invocationCallback = null; + private com.oracle.bmc.retrier.RetryConfiguration retryConfiguration = null; + + /** Details for refreshing a DR plan. */ + private com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails refreshDrPlanDetails = + null; + + /** + * Details for refreshing a DR plan. + * + * @param refreshDrPlanDetails the value to set + * @return this builder instance + */ + public Builder refreshDrPlanDetails( + com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails refreshDrPlanDetails) { + this.refreshDrPlanDetails = refreshDrPlanDetails; + return this; + } + + /** + * The OCID of the DR plan. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + private String drPlanId = null; + + /** + * The OCID of the DR plan. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + * + * @param drPlanId the value to set + * @return this builder instance + */ + public Builder drPlanId(String drPlanId) { + this.drPlanId = drPlanId; + return this; + } + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the + * {@code 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 = null; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the + * {@code 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. + * + * @param ifMatch the value to set + * @return this builder instance + */ + public Builder ifMatch(String ifMatch) { + this.ifMatch = ifMatch; + return this; + } + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after + * 24 hours, but can be invalidated before then due to conflicting operations. For example, + * if a resource has been deleted and purged from the system, then a retry of the original + * creation request might be rejected. + */ + private String opcRetryToken = null; + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after + * 24 hours, but can be invalidated before then due to conflicting operations. For example, + * if a resource has been deleted and purged from the system, then a retry of the original + * creation request might be rejected. + * + * @param opcRetryToken the value to set + * @return this builder instance + */ + public Builder opcRetryToken(String opcRetryToken) { + this.opcRetryToken = opcRetryToken; + return this; + } + + /** The client request ID for tracing. */ + private String opcRequestId = null; + + /** + * The client request ID for tracing. + * + * @param opcRequestId the value to set + * @return this builder instance + */ + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + /** + * 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.http.client.RequestInterceptor invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Set the retry configuration for the request to be built. + * + * @param retryConfiguration the retry configuration to be used for the request + * @return this builder instance + */ + public Builder retryConfiguration( + com.oracle.bmc.retrier.RetryConfiguration retryConfiguration) { + this.retryConfiguration = retryConfiguration; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * + * @return this builder instance + */ + public Builder copy(RefreshDrPlanRequest o) { + refreshDrPlanDetails(o.getRefreshDrPlanDetails()); + drPlanId(o.getDrPlanId()); + ifMatch(o.getIfMatch()); + opcRetryToken(o.getOpcRetryToken()); + opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); + retryConfiguration(o.getRetryConfiguration()); + return this; + } + + /** + * Build the instance of RefreshDrPlanRequest as configured by this builder + * + *

Note that this method takes calls to {@link + * Builder#invocationCallback(com.oracle.bmc.http.client.RequestInterceptor)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + *

This is the preferred method to build an instance. + * + * @return instance of RefreshDrPlanRequest + */ + public RefreshDrPlanRequest build() { + RefreshDrPlanRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + request.setRetryConfiguration(retryConfiguration); + return request; + } + + /** + * Alternative setter for the body parameter. + * + * @param body the body parameter + * @return this builder instance + */ + @com.oracle.bmc.InternalSdk + public Builder body$(com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails body) { + refreshDrPlanDetails(body); + return this; + } + + /** + * Build the instance of RefreshDrPlanRequest as configured by this builder + * + *

Note that this method does not take calls to {@link + * Builder#invocationCallback(com.oracle.bmc.http.client.RequestInterceptor)} into account, + * while the method {@link Builder#build} does + * + * @return instance of RefreshDrPlanRequest + */ + public RefreshDrPlanRequest buildWithoutInvocationCallback() { + RefreshDrPlanRequest request = new RefreshDrPlanRequest(); + request.refreshDrPlanDetails = refreshDrPlanDetails; + request.drPlanId = drPlanId; + request.ifMatch = ifMatch; + request.opcRetryToken = opcRetryToken; + request.opcRequestId = opcRequestId; + return request; + // new RefreshDrPlanRequest(refreshDrPlanDetails, drPlanId, ifMatch, opcRetryToken, + // opcRequestId); + } + } + + /** + * Return an instance of {@link Builder} that allows you to modify request properties. + * + * @return instance of {@link Builder} that allows you to modify request properties. + */ + public Builder toBuilder() { + return new Builder() + .refreshDrPlanDetails(refreshDrPlanDetails) + .drPlanId(drPlanId) + .ifMatch(ifMatch) + .opcRetryToken(opcRetryToken) + .opcRequestId(opcRequestId); + } + + /** + * Return a new builder for this request object. + * + * @return builder for the request object + */ + public static Builder builder() { + return new Builder(); + } + + @Override + public String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("("); + sb.append("super=").append(super.toString()); + sb.append(",refreshDrPlanDetails=").append(String.valueOf(this.refreshDrPlanDetails)); + sb.append(",drPlanId=").append(String.valueOf(this.drPlanId)); + sb.append(",ifMatch=").append(String.valueOf(this.ifMatch)); + sb.append(",opcRetryToken=").append(String.valueOf(this.opcRetryToken)); + sb.append(",opcRequestId=").append(String.valueOf(this.opcRequestId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RefreshDrPlanRequest)) { + return false; + } + + RefreshDrPlanRequest other = (RefreshDrPlanRequest) o; + return super.equals(o) + && java.util.Objects.equals(this.refreshDrPlanDetails, other.refreshDrPlanDetails) + && java.util.Objects.equals(this.drPlanId, other.drPlanId) + && java.util.Objects.equals(this.ifMatch, other.ifMatch) + && java.util.Objects.equals(this.opcRetryToken, other.opcRetryToken) + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.refreshDrPlanDetails == null + ? 43 + : this.refreshDrPlanDetails.hashCode()); + result = (result * PRIME) + (this.drPlanId == null ? 43 : this.drPlanId.hashCode()); + result = (result * PRIME) + (this.ifMatch == null ? 43 : this.ifMatch.hashCode()); + result = + (result * PRIME) + + (this.opcRetryToken == null ? 43 : this.opcRetryToken.hashCode()); + result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + return result; + } +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/VerifyDrPlanRequest.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/VerifyDrPlanRequest.java new file mode 100644 index 00000000000..9f143d21f84 --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/requests/VerifyDrPlanRequest.java @@ -0,0 +1,362 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.requests; + +import com.oracle.bmc.disasterrecovery.model.*; +/** + * Example: Click here to see how to use VerifyDrPlanRequest. + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +public class VerifyDrPlanRequest + extends com.oracle.bmc.requests.BmcRequest< + com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails> { + + /** Details for verifying a DR plan. */ + private com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails verifyDrPlanDetails; + + /** Details for verifying a DR plan. */ + public com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails getVerifyDrPlanDetails() { + return verifyDrPlanDetails; + } + /** + * The OCID of the DR plan. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + private String drPlanId; + + /** + * The OCID of the DR plan. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + public String getDrPlanId() { + return drPlanId; + } + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the {@code + * 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; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the {@code + * 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. + */ + public String getIfMatch() { + return ifMatch; + } + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after 24 + * hours, but can be invalidated before then due to conflicting operations. For example, if a + * resource has been deleted and purged from the system, then a retry of the original creation + * request might be rejected. + */ + private String opcRetryToken; + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after 24 + * hours, but can be invalidated before then due to conflicting operations. For example, if a + * resource has been deleted and purged from the system, then a retry of the original creation + * request might be rejected. + */ + public String getOpcRetryToken() { + return opcRetryToken; + } + /** The client request ID for tracing. */ + private String opcRequestId; + + /** The client request ID for tracing. */ + public String getOpcRequestId() { + return opcRequestId; + } + + /** + * Alternative accessor for the body parameter. + * + * @return body parameter + */ + @Override + @com.oracle.bmc.InternalSdk + public com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails getBody$() { + return verifyDrPlanDetails; + } + + public static class Builder + implements com.oracle.bmc.requests.BmcRequest.Builder< + VerifyDrPlanRequest, + com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails> { + private com.oracle.bmc.http.client.RequestInterceptor invocationCallback = null; + private com.oracle.bmc.retrier.RetryConfiguration retryConfiguration = null; + + /** Details for verifying a DR plan. */ + private com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails verifyDrPlanDetails = + null; + + /** + * Details for verifying a DR plan. + * + * @param verifyDrPlanDetails the value to set + * @return this builder instance + */ + public Builder verifyDrPlanDetails( + com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails verifyDrPlanDetails) { + this.verifyDrPlanDetails = verifyDrPlanDetails; + return this; + } + + /** + * The OCID of the DR plan. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + */ + private String drPlanId = null; + + /** + * The OCID of the DR plan. + * + *

Example: {@code ocid1.drplan.oc1..uniqueID} + * + * @param drPlanId the value to set + * @return this builder instance + */ + public Builder drPlanId(String drPlanId) { + this.drPlanId = drPlanId; + return this; + } + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the + * {@code 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 = null; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the + * {@code 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. + * + * @param ifMatch the value to set + * @return this builder instance + */ + public Builder ifMatch(String ifMatch) { + this.ifMatch = ifMatch; + return this; + } + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after + * 24 hours, but can be invalidated before then due to conflicting operations. For example, + * if a resource has been deleted and purged from the system, then a retry of the original + * creation request might be rejected. + */ + private String opcRetryToken = null; + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after + * 24 hours, but can be invalidated before then due to conflicting operations. For example, + * if a resource has been deleted and purged from the system, then a retry of the original + * creation request might be rejected. + * + * @param opcRetryToken the value to set + * @return this builder instance + */ + public Builder opcRetryToken(String opcRetryToken) { + this.opcRetryToken = opcRetryToken; + return this; + } + + /** The client request ID for tracing. */ + private String opcRequestId = null; + + /** + * The client request ID for tracing. + * + * @param opcRequestId the value to set + * @return this builder instance + */ + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + /** + * 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.http.client.RequestInterceptor invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Set the retry configuration for the request to be built. + * + * @param retryConfiguration the retry configuration to be used for the request + * @return this builder instance + */ + public Builder retryConfiguration( + com.oracle.bmc.retrier.RetryConfiguration retryConfiguration) { + this.retryConfiguration = retryConfiguration; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * + * @return this builder instance + */ + public Builder copy(VerifyDrPlanRequest o) { + verifyDrPlanDetails(o.getVerifyDrPlanDetails()); + drPlanId(o.getDrPlanId()); + ifMatch(o.getIfMatch()); + opcRetryToken(o.getOpcRetryToken()); + opcRequestId(o.getOpcRequestId()); + invocationCallback(o.getInvocationCallback()); + retryConfiguration(o.getRetryConfiguration()); + return this; + } + + /** + * Build the instance of VerifyDrPlanRequest as configured by this builder + * + *

Note that this method takes calls to {@link + * Builder#invocationCallback(com.oracle.bmc.http.client.RequestInterceptor)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + *

This is the preferred method to build an instance. + * + * @return instance of VerifyDrPlanRequest + */ + public VerifyDrPlanRequest build() { + VerifyDrPlanRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + request.setRetryConfiguration(retryConfiguration); + return request; + } + + /** + * Alternative setter for the body parameter. + * + * @param body the body parameter + * @return this builder instance + */ + @com.oracle.bmc.InternalSdk + public Builder body$(com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails body) { + verifyDrPlanDetails(body); + return this; + } + + /** + * Build the instance of VerifyDrPlanRequest as configured by this builder + * + *

Note that this method does not take calls to {@link + * Builder#invocationCallback(com.oracle.bmc.http.client.RequestInterceptor)} into account, + * while the method {@link Builder#build} does + * + * @return instance of VerifyDrPlanRequest + */ + public VerifyDrPlanRequest buildWithoutInvocationCallback() { + VerifyDrPlanRequest request = new VerifyDrPlanRequest(); + request.verifyDrPlanDetails = verifyDrPlanDetails; + request.drPlanId = drPlanId; + request.ifMatch = ifMatch; + request.opcRetryToken = opcRetryToken; + request.opcRequestId = opcRequestId; + return request; + // new VerifyDrPlanRequest(verifyDrPlanDetails, drPlanId, ifMatch, opcRetryToken, + // opcRequestId); + } + } + + /** + * Return an instance of {@link Builder} that allows you to modify request properties. + * + * @return instance of {@link Builder} that allows you to modify request properties. + */ + public Builder toBuilder() { + return new Builder() + .verifyDrPlanDetails(verifyDrPlanDetails) + .drPlanId(drPlanId) + .ifMatch(ifMatch) + .opcRetryToken(opcRetryToken) + .opcRequestId(opcRequestId); + } + + /** + * Return a new builder for this request object. + * + * @return builder for the request object + */ + public static Builder builder() { + return new Builder(); + } + + @Override + public String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("("); + sb.append("super=").append(super.toString()); + sb.append(",verifyDrPlanDetails=").append(String.valueOf(this.verifyDrPlanDetails)); + sb.append(",drPlanId=").append(String.valueOf(this.drPlanId)); + sb.append(",ifMatch=").append(String.valueOf(this.ifMatch)); + sb.append(",opcRetryToken=").append(String.valueOf(this.opcRetryToken)); + sb.append(",opcRequestId=").append(String.valueOf(this.opcRequestId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof VerifyDrPlanRequest)) { + return false; + } + + VerifyDrPlanRequest other = (VerifyDrPlanRequest) o; + return super.equals(o) + && java.util.Objects.equals(this.verifyDrPlanDetails, other.verifyDrPlanDetails) + && java.util.Objects.equals(this.drPlanId, other.drPlanId) + && java.util.Objects.equals(this.ifMatch, other.ifMatch) + && java.util.Objects.equals(this.opcRetryToken, other.opcRetryToken) + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.verifyDrPlanDetails == null + ? 43 + : this.verifyDrPlanDetails.hashCode()); + result = (result * PRIME) + (this.drPlanId == null ? 43 : this.drPlanId.hashCode()); + result = (result * PRIME) + (this.ifMatch == null ? 43 : this.ifMatch.hashCode()); + result = + (result * PRIME) + + (this.opcRetryToken == null ? 43 : this.opcRetryToken.hashCode()); + result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + return result; + } +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/responses/RefreshDrPlanResponse.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/responses/RefreshDrPlanResponse.java new file mode 100644 index 00000000000..78264024184 --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/responses/RefreshDrPlanResponse.java @@ -0,0 +1,191 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.responses; + +import com.oracle.bmc.disasterrecovery.model.*; + +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +public class RefreshDrPlanResponse extends com.oracle.bmc.responses.BmcResponse { + /** + * Unique Oracle-assigned identifier (OCID) for the asynchronous request. You can use this to + * query status of the asynchronous operation. Use {@link #getWorkRequest(GetWorkRequestRequest) + * getWorkRequest} with this OCID to track the status of the request. + */ + private String opcWorkRequestId; + + /** + * Unique Oracle-assigned identifier (OCID) for the asynchronous request. You can use this to + * query status of the asynchronous operation. Use {@link #getWorkRequest(GetWorkRequestRequest) + * getWorkRequest} with this OCID to track the status of the request. + * + * @return the value + */ + public String getOpcWorkRequestId() { + return opcWorkRequestId; + } + + /** + * 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; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a + * particular request, please provide the request ID. + * + * @return the value + */ + public String getOpcRequestId() { + return opcRequestId; + } + + @java.beans.ConstructorProperties({ + "__httpStatusCode__", + "headers", + "opcWorkRequestId", + "opcRequestId" + }) + private RefreshDrPlanResponse( + int __httpStatusCode__, + java.util.Map> headers, + String opcWorkRequestId, + String opcRequestId) { + super(__httpStatusCode__, headers); + this.opcWorkRequestId = opcWorkRequestId; + this.opcRequestId = opcRequestId; + } + + public static class Builder + implements com.oracle.bmc.responses.BmcResponse.Builder { + private int __httpStatusCode__; + + @Override + public Builder __httpStatusCode__(int __httpStatusCode__) { + this.__httpStatusCode__ = __httpStatusCode__; + return this; + } + + private java.util.Map> headers; + + @Override + public Builder headers(java.util.Map> headers) { + this.headers = headers; + return this; + } + + /** + * Unique Oracle-assigned identifier (OCID) for the asynchronous request. You can use this + * to query status of the asynchronous operation. Use {@link + * #getWorkRequest(GetWorkRequestRequest) getWorkRequest} with this OCID to track the status + * of the request. + */ + private String opcWorkRequestId; + + /** + * Unique Oracle-assigned identifier (OCID) for the asynchronous request. You can use this + * to query status of the asynchronous operation. Use {@link + * #getWorkRequest(GetWorkRequestRequest) getWorkRequest} with this OCID to track the status + * of the request. + * + * @param opcWorkRequestId the value to set + * @return this builder + */ + public Builder opcWorkRequestId(String opcWorkRequestId) { + this.opcWorkRequestId = opcWorkRequestId; + return this; + } + + /** + * 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; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a + * particular request, please provide the request ID. + * + * @param opcRequestId the value to set + * @return this builder + */ + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * + * @return this builder instance + */ + @Override + public Builder copy(RefreshDrPlanResponse o) { + __httpStatusCode__(o.get__httpStatusCode__()); + headers(o.getHeaders()); + opcWorkRequestId(o.getOpcWorkRequestId()); + opcRequestId(o.getOpcRequestId()); + + return this; + } + + /** + * Build the response object. + * + * @return the response object + */ + @Override + public RefreshDrPlanResponse build() { + return new RefreshDrPlanResponse( + __httpStatusCode__, headers, opcWorkRequestId, opcRequestId); + } + } + + /** + * Return a new builder for this response object. + * + * @return builder for the response object + */ + public static Builder builder() { + return new Builder(); + } + + @Override + public String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("("); + sb.append("super=").append(super.toString()); + sb.append(",opcWorkRequestId=").append(String.valueOf(opcWorkRequestId)); + sb.append(",opcRequestId=").append(String.valueOf(opcRequestId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RefreshDrPlanResponse)) { + return false; + } + + RefreshDrPlanResponse other = (RefreshDrPlanResponse) o; + return super.equals(o) + && java.util.Objects.equals(this.opcWorkRequestId, other.opcWorkRequestId) + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.opcWorkRequestId == null ? 43 : this.opcWorkRequestId.hashCode()); + result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + return result; + } +} diff --git a/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/responses/VerifyDrPlanResponse.java b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/responses/VerifyDrPlanResponse.java new file mode 100644 index 00000000000..e4041f855fd --- /dev/null +++ b/bmc-disasterrecovery/src/main/java/com/oracle/bmc/disasterrecovery/responses/VerifyDrPlanResponse.java @@ -0,0 +1,191 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.disasterrecovery.responses; + +import com.oracle.bmc.disasterrecovery.model.*; + +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") +public class VerifyDrPlanResponse extends com.oracle.bmc.responses.BmcResponse { + /** + * Unique Oracle-assigned identifier (OCID) for the asynchronous request. You can use this to + * query status of the asynchronous operation. Use {@link #getWorkRequest(GetWorkRequestRequest) + * getWorkRequest} with this OCID to track the status of the request. + */ + private String opcWorkRequestId; + + /** + * Unique Oracle-assigned identifier (OCID) for the asynchronous request. You can use this to + * query status of the asynchronous operation. Use {@link #getWorkRequest(GetWorkRequestRequest) + * getWorkRequest} with this OCID to track the status of the request. + * + * @return the value + */ + public String getOpcWorkRequestId() { + return opcWorkRequestId; + } + + /** + * 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; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a + * particular request, please provide the request ID. + * + * @return the value + */ + public String getOpcRequestId() { + return opcRequestId; + } + + @java.beans.ConstructorProperties({ + "__httpStatusCode__", + "headers", + "opcWorkRequestId", + "opcRequestId" + }) + private VerifyDrPlanResponse( + int __httpStatusCode__, + java.util.Map> headers, + String opcWorkRequestId, + String opcRequestId) { + super(__httpStatusCode__, headers); + this.opcWorkRequestId = opcWorkRequestId; + this.opcRequestId = opcRequestId; + } + + public static class Builder + implements com.oracle.bmc.responses.BmcResponse.Builder { + private int __httpStatusCode__; + + @Override + public Builder __httpStatusCode__(int __httpStatusCode__) { + this.__httpStatusCode__ = __httpStatusCode__; + return this; + } + + private java.util.Map> headers; + + @Override + public Builder headers(java.util.Map> headers) { + this.headers = headers; + return this; + } + + /** + * Unique Oracle-assigned identifier (OCID) for the asynchronous request. You can use this + * to query status of the asynchronous operation. Use {@link + * #getWorkRequest(GetWorkRequestRequest) getWorkRequest} with this OCID to track the status + * of the request. + */ + private String opcWorkRequestId; + + /** + * Unique Oracle-assigned identifier (OCID) for the asynchronous request. You can use this + * to query status of the asynchronous operation. Use {@link + * #getWorkRequest(GetWorkRequestRequest) getWorkRequest} with this OCID to track the status + * of the request. + * + * @param opcWorkRequestId the value to set + * @return this builder + */ + public Builder opcWorkRequestId(String opcWorkRequestId) { + this.opcWorkRequestId = opcWorkRequestId; + return this; + } + + /** + * 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; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a + * particular request, please provide the request ID. + * + * @param opcRequestId the value to set + * @return this builder + */ + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * + * @return this builder instance + */ + @Override + public Builder copy(VerifyDrPlanResponse o) { + __httpStatusCode__(o.get__httpStatusCode__()); + headers(o.getHeaders()); + opcWorkRequestId(o.getOpcWorkRequestId()); + opcRequestId(o.getOpcRequestId()); + + return this; + } + + /** + * Build the response object. + * + * @return the response object + */ + @Override + public VerifyDrPlanResponse build() { + return new VerifyDrPlanResponse( + __httpStatusCode__, headers, opcWorkRequestId, opcRequestId); + } + } + + /** + * Return a new builder for this response object. + * + * @return builder for the response object + */ + public static Builder builder() { + return new Builder(); + } + + @Override + public String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("("); + sb.append("super=").append(super.toString()); + sb.append(",opcWorkRequestId=").append(String.valueOf(opcWorkRequestId)); + sb.append(",opcRequestId=").append(String.valueOf(opcRequestId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof VerifyDrPlanResponse)) { + return false; + } + + VerifyDrPlanResponse other = (VerifyDrPlanResponse) o; + return super.equals(o) + && java.util.Objects.equals(this.opcWorkRequestId, other.opcWorkRequestId) + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.opcWorkRequestId == null ? 43 : this.opcWorkRequestId.hashCode()); + result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + return result; + } +} diff --git a/bmc-disasterrecovery/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-disasterrecovery/reflect-config.json b/bmc-disasterrecovery/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-disasterrecovery/reflect-config.json index f68d736317a..6237520190f 100644 --- a/bmc-disasterrecovery/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-disasterrecovery/reflect-config.json +++ b/bmc-disasterrecovery/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-disasterrecovery/reflect-config.json @@ -682,6 +682,12 @@ "allDeclaredFields": true, "allDeclaredMethods": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.DrPlanGroupRefreshStatus", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.disasterrecovery.model.DrPlanGroupType", @@ -694,6 +700,12 @@ "allDeclaredFields": true, "allDeclaredMethods": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.DrPlanLifecycleSubState", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.disasterrecovery.model.DrPlanStep", @@ -734,6 +746,12 @@ "allDeclaredFields": true, "allDeclaredMethods": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.DrPlanStepRefreshStatus", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.disasterrecovery.model.DrPlanStepType", @@ -1292,6 +1310,33 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDefaultDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDefaultDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.RefreshDrPlanDetails$Type", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.disasterrecovery.model.ResumeDrPlanExecutionDetails", @@ -1990,6 +2035,33 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDefaultDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDefaultDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.disasterrecovery.model.VerifyDrPlanDetails$Type", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.disasterrecovery.model.WorkRequest", diff --git a/bmc-disasterrecovery/src/main/resources/com/oracle/bmc/disasterrecovery/client.properties b/bmc-disasterrecovery/src/main/resources/com/oracle/bmc/disasterrecovery/client.properties index 3b6bf175494..42cc72d5c60 100644 --- a/bmc-disasterrecovery/src/main/resources/com/oracle/bmc/disasterrecovery/client.properties +++ b/bmc-disasterrecovery/src/main/resources/com/oracle/bmc/disasterrecovery/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220125") \ No newline at end of file diff --git a/bmc-dns/pom.xml b/bmc-dns/pom.xml index 29de9f61c79..56048526632 100644 --- a/bmc-dns/pom.xml +++ b/bmc-dns/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,12 +18,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-workrequests - 3.54.0 + 3.55.0 diff --git a/bmc-dns/src/main/resources/com/oracle/bmc/dns/client.properties b/bmc-dns/src/main/resources/com/oracle/bmc/dns/client.properties index 3bd87cb9218..2a47f8fe6fc 100644 --- a/bmc-dns/src/main/resources/com/oracle/bmc/dns/client.properties +++ b/bmc-dns/src/main/resources/com/oracle/bmc/dns/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180115") \ No newline at end of file diff --git a/bmc-dts/pom.xml b/bmc-dts/pom.xml index 949e825b228..4a2971bce52 100644 --- a/bmc-dts/pom.xml +++ b/bmc-dts/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-dts @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-dts/src/main/resources/com/oracle/bmc/dts/client.properties b/bmc-dts/src/main/resources/com/oracle/bmc/dts/client.properties index cbcf1d7a703..707308e64ed 100644 --- a/bmc-dts/src/main/resources/com/oracle/bmc/dts/client.properties +++ b/bmc-dts/src/main/resources/com/oracle/bmc/dts/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 1.0.017") \ No newline at end of file diff --git a/bmc-email/pom.xml b/bmc-email/pom.xml index f4723908826..b12b86e267b 100644 --- a/bmc-email/pom.xml +++ b/bmc-email/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-email/src/main/resources/com/oracle/bmc/email/client.properties b/bmc-email/src/main/resources/com/oracle/bmc/email/client.properties index 4d84daa7971..32ac52728ec 100644 --- a/bmc-email/src/main/resources/com/oracle/bmc/email/client.properties +++ b/bmc-email/src/main/resources/com/oracle/bmc/email/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170907") \ No newline at end of file diff --git a/bmc-emaildataplane/pom.xml b/bmc-emaildataplane/pom.xml index 4293488d3d2..fe9282aa1fc 100644 --- a/bmc-emaildataplane/pom.xml +++ b/bmc-emaildataplane/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-emaildataplane @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-emaildataplane/src/main/resources/com/oracle/bmc/emaildataplane/client.properties b/bmc-emaildataplane/src/main/resources/com/oracle/bmc/emaildataplane/client.properties index 81fdd95aba6..4e700e70ab6 100644 --- a/bmc-emaildataplane/src/main/resources/com/oracle/bmc/emaildataplane/client.properties +++ b/bmc-emaildataplane/src/main/resources/com/oracle/bmc/emaildataplane/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220926") \ No newline at end of file diff --git a/bmc-emwarehouse/pom.xml b/bmc-emwarehouse/pom.xml index 94b9fee1ad5..8cc377e66f4 100644 --- a/bmc-emwarehouse/pom.xml +++ b/bmc-emwarehouse/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-emwarehouse @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-emwarehouse/src/main/resources/com/oracle/bmc/emwarehouse/client.properties b/bmc-emwarehouse/src/main/resources/com/oracle/bmc/emwarehouse/client.properties index 3b22546b248..af810c91a9f 100644 --- a/bmc-emwarehouse/src/main/resources/com/oracle/bmc/emwarehouse/client.properties +++ b/bmc-emwarehouse/src/main/resources/com/oracle/bmc/emwarehouse/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180828") \ No newline at end of file diff --git a/bmc-encryption/pom.xml b/bmc-encryption/pom.xml index 28abcf9f2b7..50f90bb91f7 100644 --- a/bmc-encryption/pom.xml +++ b/bmc-encryption/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,17 +18,17 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-common-httpclient - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-keymanagement - 3.54.0 + 3.55.0 com.fasterxml.jackson.core @@ -43,7 +43,7 @@ com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 test diff --git a/bmc-enforcer-rules/pom.xml b/bmc-enforcer-rules/pom.xml index 6c86cbdaf7f..c1074756e46 100644 --- a/bmc-enforcer-rules/pom.xml +++ b/bmc-enforcer-rules/pom.xml @@ -6,7 +6,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 oci-java-sdk-enforcer-rules diff --git a/bmc-events/pom.xml b/bmc-events/pom.xml index 01a37b82e85..5f621c1ac3a 100644 --- a/bmc-events/pom.xml +++ b/bmc-events/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-events @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-events/src/main/resources/com/oracle/bmc/events/client.properties b/bmc-events/src/main/resources/com/oracle/bmc/events/client.properties index f5c0d9ad84f..758eca6b499 100644 --- a/bmc-events/src/main/resources/com/oracle/bmc/events/client.properties +++ b/bmc-events/src/main/resources/com/oracle/bmc/events/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181201") \ No newline at end of file diff --git a/bmc-examples/pom.xml b/bmc-examples/pom.xml index 919c9ca0781..9c3d9c75bd9 100644 --- a/bmc-examples/pom.xml +++ b/bmc-examples/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-examples @@ -71,14 +71,14 @@ com.oracle.oci.sdk oci-java-sdk-bom - 3.54.0 + 3.55.0 pom import com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 pom import diff --git a/bmc-filestorage/pom.xml b/bmc-filestorage/pom.xml index ab30942db63..bc6fe8ec705 100644 --- a/bmc-filestorage/pom.xml +++ b/bmc-filestorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-filestorage/src/main/resources/com/oracle/bmc/filestorage/client.properties b/bmc-filestorage/src/main/resources/com/oracle/bmc/filestorage/client.properties index 9dded816621..8b9805c5881 100644 --- a/bmc-filestorage/src/main/resources/com/oracle/bmc/filestorage/client.properties +++ b/bmc-filestorage/src/main/resources/com/oracle/bmc/filestorage/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20171215") \ No newline at end of file diff --git a/bmc-fleetappsmanagement/pom.xml b/bmc-fleetappsmanagement/pom.xml index 4b9f6a331cc..b6be9187e70 100644 --- a/bmc-fleetappsmanagement/pom.xml +++ b/bmc-fleetappsmanagement/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-fleetappsmanagement @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-fleetappsmanagement/src/main/resources/com/oracle/bmc/fleetappsmanagement/client.properties b/bmc-fleetappsmanagement/src/main/resources/com/oracle/bmc/fleetappsmanagement/client.properties index 47ad69fdffa..b77a3b74bce 100644 --- a/bmc-fleetappsmanagement/src/main/resources/com/oracle/bmc/fleetappsmanagement/client.properties +++ b/bmc-fleetappsmanagement/src/main/resources/com/oracle/bmc/fleetappsmanagement/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230831") \ No newline at end of file diff --git a/bmc-fleetsoftwareupdate/pom.xml b/bmc-fleetsoftwareupdate/pom.xml index 78807069441..87a51678825 100644 --- a/bmc-fleetsoftwareupdate/pom.xml +++ b/bmc-fleetsoftwareupdate/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-fleetsoftwareupdate @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/ActionTypes.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/ActionTypes.java index 24003cefeeb..046d468a24d 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/ActionTypes.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/ActionTypes.java @@ -12,6 +12,7 @@ public enum ActionTypes implements com.oracle.bmc.http.internal.BmcEnum { Apply("APPLY"), RollbackAndRemoveTarget("ROLLBACK_AND_REMOVE_TARGET"), Cleanup("CLEANUP"), + RollbackMaintenanceCycle("ROLLBACK_MAINTENANCE_CYCLE"), /** * This value is used if a service returns a value for this enum that is not recognized by this diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/CreateFsuActionDetails.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/CreateFsuActionDetails.java index 21299dfe901..b0ea218c92b 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/CreateFsuActionDetails.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/CreateFsuActionDetails.java @@ -22,6 +22,9 @@ property = "type", defaultImpl = CreateFsuActionDetails.class) @com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = CreateRollbackCycleApplyActionDetails.class, + name = "ROLLBACK_MAINTENANCE_CYCLE"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = CreateApplyActionDetails.class, name = "APPLY"), diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/CreateRollbackCycleApplyActionDetails.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/CreateRollbackCycleApplyActionDetails.java new file mode 100644 index 00000000000..21f5c7fc2b2 --- /dev/null +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/CreateRollbackCycleApplyActionDetails.java @@ -0,0 +1,194 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.fleetsoftwareupdate.model; + +/** + * Exadata Fleet Update Rollback Action creation details. This action will rollback the maintenance + * cycle to the source home after a successful apply FSUAction.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220528") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = CreateRollbackCycleApplyActionDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class CreateRollbackCycleApplyActionDetails extends CreateFsuActionDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("compartmentId") + private String compartmentId; + + public Builder compartmentId(String compartmentId) { + this.compartmentId = compartmentId; + this.__explicitlySet__.add("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; + } + /** OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private String fsuCycleId; + + /** + * OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. + * + * @param fsuCycleId the value to set + * @return this builder + */ + public Builder fsuCycleId(String fsuCycleId) { + this.fsuCycleId = fsuCycleId; + this.__explicitlySet__.add("fsuCycleId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public CreateRollbackCycleApplyActionDetails build() { + CreateRollbackCycleApplyActionDetails model = + new CreateRollbackCycleApplyActionDetails( + this.displayName, + this.compartmentId, + this.freeformTags, + this.definedTags, + this.fsuCycleId); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(CreateRollbackCycleApplyActionDetails model) { + if (model.wasPropertyExplicitlySet("displayName")) { + this.displayName(model.getDisplayName()); + } + if (model.wasPropertyExplicitlySet("compartmentId")) { + this.compartmentId(model.getCompartmentId()); + } + if (model.wasPropertyExplicitlySet("freeformTags")) { + this.freeformTags(model.getFreeformTags()); + } + if (model.wasPropertyExplicitlySet("definedTags")) { + this.definedTags(model.getDefinedTags()); + } + if (model.wasPropertyExplicitlySet("fsuCycleId")) { + this.fsuCycleId(model.getFsuCycleId()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public CreateRollbackCycleApplyActionDetails( + String displayName, + String compartmentId, + java.util.Map freeformTags, + java.util.Map> definedTags, + String fsuCycleId) { + super(displayName, compartmentId, freeformTags, definedTags); + this.fsuCycleId = fsuCycleId; + } + + /** OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private final String fsuCycleId; + + /** + * OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. + * + * @return the value + */ + public String getFsuCycleId() { + return fsuCycleId; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("CreateRollbackCycleApplyActionDetails("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", fsuCycleId=").append(String.valueOf(this.fsuCycleId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof CreateRollbackCycleApplyActionDetails)) { + return false; + } + + CreateRollbackCycleApplyActionDetails other = (CreateRollbackCycleApplyActionDetails) o; + return java.util.Objects.equals(this.fsuCycleId, other.fsuCycleId) && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = (result * PRIME) + (this.fsuCycleId == null ? 43 : this.fsuCycleId.hashCode()); + return result; + } +} diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DbCollection.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DbCollection.java index 245ff739b52..f543c39bde5 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DbCollection.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DbCollection.java @@ -116,6 +116,15 @@ public Builder lifecycleDetails(String lifecycleDetails) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedFsuCycleId") + private String lastCompletedFsuCycleId; + + public Builder lastCompletedFsuCycleId(String lastCompletedFsuCycleId) { + this.lastCompletedFsuCycleId = lastCompletedFsuCycleId; + this.__explicitlySet__.add("lastCompletedFsuCycleId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") private java.util.Map freeformTags; @@ -192,6 +201,7 @@ public DbCollection build() { this.timeUpdated, this.lifecycleState, this.lifecycleDetails, + this.lastCompletedFsuCycleId, this.freeformTags, this.definedTags, this.systemTags, @@ -235,6 +245,9 @@ public Builder copy(DbCollection model) { if (model.wasPropertyExplicitlySet("lifecycleDetails")) { this.lifecycleDetails(model.getLifecycleDetails()); } + if (model.wasPropertyExplicitlySet("lastCompletedFsuCycleId")) { + this.lastCompletedFsuCycleId(model.getLastCompletedFsuCycleId()); + } if (model.wasPropertyExplicitlySet("freeformTags")) { this.freeformTags(model.getFreeformTags()); } @@ -275,6 +288,7 @@ public DbCollection( java.util.Date timeUpdated, CollectionLifecycleStates lifecycleState, String lifecycleDetails, + String lastCompletedFsuCycleId, java.util.Map freeformTags, java.util.Map> definedTags, java.util.Map> systemTags, @@ -291,6 +305,7 @@ public DbCollection( timeUpdated, lifecycleState, lifecycleDetails, + lastCompletedFsuCycleId, freeformTags, definedTags, systemTags); diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DbFsuCollectionSummary.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DbFsuCollectionSummary.java index 177d1494de5..18e35f58906 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DbFsuCollectionSummary.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DbFsuCollectionSummary.java @@ -117,6 +117,15 @@ public Builder lifecycleDetails(String lifecycleDetails) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedFsuCycleId") + private String lastCompletedFsuCycleId; + + public Builder lastCompletedFsuCycleId(String lastCompletedFsuCycleId) { + this.lastCompletedFsuCycleId = lastCompletedFsuCycleId; + this.__explicitlySet__.add("lastCompletedFsuCycleId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") private java.util.Map freeformTags; @@ -184,6 +193,7 @@ public DbFsuCollectionSummary build() { this.timeUpdated, this.lifecycleState, this.lifecycleDetails, + this.lastCompletedFsuCycleId, this.freeformTags, this.definedTags, this.systemTags, @@ -226,6 +236,9 @@ public Builder copy(DbFsuCollectionSummary model) { if (model.wasPropertyExplicitlySet("lifecycleDetails")) { this.lifecycleDetails(model.getLifecycleDetails()); } + if (model.wasPropertyExplicitlySet("lastCompletedFsuCycleId")) { + this.lastCompletedFsuCycleId(model.getLastCompletedFsuCycleId()); + } if (model.wasPropertyExplicitlySet("freeformTags")) { this.freeformTags(model.getFreeformTags()); } @@ -263,6 +276,7 @@ public DbFsuCollectionSummary( java.util.Date timeUpdated, CollectionLifecycleStates lifecycleState, String lifecycleDetails, + String lastCompletedFsuCycleId, java.util.Map freeformTags, java.util.Map> definedTags, java.util.Map> systemTags, @@ -278,6 +292,7 @@ public DbFsuCollectionSummary( timeUpdated, lifecycleState, lifecycleDetails, + lastCompletedFsuCycleId, freeformTags, definedTags, systemTags); diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DetailedActionTypes.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DetailedActionTypes.java index d70ccfc1a99..e79ec03a0d1 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DetailedActionTypes.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/DetailedActionTypes.java @@ -13,6 +13,7 @@ public enum DetailedActionTypes implements com.oracle.bmc.http.internal.BmcEnum Apply("APPLY"), RollbackAndRemoveTarget("ROLLBACK_AND_REMOVE_TARGET"), Cleanup("CLEANUP"), + RollbackMaintenanceCycle("ROLLBACK_MAINTENANCE_CYCLE"), /** * This value is used if a service returns a value for this enum that is not recognized by this diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuAction.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuAction.java index 3521a428ad7..080f0071f93 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuAction.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuAction.java @@ -28,6 +28,9 @@ @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PrecheckAction.class, name = "PRECHECK"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = RollbackCycleAction.class, + name = "ROLLBACK_MAINTENANCE_CYCLE"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = StageAction.class, name = "STAGE"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = ApplyAction.class, name = "APPLY"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuActionSummary.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuActionSummary.java index 35ce314bd00..d5aabe9ccd6 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuActionSummary.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuActionSummary.java @@ -22,6 +22,9 @@ property = "type", defaultImpl = FsuActionSummary.class) @com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = RollbackCycleActionSummary.class, + name = "ROLLBACK_MAINTENANCE_CYCLE"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = StageActionSummary.class, name = "STAGE"), diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCollection.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCollection.java index eb56df91e3f..33995c67ee4 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCollection.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCollection.java @@ -40,6 +40,7 @@ public class FsuCollection extends com.oracle.bmc.http.client.internal.Explicitl "timeUpdated", "lifecycleState", "lifecycleDetails", + "lastCompletedFsuCycleId", "freeformTags", "definedTags", "systemTags" @@ -55,6 +56,7 @@ protected FsuCollection( java.util.Date timeUpdated, CollectionLifecycleStates lifecycleState, String lifecycleDetails, + String lastCompletedFsuCycleId, java.util.Map freeformTags, java.util.Map> definedTags, java.util.Map> systemTags) { @@ -69,6 +71,7 @@ protected FsuCollection( this.timeUpdated = timeUpdated; this.lifecycleState = lifecycleState; this.lifecycleDetails = lifecycleDetails; + this.lastCompletedFsuCycleId = lastCompletedFsuCycleId; this.freeformTags = freeformTags; this.definedTags = definedTags; this.systemTags = systemTags; @@ -210,6 +213,23 @@ public String getLifecycleDetails() { return lifecycleDetails; } + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of last + * completed FSU Cycle. + */ + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedFsuCycleId") + private final String lastCompletedFsuCycleId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of last + * completed FSU Cycle. + * + * @return the value + */ + public String getLastCompletedFsuCycleId() { + return lastCompletedFsuCycleId; + } + /** * Simple key-value pair that is applied without any predefined name, type or scope. Exists for * cross-compatibility only. Example: {@code {"bar-key": "value"}} @@ -286,6 +306,8 @@ public String toString(boolean includeByteArrayContents) { sb.append(", timeUpdated=").append(String.valueOf(this.timeUpdated)); sb.append(", lifecycleState=").append(String.valueOf(this.lifecycleState)); sb.append(", lifecycleDetails=").append(String.valueOf(this.lifecycleDetails)); + sb.append(", lastCompletedFsuCycleId=") + .append(String.valueOf(this.lastCompletedFsuCycleId)); sb.append(", freeformTags=").append(String.valueOf(this.freeformTags)); sb.append(", definedTags=").append(String.valueOf(this.definedTags)); sb.append(", systemTags=").append(String.valueOf(this.systemTags)); @@ -313,6 +335,8 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.timeUpdated, other.timeUpdated) && java.util.Objects.equals(this.lifecycleState, other.lifecycleState) && java.util.Objects.equals(this.lifecycleDetails, other.lifecycleDetails) + && java.util.Objects.equals( + this.lastCompletedFsuCycleId, other.lastCompletedFsuCycleId) && java.util.Objects.equals(this.freeformTags, other.freeformTags) && java.util.Objects.equals(this.definedTags, other.definedTags) && java.util.Objects.equals(this.systemTags, other.systemTags) @@ -341,6 +365,11 @@ public int hashCode() { result = (result * PRIME) + (this.lifecycleDetails == null ? 43 : this.lifecycleDetails.hashCode()); + result = + (result * PRIME) + + (this.lastCompletedFsuCycleId == null + ? 43 + : this.lastCompletedFsuCycleId.hashCode()); result = (result * PRIME) + (this.freeformTags == null ? 43 : this.freeformTags.hashCode()); result = (result * PRIME) + (this.definedTags == null ? 43 : this.definedTags.hashCode()); result = (result * PRIME) + (this.systemTags == null ? 43 : this.systemTags.hashCode()); diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCollectionSummary.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCollectionSummary.java index 80678d9e8c9..679583f6b76 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCollectionSummary.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCollectionSummary.java @@ -45,6 +45,7 @@ public class FsuCollectionSummary "timeUpdated", "lifecycleState", "lifecycleDetails", + "lastCompletedFsuCycleId", "freeformTags", "definedTags", "systemTags" @@ -60,6 +61,7 @@ protected FsuCollectionSummary( java.util.Date timeUpdated, CollectionLifecycleStates lifecycleState, String lifecycleDetails, + String lastCompletedFsuCycleId, java.util.Map freeformTags, java.util.Map> definedTags, java.util.Map> systemTags) { @@ -74,6 +76,7 @@ protected FsuCollectionSummary( this.timeUpdated = timeUpdated; this.lifecycleState = lifecycleState; this.lifecycleDetails = lifecycleDetails; + this.lastCompletedFsuCycleId = lastCompletedFsuCycleId; this.freeformTags = freeformTags; this.definedTags = definedTags; this.systemTags = systemTags; @@ -215,6 +218,23 @@ public String getLifecycleDetails() { return lifecycleDetails; } + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of last + * completed FSU Cycle. + */ + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedFsuCycleId") + private final String lastCompletedFsuCycleId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of last + * completed FSU Cycle. + * + * @return the value + */ + public String getLastCompletedFsuCycleId() { + return lastCompletedFsuCycleId; + } + /** * Simple key-value pair that is applied without any predefined name, type or scope. Exists for * cross-compatibility only. Example: {@code {"bar-key": "value"}} @@ -291,6 +311,8 @@ public String toString(boolean includeByteArrayContents) { sb.append(", timeUpdated=").append(String.valueOf(this.timeUpdated)); sb.append(", lifecycleState=").append(String.valueOf(this.lifecycleState)); sb.append(", lifecycleDetails=").append(String.valueOf(this.lifecycleDetails)); + sb.append(", lastCompletedFsuCycleId=") + .append(String.valueOf(this.lastCompletedFsuCycleId)); sb.append(", freeformTags=").append(String.valueOf(this.freeformTags)); sb.append(", definedTags=").append(String.valueOf(this.definedTags)); sb.append(", systemTags=").append(String.valueOf(this.systemTags)); @@ -318,6 +340,8 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.timeUpdated, other.timeUpdated) && java.util.Objects.equals(this.lifecycleState, other.lifecycleState) && java.util.Objects.equals(this.lifecycleDetails, other.lifecycleDetails) + && java.util.Objects.equals( + this.lastCompletedFsuCycleId, other.lastCompletedFsuCycleId) && java.util.Objects.equals(this.freeformTags, other.freeformTags) && java.util.Objects.equals(this.definedTags, other.definedTags) && java.util.Objects.equals(this.systemTags, other.systemTags) @@ -346,6 +370,11 @@ public int hashCode() { result = (result * PRIME) + (this.lifecycleDetails == null ? 43 : this.lifecycleDetails.hashCode()); + result = + (result * PRIME) + + (this.lastCompletedFsuCycleId == null + ? 43 + : this.lastCompletedFsuCycleId.hashCode()); result = (result * PRIME) + (this.freeformTags == null ? 43 : this.freeformTags.hashCode()); result = (result * PRIME) + (this.definedTags == null ? 43 : this.definedTags.hashCode()); result = (result * PRIME) + (this.systemTags == null ? 43 : this.systemTags.hashCode()); diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCycle.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCycle.java index 289617ed4cf..b4a36e6163c 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCycle.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCycle.java @@ -36,6 +36,8 @@ public class FsuCycle extends com.oracle.bmc.http.client.internal.ExplicitlySetB "collectionType", "executingFsuActionId", "nextActionToExecute", + "lastCompletedActionId", + "rollbackCycleState", "lastCompletedAction", "goalVersionDetails", "batchingStrategy", @@ -59,6 +61,8 @@ protected FsuCycle( CollectionTypes collectionType, String executingFsuActionId, java.util.List nextActionToExecute, + String lastCompletedActionId, + RollbackCycleStates rollbackCycleState, DetailedActionTypes lastCompletedAction, FsuGoalVersionDetails goalVersionDetails, BatchingStrategyDetails batchingStrategy, @@ -81,6 +85,8 @@ protected FsuCycle( this.collectionType = collectionType; this.executingFsuActionId = executingFsuActionId; this.nextActionToExecute = nextActionToExecute; + this.lastCompletedActionId = lastCompletedActionId; + this.rollbackCycleState = rollbackCycleState; this.lastCompletedAction = lastCompletedAction; this.goalVersionDetails = goalVersionDetails; this.batchingStrategy = batchingStrategy; @@ -192,6 +198,40 @@ public java.util.List getNextActionToExecute() { return nextActionToExecute; } + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * latest Action in the Exadata Fleet Update Cycle. + */ + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedActionId") + private final String lastCompletedActionId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * latest Action in the Exadata Fleet Update Cycle. + * + * @return the value + */ + public String getLastCompletedActionId() { + return lastCompletedActionId; + } + + /** + * Current rollback cycle state if rollback maintenance cycle action has been attempted. No + * value would indicate that the Cycle has not run a rollback maintenance cycle action before. + */ + @com.fasterxml.jackson.annotation.JsonProperty("rollbackCycleState") + private final RollbackCycleStates rollbackCycleState; + + /** + * Current rollback cycle state if rollback maintenance cycle action has been attempted. No + * value would indicate that the Cycle has not run a rollback maintenance cycle action before. + * + * @return the value + */ + public RollbackCycleStates getRollbackCycleState() { + return rollbackCycleState; + } + /** * The latest Action type that was completed in the Exadata Fleet Update Cycle. No value would * indicate that the Cycle has not completed any Action yet. @@ -398,6 +438,8 @@ public String toString(boolean includeByteArrayContents) { sb.append(", collectionType=").append(String.valueOf(this.collectionType)); sb.append(", executingFsuActionId=").append(String.valueOf(this.executingFsuActionId)); sb.append(", nextActionToExecute=").append(String.valueOf(this.nextActionToExecute)); + sb.append(", lastCompletedActionId=").append(String.valueOf(this.lastCompletedActionId)); + sb.append(", rollbackCycleState=").append(String.valueOf(this.rollbackCycleState)); sb.append(", lastCompletedAction=").append(String.valueOf(this.lastCompletedAction)); sb.append(", goalVersionDetails=").append(String.valueOf(this.goalVersionDetails)); sb.append(", batchingStrategy=").append(String.valueOf(this.batchingStrategy)); @@ -433,6 +475,8 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.collectionType, other.collectionType) && java.util.Objects.equals(this.executingFsuActionId, other.executingFsuActionId) && java.util.Objects.equals(this.nextActionToExecute, other.nextActionToExecute) + && java.util.Objects.equals(this.lastCompletedActionId, other.lastCompletedActionId) + && java.util.Objects.equals(this.rollbackCycleState, other.rollbackCycleState) && java.util.Objects.equals(this.lastCompletedAction, other.lastCompletedAction) && java.util.Objects.equals(this.goalVersionDetails, other.goalVersionDetails) && java.util.Objects.equals(this.batchingStrategy, other.batchingStrategy) @@ -475,6 +519,16 @@ public int hashCode() { + (this.nextActionToExecute == null ? 43 : this.nextActionToExecute.hashCode()); + result = + (result * PRIME) + + (this.lastCompletedActionId == null + ? 43 + : this.lastCompletedActionId.hashCode()); + result = + (result * PRIME) + + (this.rollbackCycleState == null + ? 43 + : this.rollbackCycleState.hashCode()); result = (result * PRIME) + (this.lastCompletedAction == null diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCycleSummary.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCycleSummary.java index 0fa909fa85d..9516e697f63 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCycleSummary.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuCycleSummary.java @@ -31,6 +31,8 @@ public final class FsuCycleSummary "collectionType", "executingFsuActionId", "nextActionToExecute", + "lastCompletedActionId", + "rollbackCycleState", "lastCompletedAction", "goalVersionDetails", "diagnosticsCollection", @@ -52,6 +54,8 @@ public FsuCycleSummary( CollectionTypes collectionType, String executingFsuActionId, java.util.List nextActionToExecute, + String lastCompletedActionId, + RollbackCycleStates rollbackCycleState, DetailedActionTypes lastCompletedAction, FsuGoalVersionDetails goalVersionDetails, DiagnosticsCollectionDetails diagnosticsCollection, @@ -72,6 +76,8 @@ public FsuCycleSummary( this.collectionType = collectionType; this.executingFsuActionId = executingFsuActionId; this.nextActionToExecute = nextActionToExecute; + this.lastCompletedActionId = lastCompletedActionId; + this.rollbackCycleState = rollbackCycleState; this.lastCompletedAction = lastCompletedAction; this.goalVersionDetails = goalVersionDetails; this.diagnosticsCollection = diagnosticsCollection; @@ -212,6 +218,46 @@ public Builder nextActionToExecute( this.__explicitlySet__.add("nextActionToExecute"); return this; } + /** + * OCID identifier for the latest Action the Exadata Fleet Update Cycle. No value would + * indicate that the Cycle has not completed any Action yet. + */ + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedActionId") + private String lastCompletedActionId; + + /** + * OCID identifier for the latest Action the Exadata Fleet Update Cycle. No value would + * indicate that the Cycle has not completed any Action yet. + * + * @param lastCompletedActionId the value to set + * @return this builder + */ + public Builder lastCompletedActionId(String lastCompletedActionId) { + this.lastCompletedActionId = lastCompletedActionId; + this.__explicitlySet__.add("lastCompletedActionId"); + return this; + } + /** + * Current rollback cycle state if rollback maintenance cycle action has been attempted. No + * value would indicate that the Cycle has not run a rollback maintenance cycle action + * before. + */ + @com.fasterxml.jackson.annotation.JsonProperty("rollbackCycleState") + private RollbackCycleStates rollbackCycleState; + + /** + * Current rollback cycle state if rollback maintenance cycle action has been attempted. No + * value would indicate that the Cycle has not run a rollback maintenance cycle action + * before. + * + * @param rollbackCycleState the value to set + * @return this builder + */ + public Builder rollbackCycleState(RollbackCycleStates rollbackCycleState) { + this.rollbackCycleState = rollbackCycleState; + this.__explicitlySet__.add("rollbackCycleState"); + return this; + } /** * The latest Action type that was completed in the Exadata Fleet Update Cycle. No value * would indicate that the Cycle has not completed any Action yet. @@ -413,6 +459,8 @@ public FsuCycleSummary build() { this.collectionType, this.executingFsuActionId, this.nextActionToExecute, + this.lastCompletedActionId, + this.rollbackCycleState, this.lastCompletedAction, this.goalVersionDetails, this.diagnosticsCollection, @@ -456,6 +504,12 @@ public Builder copy(FsuCycleSummary model) { if (model.wasPropertyExplicitlySet("nextActionToExecute")) { this.nextActionToExecute(model.getNextActionToExecute()); } + if (model.wasPropertyExplicitlySet("lastCompletedActionId")) { + this.lastCompletedActionId(model.getLastCompletedActionId()); + } + if (model.wasPropertyExplicitlySet("rollbackCycleState")) { + this.rollbackCycleState(model.getRollbackCycleState()); + } if (model.wasPropertyExplicitlySet("lastCompletedAction")) { this.lastCompletedAction(model.getLastCompletedAction()); } @@ -610,6 +664,40 @@ public java.util.List getNextActionToExecute() { return nextActionToExecute; } + /** + * OCID identifier for the latest Action the Exadata Fleet Update Cycle. No value would indicate + * that the Cycle has not completed any Action yet. + */ + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedActionId") + private final String lastCompletedActionId; + + /** + * OCID identifier for the latest Action the Exadata Fleet Update Cycle. No value would indicate + * that the Cycle has not completed any Action yet. + * + * @return the value + */ + public String getLastCompletedActionId() { + return lastCompletedActionId; + } + + /** + * Current rollback cycle state if rollback maintenance cycle action has been attempted. No + * value would indicate that the Cycle has not run a rollback maintenance cycle action before. + */ + @com.fasterxml.jackson.annotation.JsonProperty("rollbackCycleState") + private final RollbackCycleStates rollbackCycleState; + + /** + * Current rollback cycle state if rollback maintenance cycle action has been attempted. No + * value would indicate that the Cycle has not run a rollback maintenance cycle action before. + * + * @return the value + */ + public RollbackCycleStates getRollbackCycleState() { + return rollbackCycleState; + } + /** * The latest Action type that was completed in the Exadata Fleet Update Cycle. No value would * indicate that the Cycle has not completed any Action yet. @@ -796,6 +884,8 @@ public String toString(boolean includeByteArrayContents) { sb.append(", collectionType=").append(String.valueOf(this.collectionType)); sb.append(", executingFsuActionId=").append(String.valueOf(this.executingFsuActionId)); sb.append(", nextActionToExecute=").append(String.valueOf(this.nextActionToExecute)); + sb.append(", lastCompletedActionId=").append(String.valueOf(this.lastCompletedActionId)); + sb.append(", rollbackCycleState=").append(String.valueOf(this.rollbackCycleState)); sb.append(", lastCompletedAction=").append(String.valueOf(this.lastCompletedAction)); sb.append(", goalVersionDetails=").append(String.valueOf(this.goalVersionDetails)); sb.append(", diagnosticsCollection=").append(String.valueOf(this.diagnosticsCollection)); @@ -829,6 +919,8 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.collectionType, other.collectionType) && java.util.Objects.equals(this.executingFsuActionId, other.executingFsuActionId) && java.util.Objects.equals(this.nextActionToExecute, other.nextActionToExecute) + && java.util.Objects.equals(this.lastCompletedActionId, other.lastCompletedActionId) + && java.util.Objects.equals(this.rollbackCycleState, other.rollbackCycleState) && java.util.Objects.equals(this.lastCompletedAction, other.lastCompletedAction) && java.util.Objects.equals(this.goalVersionDetails, other.goalVersionDetails) && java.util.Objects.equals(this.diagnosticsCollection, other.diagnosticsCollection) @@ -869,6 +961,16 @@ public int hashCode() { + (this.nextActionToExecute == null ? 43 : this.nextActionToExecute.hashCode()); + result = + (result * PRIME) + + (this.lastCompletedActionId == null + ? 43 + : this.lastCompletedActionId.hashCode()); + result = + (result * PRIME) + + (this.rollbackCycleState == null + ? 43 + : this.rollbackCycleState.hashCode()); result = (result * PRIME) + (this.lastCompletedAction == null diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuJob.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuJob.java index 3483e28c9d3..381109918fc 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuJob.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuJob.java @@ -23,6 +23,9 @@ defaultImpl = FsuJob.class) @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = ApplyFsuJob.class, name = "APPLY"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = RollbackCycleFsuJob.class, + name = "ROLLBACK_MAINTENANCE_CYCLE"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = StageFsuJob.class, name = "STAGE"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = PrecheckFsuJob.class, diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuJobSummary.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuJobSummary.java index 0b4e1b4c119..c5fa33eaaa7 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuJobSummary.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/FsuJobSummary.java @@ -31,6 +31,9 @@ @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = ApplyFsuJobSummary.class, name = "APPLY"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = RollbackCycleFsuJobSummary.class, + name = "ROLLBACK_MAINTENANCE_CYCLE"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = CleanupFsuJobSummary.class, name = "CLEANUP"), diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/GiCollection.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/GiCollection.java index 39117caf841..73fb6c33e57 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/GiCollection.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/GiCollection.java @@ -116,6 +116,15 @@ public Builder lifecycleDetails(String lifecycleDetails) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedFsuCycleId") + private String lastCompletedFsuCycleId; + + public Builder lastCompletedFsuCycleId(String lastCompletedFsuCycleId) { + this.lastCompletedFsuCycleId = lastCompletedFsuCycleId; + this.__explicitlySet__.add("lastCompletedFsuCycleId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") private java.util.Map freeformTags; @@ -190,6 +199,7 @@ public GiCollection build() { this.timeUpdated, this.lifecycleState, this.lifecycleDetails, + this.lastCompletedFsuCycleId, this.freeformTags, this.definedTags, this.systemTags, @@ -233,6 +243,9 @@ public Builder copy(GiCollection model) { if (model.wasPropertyExplicitlySet("lifecycleDetails")) { this.lifecycleDetails(model.getLifecycleDetails()); } + if (model.wasPropertyExplicitlySet("lastCompletedFsuCycleId")) { + this.lastCompletedFsuCycleId(model.getLastCompletedFsuCycleId()); + } if (model.wasPropertyExplicitlySet("freeformTags")) { this.freeformTags(model.getFreeformTags()); } @@ -273,6 +286,7 @@ public GiCollection( java.util.Date timeUpdated, CollectionLifecycleStates lifecycleState, String lifecycleDetails, + String lastCompletedFsuCycleId, java.util.Map freeformTags, java.util.Map> definedTags, java.util.Map> systemTags, @@ -289,6 +303,7 @@ public GiCollection( timeUpdated, lifecycleState, lifecycleDetails, + lastCompletedFsuCycleId, freeformTags, definedTags, systemTags); diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/GiFsuCollectionSummary.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/GiFsuCollectionSummary.java index b1da7ef549d..15a6ee3e3b9 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/GiFsuCollectionSummary.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/GiFsuCollectionSummary.java @@ -117,6 +117,15 @@ public Builder lifecycleDetails(String lifecycleDetails) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedFsuCycleId") + private String lastCompletedFsuCycleId; + + public Builder lastCompletedFsuCycleId(String lastCompletedFsuCycleId) { + this.lastCompletedFsuCycleId = lastCompletedFsuCycleId; + this.__explicitlySet__.add("lastCompletedFsuCycleId"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("freeformTags") private java.util.Map freeformTags; @@ -182,6 +191,7 @@ public GiFsuCollectionSummary build() { this.timeUpdated, this.lifecycleState, this.lifecycleDetails, + this.lastCompletedFsuCycleId, this.freeformTags, this.definedTags, this.systemTags, @@ -224,6 +234,9 @@ public Builder copy(GiFsuCollectionSummary model) { if (model.wasPropertyExplicitlySet("lifecycleDetails")) { this.lifecycleDetails(model.getLifecycleDetails()); } + if (model.wasPropertyExplicitlySet("lastCompletedFsuCycleId")) { + this.lastCompletedFsuCycleId(model.getLastCompletedFsuCycleId()); + } if (model.wasPropertyExplicitlySet("freeformTags")) { this.freeformTags(model.getFreeformTags()); } @@ -261,6 +274,7 @@ public GiFsuCollectionSummary( java.util.Date timeUpdated, CollectionLifecycleStates lifecycleState, String lifecycleDetails, + String lastCompletedFsuCycleId, java.util.Map freeformTags, java.util.Map> definedTags, java.util.Map> systemTags, @@ -276,6 +290,7 @@ public GiFsuCollectionSummary( timeUpdated, lifecycleState, lifecycleDetails, + lastCompletedFsuCycleId, freeformTags, definedTags, systemTags); diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/JobTypes.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/JobTypes.java index 1b6ff67703c..98e23a7200d 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/JobTypes.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/JobTypes.java @@ -11,6 +11,7 @@ public enum JobTypes implements com.oracle.bmc.http.internal.BmcEnum { Precheck("PRECHECK"), Apply("APPLY"), RollbackAndRemoveTarget("ROLLBACK_AND_REMOVE_TARGET"), + RollbackMaintenanceCycle("ROLLBACK_MAINTENANCE_CYCLE"), Cleanup("CLEANUP"), /** diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/OperationType.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/OperationType.java index ccc337889cd..5d0999f9954 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/OperationType.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/OperationType.java @@ -20,6 +20,7 @@ public enum OperationType implements com.oracle.bmc.http.internal.BmcEnum { DeleteMaintenanceCycle("DELETE_MAINTENANCE_CYCLE"), MoveMaintenanceCycle("MOVE_MAINTENANCE_CYCLE"), CloneMaintenanceCycle("CLONE_MAINTENANCE_CYCLE"), + RollbackMaintenanceCycleAction("ROLLBACK_MAINTENANCE_CYCLE_ACTION"), CreateAction("CREATE_ACTION"), UpdateAction("UPDATE_ACTION"), DeleteAction("DELETE_ACTION"), diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/PatchFsuCycle.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/PatchFsuCycle.java index 94aabb44770..fc34d20bc1d 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/PatchFsuCycle.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/PatchFsuCycle.java @@ -90,6 +90,24 @@ public Builder nextActionToExecute( return this; } + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedActionId") + private String lastCompletedActionId; + + public Builder lastCompletedActionId(String lastCompletedActionId) { + this.lastCompletedActionId = lastCompletedActionId; + this.__explicitlySet__.add("lastCompletedActionId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("rollbackCycleState") + private RollbackCycleStates rollbackCycleState; + + public Builder rollbackCycleState(RollbackCycleStates rollbackCycleState) { + this.rollbackCycleState = rollbackCycleState; + this.__explicitlySet__.add("rollbackCycleState"); + return this; + } + @com.fasterxml.jackson.annotation.JsonProperty("lastCompletedAction") private DetailedActionTypes lastCompletedAction; @@ -294,6 +312,8 @@ public PatchFsuCycle build() { this.collectionType, this.executingFsuActionId, this.nextActionToExecute, + this.lastCompletedActionId, + this.rollbackCycleState, this.lastCompletedAction, this.goalVersionDetails, this.batchingStrategy, @@ -341,6 +361,12 @@ public Builder copy(PatchFsuCycle model) { if (model.wasPropertyExplicitlySet("nextActionToExecute")) { this.nextActionToExecute(model.getNextActionToExecute()); } + if (model.wasPropertyExplicitlySet("lastCompletedActionId")) { + this.lastCompletedActionId(model.getLastCompletedActionId()); + } + if (model.wasPropertyExplicitlySet("rollbackCycleState")) { + this.rollbackCycleState(model.getRollbackCycleState()); + } if (model.wasPropertyExplicitlySet("lastCompletedAction")) { this.lastCompletedAction(model.getLastCompletedAction()); } @@ -417,6 +443,8 @@ public PatchFsuCycle( CollectionTypes collectionType, String executingFsuActionId, java.util.List nextActionToExecute, + String lastCompletedActionId, + RollbackCycleStates rollbackCycleState, DetailedActionTypes lastCompletedAction, FsuGoalVersionDetails goalVersionDetails, BatchingStrategyDetails batchingStrategy, @@ -443,6 +471,8 @@ public PatchFsuCycle( collectionType, executingFsuActionId, nextActionToExecute, + lastCompletedActionId, + rollbackCycleState, lastCompletedAction, goalVersionDetails, batchingStrategy, diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleAction.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleAction.java new file mode 100644 index 00000000000..e27fbba7e73 --- /dev/null +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleAction.java @@ -0,0 +1,385 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.fleetsoftwareupdate.model; + +/** + * Rollback Cycle Exadata Fleet Update Action details. This will rollback all the targets in the + * maintenance cycle with the Collection in place.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220528") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = RollbackCycleAction.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class RollbackCycleAction extends FsuAction { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + 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("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + 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("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("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("timeFinished") + private java.util.Date timeFinished; + + public Builder timeFinished(java.util.Date timeFinished) { + this.timeFinished = timeFinished; + this.__explicitlySet__.add("timeFinished"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeUpdated") + private java.util.Date timeUpdated; + + public Builder timeUpdated(java.util.Date timeUpdated) { + this.timeUpdated = timeUpdated; + this.__explicitlySet__.add("timeUpdated"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private ActionLifecycleStates lifecycleState; + + public Builder lifecycleState(ActionLifecycleStates 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("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("systemTags") + private java.util.Map> systemTags; + + public Builder systemTags(java.util.Map> systemTags) { + this.systemTags = systemTags; + this.__explicitlySet__.add("systemTags"); + return this; + } + /** OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private String fsuCycleId; + + /** + * OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. + * + * @param fsuCycleId the value to set + * @return this builder + */ + public Builder fsuCycleId(String fsuCycleId) { + this.fsuCycleId = fsuCycleId; + this.__explicitlySet__.add("fsuCycleId"); + return this; + } + /** OCID identifier for the Exadata Fleet Update Action. */ + @com.fasterxml.jackson.annotation.JsonProperty("relatedFsuActionId") + private String relatedFsuActionId; + + /** + * OCID identifier for the Exadata Fleet Update Action. + * + * @param relatedFsuActionId the value to set + * @return this builder + */ + public Builder relatedFsuActionId(String relatedFsuActionId) { + this.relatedFsuActionId = relatedFsuActionId; + this.__explicitlySet__.add("relatedFsuActionId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("progress") + private FsuActionProgressDetails progress; + + public Builder progress(FsuActionProgressDetails progress) { + this.progress = progress; + this.__explicitlySet__.add("progress"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public RollbackCycleAction build() { + RollbackCycleAction model = + new RollbackCycleAction( + this.id, + this.displayName, + this.compartmentId, + this.timeCreated, + this.timeStarted, + this.timeFinished, + this.timeUpdated, + this.lifecycleState, + this.lifecycleDetails, + this.freeformTags, + this.definedTags, + this.systemTags, + this.fsuCycleId, + this.relatedFsuActionId, + this.progress); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(RollbackCycleAction model) { + if (model.wasPropertyExplicitlySet("id")) { + this.id(model.getId()); + } + if (model.wasPropertyExplicitlySet("displayName")) { + this.displayName(model.getDisplayName()); + } + if (model.wasPropertyExplicitlySet("compartmentId")) { + this.compartmentId(model.getCompartmentId()); + } + if (model.wasPropertyExplicitlySet("timeCreated")) { + this.timeCreated(model.getTimeCreated()); + } + if (model.wasPropertyExplicitlySet("timeStarted")) { + this.timeStarted(model.getTimeStarted()); + } + if (model.wasPropertyExplicitlySet("timeFinished")) { + this.timeFinished(model.getTimeFinished()); + } + if (model.wasPropertyExplicitlySet("timeUpdated")) { + this.timeUpdated(model.getTimeUpdated()); + } + if (model.wasPropertyExplicitlySet("lifecycleState")) { + this.lifecycleState(model.getLifecycleState()); + } + if (model.wasPropertyExplicitlySet("lifecycleDetails")) { + this.lifecycleDetails(model.getLifecycleDetails()); + } + if (model.wasPropertyExplicitlySet("freeformTags")) { + this.freeformTags(model.getFreeformTags()); + } + if (model.wasPropertyExplicitlySet("definedTags")) { + this.definedTags(model.getDefinedTags()); + } + if (model.wasPropertyExplicitlySet("systemTags")) { + this.systemTags(model.getSystemTags()); + } + if (model.wasPropertyExplicitlySet("fsuCycleId")) { + this.fsuCycleId(model.getFsuCycleId()); + } + if (model.wasPropertyExplicitlySet("relatedFsuActionId")) { + this.relatedFsuActionId(model.getRelatedFsuActionId()); + } + if (model.wasPropertyExplicitlySet("progress")) { + this.progress(model.getProgress()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public RollbackCycleAction( + String id, + String displayName, + String compartmentId, + java.util.Date timeCreated, + java.util.Date timeStarted, + java.util.Date timeFinished, + java.util.Date timeUpdated, + ActionLifecycleStates lifecycleState, + String lifecycleDetails, + java.util.Map freeformTags, + java.util.Map> definedTags, + java.util.Map> systemTags, + String fsuCycleId, + String relatedFsuActionId, + FsuActionProgressDetails progress) { + super( + id, + displayName, + compartmentId, + timeCreated, + timeStarted, + timeFinished, + timeUpdated, + lifecycleState, + lifecycleDetails, + freeformTags, + definedTags, + systemTags); + this.fsuCycleId = fsuCycleId; + this.relatedFsuActionId = relatedFsuActionId; + this.progress = progress; + } + + /** OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private final String fsuCycleId; + + /** + * OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. + * + * @return the value + */ + public String getFsuCycleId() { + return fsuCycleId; + } + + /** OCID identifier for the Exadata Fleet Update Action. */ + @com.fasterxml.jackson.annotation.JsonProperty("relatedFsuActionId") + private final String relatedFsuActionId; + + /** + * OCID identifier for the Exadata Fleet Update Action. + * + * @return the value + */ + public String getRelatedFsuActionId() { + return relatedFsuActionId; + } + + @com.fasterxml.jackson.annotation.JsonProperty("progress") + private final FsuActionProgressDetails progress; + + public FsuActionProgressDetails getProgress() { + return progress; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("RollbackCycleAction("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", fsuCycleId=").append(String.valueOf(this.fsuCycleId)); + sb.append(", relatedFsuActionId=").append(String.valueOf(this.relatedFsuActionId)); + sb.append(", progress=").append(String.valueOf(this.progress)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RollbackCycleAction)) { + return false; + } + + RollbackCycleAction other = (RollbackCycleAction) o; + return java.util.Objects.equals(this.fsuCycleId, other.fsuCycleId) + && java.util.Objects.equals(this.relatedFsuActionId, other.relatedFsuActionId) + && java.util.Objects.equals(this.progress, other.progress) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = (result * PRIME) + (this.fsuCycleId == null ? 43 : this.fsuCycleId.hashCode()); + result = + (result * PRIME) + + (this.relatedFsuActionId == null + ? 43 + : this.relatedFsuActionId.hashCode()); + result = (result * PRIME) + (this.progress == null ? 43 : this.progress.hashCode()); + return result; + } +} diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleActionSummary.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleActionSummary.java new file mode 100644 index 00000000000..c960c413d18 --- /dev/null +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleActionSummary.java @@ -0,0 +1,384 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.fleetsoftwareupdate.model; + +/** + * Rollback Cycle Exadata Fleet Update Action summary.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220528") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = RollbackCycleActionSummary.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class RollbackCycleActionSummary extends FsuActionSummary { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + 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("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + 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("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("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("timeFinished") + private java.util.Date timeFinished; + + public Builder timeFinished(java.util.Date timeFinished) { + this.timeFinished = timeFinished; + this.__explicitlySet__.add("timeFinished"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeUpdated") + private java.util.Date timeUpdated; + + public Builder timeUpdated(java.util.Date timeUpdated) { + this.timeUpdated = timeUpdated; + this.__explicitlySet__.add("timeUpdated"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private ActionLifecycleStates lifecycleState; + + public Builder lifecycleState(ActionLifecycleStates 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("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("systemTags") + private java.util.Map> systemTags; + + public Builder systemTags(java.util.Map> systemTags) { + this.systemTags = systemTags; + this.__explicitlySet__.add("systemTags"); + return this; + } + /** OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private String fsuCycleId; + + /** + * OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. + * + * @param fsuCycleId the value to set + * @return this builder + */ + public Builder fsuCycleId(String fsuCycleId) { + this.fsuCycleId = fsuCycleId; + this.__explicitlySet__.add("fsuCycleId"); + return this; + } + /** OCID identifier for the Exadata Fleet Update Action. */ + @com.fasterxml.jackson.annotation.JsonProperty("relatedFsuActionId") + private String relatedFsuActionId; + + /** + * OCID identifier for the Exadata Fleet Update Action. + * + * @param relatedFsuActionId the value to set + * @return this builder + */ + public Builder relatedFsuActionId(String relatedFsuActionId) { + this.relatedFsuActionId = relatedFsuActionId; + this.__explicitlySet__.add("relatedFsuActionId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("progress") + private FsuActionProgressDetails progress; + + public Builder progress(FsuActionProgressDetails progress) { + this.progress = progress; + this.__explicitlySet__.add("progress"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public RollbackCycleActionSummary build() { + RollbackCycleActionSummary model = + new RollbackCycleActionSummary( + this.id, + this.displayName, + this.compartmentId, + this.timeCreated, + this.timeStarted, + this.timeFinished, + this.timeUpdated, + this.lifecycleState, + this.lifecycleDetails, + this.freeformTags, + this.definedTags, + this.systemTags, + this.fsuCycleId, + this.relatedFsuActionId, + this.progress); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(RollbackCycleActionSummary model) { + if (model.wasPropertyExplicitlySet("id")) { + this.id(model.getId()); + } + if (model.wasPropertyExplicitlySet("displayName")) { + this.displayName(model.getDisplayName()); + } + if (model.wasPropertyExplicitlySet("compartmentId")) { + this.compartmentId(model.getCompartmentId()); + } + if (model.wasPropertyExplicitlySet("timeCreated")) { + this.timeCreated(model.getTimeCreated()); + } + if (model.wasPropertyExplicitlySet("timeStarted")) { + this.timeStarted(model.getTimeStarted()); + } + if (model.wasPropertyExplicitlySet("timeFinished")) { + this.timeFinished(model.getTimeFinished()); + } + if (model.wasPropertyExplicitlySet("timeUpdated")) { + this.timeUpdated(model.getTimeUpdated()); + } + if (model.wasPropertyExplicitlySet("lifecycleState")) { + this.lifecycleState(model.getLifecycleState()); + } + if (model.wasPropertyExplicitlySet("lifecycleDetails")) { + this.lifecycleDetails(model.getLifecycleDetails()); + } + if (model.wasPropertyExplicitlySet("freeformTags")) { + this.freeformTags(model.getFreeformTags()); + } + if (model.wasPropertyExplicitlySet("definedTags")) { + this.definedTags(model.getDefinedTags()); + } + if (model.wasPropertyExplicitlySet("systemTags")) { + this.systemTags(model.getSystemTags()); + } + if (model.wasPropertyExplicitlySet("fsuCycleId")) { + this.fsuCycleId(model.getFsuCycleId()); + } + if (model.wasPropertyExplicitlySet("relatedFsuActionId")) { + this.relatedFsuActionId(model.getRelatedFsuActionId()); + } + if (model.wasPropertyExplicitlySet("progress")) { + this.progress(model.getProgress()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public RollbackCycleActionSummary( + String id, + String displayName, + String compartmentId, + java.util.Date timeCreated, + java.util.Date timeStarted, + java.util.Date timeFinished, + java.util.Date timeUpdated, + ActionLifecycleStates lifecycleState, + String lifecycleDetails, + java.util.Map freeformTags, + java.util.Map> definedTags, + java.util.Map> systemTags, + String fsuCycleId, + String relatedFsuActionId, + FsuActionProgressDetails progress) { + super( + id, + displayName, + compartmentId, + timeCreated, + timeStarted, + timeFinished, + timeUpdated, + lifecycleState, + lifecycleDetails, + freeformTags, + definedTags, + systemTags); + this.fsuCycleId = fsuCycleId; + this.relatedFsuActionId = relatedFsuActionId; + this.progress = progress; + } + + /** OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private final String fsuCycleId; + + /** + * OCID identifier for the Exadata Fleet Update Cycle the Action will be part of. + * + * @return the value + */ + public String getFsuCycleId() { + return fsuCycleId; + } + + /** OCID identifier for the Exadata Fleet Update Action. */ + @com.fasterxml.jackson.annotation.JsonProperty("relatedFsuActionId") + private final String relatedFsuActionId; + + /** + * OCID identifier for the Exadata Fleet Update Action. + * + * @return the value + */ + public String getRelatedFsuActionId() { + return relatedFsuActionId; + } + + @com.fasterxml.jackson.annotation.JsonProperty("progress") + private final FsuActionProgressDetails progress; + + public FsuActionProgressDetails getProgress() { + return progress; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("RollbackCycleActionSummary("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", fsuCycleId=").append(String.valueOf(this.fsuCycleId)); + sb.append(", relatedFsuActionId=").append(String.valueOf(this.relatedFsuActionId)); + sb.append(", progress=").append(String.valueOf(this.progress)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RollbackCycleActionSummary)) { + return false; + } + + RollbackCycleActionSummary other = (RollbackCycleActionSummary) o; + return java.util.Objects.equals(this.fsuCycleId, other.fsuCycleId) + && java.util.Objects.equals(this.relatedFsuActionId, other.relatedFsuActionId) + && java.util.Objects.equals(this.progress, other.progress) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = (result * PRIME) + (this.fsuCycleId == null ? 43 : this.fsuCycleId.hashCode()); + result = + (result * PRIME) + + (this.relatedFsuActionId == null + ? 43 + : this.relatedFsuActionId.hashCode()); + result = (result * PRIME) + (this.progress == null ? 43 : this.progress.hashCode()); + return result; + } +} diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleFsuJob.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleFsuJob.java new file mode 100644 index 00000000000..ad39cc61a2c --- /dev/null +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleFsuJob.java @@ -0,0 +1,465 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.fleetsoftwareupdate.model; + +/** + * Rollback Maintenance Cycle Exadata Fleet Update Job resource.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220528") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = RollbackCycleFsuJob.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class RollbackCycleFsuJob extends FsuJob { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + 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("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + 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("fsuActionId") + private String fsuActionId; + + public Builder fsuActionId(String fsuActionId) { + this.fsuActionId = fsuActionId; + this.__explicitlySet__.add("fsuActionId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("progress") + private JobProgressDetails progress; + + public Builder progress(JobProgressDetails progress) { + this.progress = progress; + this.__explicitlySet__.add("progress"); + 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("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("timeUpdated") + private java.util.Date timeUpdated; + + public Builder timeUpdated(java.util.Date timeUpdated) { + this.timeUpdated = timeUpdated; + this.__explicitlySet__.add("timeUpdated"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeFinished") + private java.util.Date timeFinished; + + public Builder timeFinished(java.util.Date timeFinished) { + this.timeFinished = timeFinished; + this.__explicitlySet__.add("timeFinished"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private JobLifecycleStates lifecycleState; + + public Builder lifecycleState(JobLifecycleStates 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("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("systemTags") + private java.util.Map> systemTags; + + public Builder systemTags(java.util.Map> systemTags) { + this.systemTags = systemTags; + this.__explicitlySet__.add("systemTags"); + return this; + } + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Collection that the job is executing on. + */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCollectionId") + private String fsuCollectionId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Collection that the job is executing on. + * + * @param fsuCollectionId the value to set + * @return this builder + */ + public Builder fsuCollectionId(String fsuCollectionId) { + this.fsuCollectionId = fsuCollectionId; + this.__explicitlySet__.add("fsuCollectionId"); + return this; + } + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Cycle that this job is part of. + */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private String fsuCycleId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Cycle that this job is part of. + * + * @param fsuCycleId the value to set + * @return this builder + */ + public Builder fsuCycleId(String fsuCycleId) { + this.fsuCycleId = fsuCycleId; + this.__explicitlySet__.add("fsuCycleId"); + return this; + } + /** OCID of Target resource on which the job is executing the action. */ + @com.fasterxml.jackson.annotation.JsonProperty("targetId") + private String targetId; + + /** + * OCID of Target resource on which the job is executing the action. + * + * @param targetId the value to set + * @return this builder + */ + public Builder targetId(String targetId) { + this.targetId = targetId; + this.__explicitlySet__.add("targetId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("schedule") + private ScheduleDetails schedule; + + public Builder schedule(ScheduleDetails schedule) { + this.schedule = schedule; + this.__explicitlySet__.add("schedule"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public RollbackCycleFsuJob build() { + RollbackCycleFsuJob model = + new RollbackCycleFsuJob( + this.id, + this.displayName, + this.compartmentId, + this.fsuActionId, + this.progress, + this.timeCreated, + this.timeStarted, + this.timeUpdated, + this.timeFinished, + this.lifecycleState, + this.lifecycleDetails, + this.freeformTags, + this.definedTags, + this.systemTags, + this.fsuCollectionId, + this.fsuCycleId, + this.targetId, + this.schedule); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(RollbackCycleFsuJob model) { + if (model.wasPropertyExplicitlySet("id")) { + this.id(model.getId()); + } + if (model.wasPropertyExplicitlySet("displayName")) { + this.displayName(model.getDisplayName()); + } + if (model.wasPropertyExplicitlySet("compartmentId")) { + this.compartmentId(model.getCompartmentId()); + } + if (model.wasPropertyExplicitlySet("fsuActionId")) { + this.fsuActionId(model.getFsuActionId()); + } + if (model.wasPropertyExplicitlySet("progress")) { + this.progress(model.getProgress()); + } + if (model.wasPropertyExplicitlySet("timeCreated")) { + this.timeCreated(model.getTimeCreated()); + } + if (model.wasPropertyExplicitlySet("timeStarted")) { + this.timeStarted(model.getTimeStarted()); + } + if (model.wasPropertyExplicitlySet("timeUpdated")) { + this.timeUpdated(model.getTimeUpdated()); + } + if (model.wasPropertyExplicitlySet("timeFinished")) { + this.timeFinished(model.getTimeFinished()); + } + if (model.wasPropertyExplicitlySet("lifecycleState")) { + this.lifecycleState(model.getLifecycleState()); + } + if (model.wasPropertyExplicitlySet("lifecycleDetails")) { + this.lifecycleDetails(model.getLifecycleDetails()); + } + if (model.wasPropertyExplicitlySet("freeformTags")) { + this.freeformTags(model.getFreeformTags()); + } + if (model.wasPropertyExplicitlySet("definedTags")) { + this.definedTags(model.getDefinedTags()); + } + if (model.wasPropertyExplicitlySet("systemTags")) { + this.systemTags(model.getSystemTags()); + } + if (model.wasPropertyExplicitlySet("fsuCollectionId")) { + this.fsuCollectionId(model.getFsuCollectionId()); + } + if (model.wasPropertyExplicitlySet("fsuCycleId")) { + this.fsuCycleId(model.getFsuCycleId()); + } + if (model.wasPropertyExplicitlySet("targetId")) { + this.targetId(model.getTargetId()); + } + if (model.wasPropertyExplicitlySet("schedule")) { + this.schedule(model.getSchedule()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public RollbackCycleFsuJob( + String id, + String displayName, + String compartmentId, + String fsuActionId, + JobProgressDetails progress, + java.util.Date timeCreated, + java.util.Date timeStarted, + java.util.Date timeUpdated, + java.util.Date timeFinished, + JobLifecycleStates lifecycleState, + String lifecycleDetails, + java.util.Map freeformTags, + java.util.Map> definedTags, + java.util.Map> systemTags, + String fsuCollectionId, + String fsuCycleId, + String targetId, + ScheduleDetails schedule) { + super( + id, + displayName, + compartmentId, + fsuActionId, + progress, + timeCreated, + timeStarted, + timeUpdated, + timeFinished, + lifecycleState, + lifecycleDetails, + freeformTags, + definedTags, + systemTags); + this.fsuCollectionId = fsuCollectionId; + this.fsuCycleId = fsuCycleId; + this.targetId = targetId; + this.schedule = schedule; + } + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Collection that the job is executing on. + */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCollectionId") + private final String fsuCollectionId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Collection that the job is executing on. + * + * @return the value + */ + public String getFsuCollectionId() { + return fsuCollectionId; + } + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Cycle that this job is part of. + */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private final String fsuCycleId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Cycle that this job is part of. + * + * @return the value + */ + public String getFsuCycleId() { + return fsuCycleId; + } + + /** OCID of Target resource on which the job is executing the action. */ + @com.fasterxml.jackson.annotation.JsonProperty("targetId") + private final String targetId; + + /** + * OCID of Target resource on which the job is executing the action. + * + * @return the value + */ + public String getTargetId() { + return targetId; + } + + @com.fasterxml.jackson.annotation.JsonProperty("schedule") + private final ScheduleDetails schedule; + + public ScheduleDetails getSchedule() { + return schedule; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("RollbackCycleFsuJob("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", fsuCollectionId=").append(String.valueOf(this.fsuCollectionId)); + sb.append(", fsuCycleId=").append(String.valueOf(this.fsuCycleId)); + sb.append(", targetId=").append(String.valueOf(this.targetId)); + sb.append(", schedule=").append(String.valueOf(this.schedule)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RollbackCycleFsuJob)) { + return false; + } + + RollbackCycleFsuJob other = (RollbackCycleFsuJob) o; + return java.util.Objects.equals(this.fsuCollectionId, other.fsuCollectionId) + && java.util.Objects.equals(this.fsuCycleId, other.fsuCycleId) + && java.util.Objects.equals(this.targetId, other.targetId) + && java.util.Objects.equals(this.schedule, other.schedule) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.fsuCollectionId == null ? 43 : this.fsuCollectionId.hashCode()); + result = (result * PRIME) + (this.fsuCycleId == null ? 43 : this.fsuCycleId.hashCode()); + result = (result * PRIME) + (this.targetId == null ? 43 : this.targetId.hashCode()); + result = (result * PRIME) + (this.schedule == null ? 43 : this.schedule.hashCode()); + return result; + } +} diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleFsuJobSummary.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleFsuJobSummary.java new file mode 100644 index 00000000000..738c1d72d62 --- /dev/null +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleFsuJobSummary.java @@ -0,0 +1,440 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.fleetsoftwareupdate.model; + +/** + * Summary of Rollback Cycle Targets Exadata Fleet Update Job resource.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220528") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = RollbackCycleFsuJobSummary.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class RollbackCycleFsuJobSummary extends FsuJobSummary { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + 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("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + 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("fsuActionId") + private String fsuActionId; + + public Builder fsuActionId(String fsuActionId) { + this.fsuActionId = fsuActionId; + this.__explicitlySet__.add("fsuActionId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("progress") + private JobProgress progress; + + public Builder progress(JobProgress progress) { + this.progress = progress; + this.__explicitlySet__.add("progress"); + 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("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("timeUpdated") + private java.util.Date timeUpdated; + + public Builder timeUpdated(java.util.Date timeUpdated) { + this.timeUpdated = timeUpdated; + this.__explicitlySet__.add("timeUpdated"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("timeFinished") + private java.util.Date timeFinished; + + public Builder timeFinished(java.util.Date timeFinished) { + this.timeFinished = timeFinished; + this.__explicitlySet__.add("timeFinished"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState") + private JobLifecycleStates lifecycleState; + + public Builder lifecycleState(JobLifecycleStates 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("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("systemTags") + private java.util.Map> systemTags; + + public Builder systemTags(java.util.Map> systemTags) { + this.systemTags = systemTags; + this.__explicitlySet__.add("systemTags"); + return this; + } + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Collection that the job is executing on. + */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCollectionId") + private String fsuCollectionId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Collection that the job is executing on. + * + * @param fsuCollectionId the value to set + * @return this builder + */ + public Builder fsuCollectionId(String fsuCollectionId) { + this.fsuCollectionId = fsuCollectionId; + this.__explicitlySet__.add("fsuCollectionId"); + return this; + } + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Cycle that this job is part of. + */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private String fsuCycleId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Cycle that this job is part of. + * + * @param fsuCycleId the value to set + * @return this builder + */ + public Builder fsuCycleId(String fsuCycleId) { + this.fsuCycleId = fsuCycleId; + this.__explicitlySet__.add("fsuCycleId"); + return this; + } + /** OCID of Target resource on which the job is executing the action. */ + @com.fasterxml.jackson.annotation.JsonProperty("targetId") + private String targetId; + + /** + * OCID of Target resource on which the job is executing the action. + * + * @param targetId the value to set + * @return this builder + */ + public Builder targetId(String targetId) { + this.targetId = targetId; + this.__explicitlySet__.add("targetId"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public RollbackCycleFsuJobSummary build() { + RollbackCycleFsuJobSummary model = + new RollbackCycleFsuJobSummary( + this.id, + this.displayName, + this.compartmentId, + this.fsuActionId, + this.progress, + this.timeCreated, + this.timeStarted, + this.timeUpdated, + this.timeFinished, + this.lifecycleState, + this.lifecycleDetails, + this.freeformTags, + this.definedTags, + this.systemTags, + this.fsuCollectionId, + this.fsuCycleId, + this.targetId); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(RollbackCycleFsuJobSummary model) { + if (model.wasPropertyExplicitlySet("id")) { + this.id(model.getId()); + } + if (model.wasPropertyExplicitlySet("displayName")) { + this.displayName(model.getDisplayName()); + } + if (model.wasPropertyExplicitlySet("compartmentId")) { + this.compartmentId(model.getCompartmentId()); + } + if (model.wasPropertyExplicitlySet("fsuActionId")) { + this.fsuActionId(model.getFsuActionId()); + } + if (model.wasPropertyExplicitlySet("progress")) { + this.progress(model.getProgress()); + } + if (model.wasPropertyExplicitlySet("timeCreated")) { + this.timeCreated(model.getTimeCreated()); + } + if (model.wasPropertyExplicitlySet("timeStarted")) { + this.timeStarted(model.getTimeStarted()); + } + if (model.wasPropertyExplicitlySet("timeUpdated")) { + this.timeUpdated(model.getTimeUpdated()); + } + if (model.wasPropertyExplicitlySet("timeFinished")) { + this.timeFinished(model.getTimeFinished()); + } + if (model.wasPropertyExplicitlySet("lifecycleState")) { + this.lifecycleState(model.getLifecycleState()); + } + if (model.wasPropertyExplicitlySet("lifecycleDetails")) { + this.lifecycleDetails(model.getLifecycleDetails()); + } + if (model.wasPropertyExplicitlySet("freeformTags")) { + this.freeformTags(model.getFreeformTags()); + } + if (model.wasPropertyExplicitlySet("definedTags")) { + this.definedTags(model.getDefinedTags()); + } + if (model.wasPropertyExplicitlySet("systemTags")) { + this.systemTags(model.getSystemTags()); + } + if (model.wasPropertyExplicitlySet("fsuCollectionId")) { + this.fsuCollectionId(model.getFsuCollectionId()); + } + if (model.wasPropertyExplicitlySet("fsuCycleId")) { + this.fsuCycleId(model.getFsuCycleId()); + } + if (model.wasPropertyExplicitlySet("targetId")) { + this.targetId(model.getTargetId()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public RollbackCycleFsuJobSummary( + String id, + String displayName, + String compartmentId, + String fsuActionId, + JobProgress progress, + java.util.Date timeCreated, + java.util.Date timeStarted, + java.util.Date timeUpdated, + java.util.Date timeFinished, + JobLifecycleStates lifecycleState, + String lifecycleDetails, + java.util.Map freeformTags, + java.util.Map> definedTags, + java.util.Map> systemTags, + String fsuCollectionId, + String fsuCycleId, + String targetId) { + super( + id, + displayName, + compartmentId, + fsuActionId, + progress, + timeCreated, + timeStarted, + timeUpdated, + timeFinished, + lifecycleState, + lifecycleDetails, + freeformTags, + definedTags, + systemTags); + this.fsuCollectionId = fsuCollectionId; + this.fsuCycleId = fsuCycleId; + this.targetId = targetId; + } + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Collection that the job is executing on. + */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCollectionId") + private final String fsuCollectionId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Collection that the job is executing on. + * + * @return the value + */ + public String getFsuCollectionId() { + return fsuCollectionId; + } + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Cycle that this job is part of. + */ + @com.fasterxml.jackson.annotation.JsonProperty("fsuCycleId") + private final String fsuCycleId; + + /** + * The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the + * Exadata Fleet Update Cycle that this job is part of. + * + * @return the value + */ + public String getFsuCycleId() { + return fsuCycleId; + } + + /** OCID of Target resource on which the job is executing the action. */ + @com.fasterxml.jackson.annotation.JsonProperty("targetId") + private final String targetId; + + /** + * OCID of Target resource on which the job is executing the action. + * + * @return the value + */ + public String getTargetId() { + return targetId; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("RollbackCycleFsuJobSummary("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", fsuCollectionId=").append(String.valueOf(this.fsuCollectionId)); + sb.append(", fsuCycleId=").append(String.valueOf(this.fsuCycleId)); + sb.append(", targetId=").append(String.valueOf(this.targetId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof RollbackCycleFsuJobSummary)) { + return false; + } + + RollbackCycleFsuJobSummary other = (RollbackCycleFsuJobSummary) o; + return java.util.Objects.equals(this.fsuCollectionId, other.fsuCollectionId) + && java.util.Objects.equals(this.fsuCycleId, other.fsuCycleId) + && java.util.Objects.equals(this.targetId, other.targetId) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.fsuCollectionId == null ? 43 : this.fsuCollectionId.hashCode()); + result = (result * PRIME) + (this.fsuCycleId == null ? 43 : this.fsuCycleId.hashCode()); + result = (result * PRIME) + (this.targetId == null ? 43 : this.targetId.hashCode()); + return result; + } +} diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleStates.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleStates.java new file mode 100644 index 00000000000..87122a104f3 --- /dev/null +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/RollbackCycleStates.java @@ -0,0 +1,56 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.fleetsoftwareupdate.model; + +/** Possible rollback cycle states for the Exadata Fleet Update Cycle resource. */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220528") +public enum RollbackCycleStates implements com.oracle.bmc.http.internal.BmcEnum { + AbleToExecute("ABLE_TO_EXECUTE"), + InProgress("IN_PROGRESS"), + Failed("FAILED"), + NeedsAttention("NEEDS_ATTENTION"), + Succeeded("SUCCEEDED"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(RollbackCycleStates.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (RollbackCycleStates v : RollbackCycleStates.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + RollbackCycleStates(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static RollbackCycleStates create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'RollbackCycleStates', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } +} diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/UpdateFsuActionDetails.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/UpdateFsuActionDetails.java index 8f7c08de58a..b2c3c6b542c 100644 --- a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/UpdateFsuActionDetails.java +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/UpdateFsuActionDetails.java @@ -22,6 +22,9 @@ property = "type", defaultImpl = UpdateFsuActionDetails.class) @com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = UpdateRollbackCycleActionDetails.class, + name = "ROLLBACK_MAINTENANCE_CYCLE"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type( value = UpdateStageActionDetails.class, name = "STAGE"), diff --git a/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/UpdateRollbackCycleActionDetails.java b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/UpdateRollbackCycleActionDetails.java new file mode 100644 index 00000000000..3ccd09629da --- /dev/null +++ b/bmc-fleetsoftwareupdate/src/main/java/com/oracle/bmc/fleetsoftwareupdate/model/UpdateRollbackCycleActionDetails.java @@ -0,0 +1,141 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.fleetsoftwareupdate.model; + +/** + * Rollback Cycle Exadata Fleet Update Action update details.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220528") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = UpdateRollbackCycleActionDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "type") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class UpdateRollbackCycleActionDetails extends UpdateFsuActionDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + @com.fasterxml.jackson.annotation.JsonProperty("displayName") + private String displayName; + + public Builder displayName(String displayName) { + this.displayName = displayName; + this.__explicitlySet__.add("displayName"); + return this; + } + + @com.fasterxml.jackson.annotation.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.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public UpdateRollbackCycleActionDetails build() { + UpdateRollbackCycleActionDetails model = + new UpdateRollbackCycleActionDetails( + this.displayName, this.freeformTags, this.definedTags); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(UpdateRollbackCycleActionDetails model) { + if (model.wasPropertyExplicitlySet("displayName")) { + this.displayName(model.getDisplayName()); + } + if (model.wasPropertyExplicitlySet("freeformTags")) { + this.freeformTags(model.getFreeformTags()); + } + if (model.wasPropertyExplicitlySet("definedTags")) { + this.definedTags(model.getDefinedTags()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public UpdateRollbackCycleActionDetails( + String displayName, + java.util.Map freeformTags, + java.util.Map> definedTags) { + super(displayName, freeformTags, definedTags); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("UpdateRollbackCycleActionDetails("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof UpdateRollbackCycleActionDetails)) { + return false; + } + + UpdateRollbackCycleActionDetails other = (UpdateRollbackCycleActionDetails) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + return result; + } +} diff --git a/bmc-fleetsoftwareupdate/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-fleetsoftwareupdate/reflect-config.json b/bmc-fleetsoftwareupdate/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-fleetsoftwareupdate/reflect-config.json index c1eeeb3505b..df9889e2e74 100644 --- a/bmc-fleetsoftwareupdate/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-fleetsoftwareupdate/reflect-config.json +++ b/bmc-fleetsoftwareupdate/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-fleetsoftwareupdate/reflect-config.json @@ -440,6 +440,20 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.CreateRollbackCycleApplyActionDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.CreateRollbackCycleApplyActionDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.fleetsoftwareupdate.model.CreateScheduleDetails", @@ -1617,6 +1631,68 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleAction", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleAction$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleActionSummary", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleActionSummary$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleFsuJob", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleFsuJob$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleFsuJobSummary", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleFsuJobSummary$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackCycleStates", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.fleetsoftwareupdate.model.RollbackDetails", @@ -2043,6 +2119,20 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.UpdateRollbackCycleActionDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.fleetsoftwareupdate.model.UpdateRollbackCycleActionDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.fleetsoftwareupdate.model.UpdateScheduleDetails", diff --git a/bmc-fleetsoftwareupdate/src/main/resources/com/oracle/bmc/fleetsoftwareupdate/client.properties b/bmc-fleetsoftwareupdate/src/main/resources/com/oracle/bmc/fleetsoftwareupdate/client.properties index 311f68dd030..eaea2204aef 100644 --- a/bmc-fleetsoftwareupdate/src/main/resources/com/oracle/bmc/fleetsoftwareupdate/client.properties +++ b/bmc-fleetsoftwareupdate/src/main/resources/com/oracle/bmc/fleetsoftwareupdate/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220528") \ No newline at end of file diff --git a/bmc-full/pom.xml b/bmc-full/pom.xml index ff63f6e54a9..e8509826acf 100644 --- a/bmc-full/pom.xml +++ b/bmc-full/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-full @@ -16,7 +16,7 @@ com.oracle.oci.sdk oci-java-sdk-bom - 3.54.0 + 3.55.0 pom import diff --git a/bmc-functions/pom.xml b/bmc-functions/pom.xml index 1b46514394b..4c30aa36adf 100644 --- a/bmc-functions/pom.xml +++ b/bmc-functions/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-functions @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-functions/src/main/resources/com/oracle/bmc/functions/client.properties b/bmc-functions/src/main/resources/com/oracle/bmc/functions/client.properties index f5c0d9ad84f..758eca6b499 100644 --- a/bmc-functions/src/main/resources/com/oracle/bmc/functions/client.properties +++ b/bmc-functions/src/main/resources/com/oracle/bmc/functions/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181201") \ No newline at end of file diff --git a/bmc-fusionapps/pom.xml b/bmc-fusionapps/pom.xml index fb4c2042a79..f286a628df1 100644 --- a/bmc-fusionapps/pom.xml +++ b/bmc-fusionapps/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-fusionapps @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-fusionapps/src/main/resources/com/oracle/bmc/fusionapps/client.properties b/bmc-fusionapps/src/main/resources/com/oracle/bmc/fusionapps/client.properties index c1a5c2f070f..bae7c0d2083 100644 --- a/bmc-fusionapps/src/main/resources/com/oracle/bmc/fusionapps/client.properties +++ b/bmc-fusionapps/src/main/resources/com/oracle/bmc/fusionapps/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20211201") \ No newline at end of file diff --git a/bmc-generativeai/pom.xml b/bmc-generativeai/pom.xml index becd49870fd..6eb3d8229d4 100644 --- a/bmc-generativeai/pom.xml +++ b/bmc-generativeai/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-generativeai @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-generativeai/src/main/resources/com/oracle/bmc/generativeai/client.properties b/bmc-generativeai/src/main/resources/com/oracle/bmc/generativeai/client.properties index 7aaa62c8432..799561939a8 100644 --- a/bmc-generativeai/src/main/resources/com/oracle/bmc/generativeai/client.properties +++ b/bmc-generativeai/src/main/resources/com/oracle/bmc/generativeai/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20231130") \ No newline at end of file diff --git a/bmc-generativeaiagent/pom.xml b/bmc-generativeaiagent/pom.xml index ba70db683cf..d07a5d1cc23 100644 --- a/bmc-generativeaiagent/pom.xml +++ b/bmc-generativeaiagent/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-generativeaiagent @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-generativeaiagent/src/main/resources/com/oracle/bmc/generativeaiagent/client.properties b/bmc-generativeaiagent/src/main/resources/com/oracle/bmc/generativeaiagent/client.properties index 8ab098603df..15c86ae828d 100644 --- a/bmc-generativeaiagent/src/main/resources/com/oracle/bmc/generativeaiagent/client.properties +++ b/bmc-generativeaiagent/src/main/resources/com/oracle/bmc/generativeaiagent/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20240531") \ No newline at end of file diff --git a/bmc-generativeaiagentruntime/pom.xml b/bmc-generativeaiagentruntime/pom.xml index ae650bf4eca..da48082c5ae 100644 --- a/bmc-generativeaiagentruntime/pom.xml +++ b/bmc-generativeaiagentruntime/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-generativeaiagentruntime @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-generativeaiagentruntime/src/main/resources/com/oracle/bmc/generativeaiagentruntime/client.properties b/bmc-generativeaiagentruntime/src/main/resources/com/oracle/bmc/generativeaiagentruntime/client.properties index 8ab098603df..15c86ae828d 100644 --- a/bmc-generativeaiagentruntime/src/main/resources/com/oracle/bmc/generativeaiagentruntime/client.properties +++ b/bmc-generativeaiagentruntime/src/main/resources/com/oracle/bmc/generativeaiagentruntime/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20240531") \ No newline at end of file diff --git a/bmc-generativeaiinference/pom.xml b/bmc-generativeaiinference/pom.xml index cc2a5b4b02e..a75d125e2da 100644 --- a/bmc-generativeaiinference/pom.xml +++ b/bmc-generativeaiinference/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-generativeaiinference @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-generativeaiinference/src/main/resources/com/oracle/bmc/generativeaiinference/client.properties b/bmc-generativeaiinference/src/main/resources/com/oracle/bmc/generativeaiinference/client.properties index 7aaa62c8432..799561939a8 100644 --- a/bmc-generativeaiinference/src/main/resources/com/oracle/bmc/generativeaiinference/client.properties +++ b/bmc-generativeaiinference/src/main/resources/com/oracle/bmc/generativeaiinference/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20231130") \ No newline at end of file diff --git a/bmc-genericartifactscontent/pom.xml b/bmc-genericartifactscontent/pom.xml index 41836d79bf8..1d0ae630c33 100644 --- a/bmc-genericartifactscontent/pom.xml +++ b/bmc-genericartifactscontent/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-genericartifactscontent @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-genericartifactscontent/src/main/resources/com/oracle/bmc/genericartifactscontent/client.properties b/bmc-genericartifactscontent/src/main/resources/com/oracle/bmc/genericartifactscontent/client.properties index 73df68dc2f1..0ca15ebfe64 100644 --- a/bmc-genericartifactscontent/src/main/resources/com/oracle/bmc/genericartifactscontent/client.properties +++ b/bmc-genericartifactscontent/src/main/resources/com/oracle/bmc/genericartifactscontent/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") \ No newline at end of file diff --git a/bmc-globallydistributeddatabase/pom.xml b/bmc-globallydistributeddatabase/pom.xml index 5b1ca107bce..f2aa0e1ba92 100644 --- a/bmc-globallydistributeddatabase/pom.xml +++ b/bmc-globallydistributeddatabase/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-globallydistributeddatabase @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-globallydistributeddatabase/src/main/resources/com/oracle/bmc/globallydistributeddatabase/client.properties b/bmc-globallydistributeddatabase/src/main/resources/com/oracle/bmc/globallydistributeddatabase/client.properties index c06393f62ae..9f44ca749de 100644 --- a/bmc-globallydistributeddatabase/src/main/resources/com/oracle/bmc/globallydistributeddatabase/client.properties +++ b/bmc-globallydistributeddatabase/src/main/resources/com/oracle/bmc/globallydistributeddatabase/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230301") \ No newline at end of file diff --git a/bmc-goldengate/pom.xml b/bmc-goldengate/pom.xml index f8f378b7a1c..833836220f0 100644 --- a/bmc-goldengate/pom.xml +++ b/bmc-goldengate/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-goldengate @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-goldengate/src/main/resources/com/oracle/bmc/goldengate/client.properties b/bmc-goldengate/src/main/resources/com/oracle/bmc/goldengate/client.properties index 78b189f3782..81a7c9610e5 100644 --- a/bmc-goldengate/src/main/resources/com/oracle/bmc/goldengate/client.properties +++ b/bmc-goldengate/src/main/resources/com/oracle/bmc/goldengate/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200407") \ No newline at end of file diff --git a/bmc-governancerulescontrolplane/pom.xml b/bmc-governancerulescontrolplane/pom.xml index 9bb5b8301ac..22a8ae50b81 100644 --- a/bmc-governancerulescontrolplane/pom.xml +++ b/bmc-governancerulescontrolplane/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-governancerulescontrolplane @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-governancerulescontrolplane/src/main/resources/com/oracle/bmc/governancerulescontrolplane/client.properties b/bmc-governancerulescontrolplane/src/main/resources/com/oracle/bmc/governancerulescontrolplane/client.properties index f9aa909f142..6b4a44ad208 100644 --- a/bmc-governancerulescontrolplane/src/main/resources/com/oracle/bmc/governancerulescontrolplane/client.properties +++ b/bmc-governancerulescontrolplane/src/main/resources/com/oracle/bmc/governancerulescontrolplane/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220504") \ No newline at end of file diff --git a/bmc-healthchecks/pom.xml b/bmc-healthchecks/pom.xml index 1fcac67aae1..d693a313594 100644 --- a/bmc-healthchecks/pom.xml +++ b/bmc-healthchecks/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-healthchecks @@ -16,7 +16,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-healthchecks/src/main/resources/com/oracle/bmc/healthchecks/client.properties b/bmc-healthchecks/src/main/resources/com/oracle/bmc/healthchecks/client.properties index 5c7c9463d78..c3a7b9080ba 100644 --- a/bmc-healthchecks/src/main/resources/com/oracle/bmc/healthchecks/client.properties +++ b/bmc-healthchecks/src/main/resources/com/oracle/bmc/healthchecks/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180501") \ No newline at end of file diff --git a/bmc-identity/pom.xml b/bmc-identity/pom.xml index f45e2adf84c..dc4c04e2487 100644 --- a/bmc-identity/pom.xml +++ b/bmc-identity/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-identity/src/main/resources/com/oracle/bmc/identity/client.properties b/bmc-identity/src/main/resources/com/oracle/bmc/identity/client.properties index 73df68dc2f1..0ca15ebfe64 100644 --- a/bmc-identity/src/main/resources/com/oracle/bmc/identity/client.properties +++ b/bmc-identity/src/main/resources/com/oracle/bmc/identity/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") \ No newline at end of file diff --git a/bmc-identitydataplane/pom.xml b/bmc-identitydataplane/pom.xml index 42a2f95dcb7..0efd209324c 100644 --- a/bmc-identitydataplane/pom.xml +++ b/bmc-identitydataplane/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-identitydataplane @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-identitydataplane/src/main/resources/com/oracle/bmc/identitydataplane/client.properties b/bmc-identitydataplane/src/main/resources/com/oracle/bmc/identitydataplane/client.properties index a0cc2b3b41a..0a426a396ef 100644 --- a/bmc-identitydataplane/src/main/resources/com/oracle/bmc/identitydataplane/client.properties +++ b/bmc-identitydataplane/src/main/resources/com/oracle/bmc/identitydataplane/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: v1") \ No newline at end of file diff --git a/bmc-identitydomains/pom.xml b/bmc-identitydomains/pom.xml index 62e472c5c45..bc40ecbe34f 100644 --- a/bmc-identitydomains/pom.xml +++ b/bmc-identitydomains/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-identitydomains @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-identitydomains/src/main/resources/com/oracle/bmc/identitydomains/client.properties b/bmc-identitydomains/src/main/resources/com/oracle/bmc/identitydomains/client.properties index a0cc2b3b41a..0a426a396ef 100644 --- a/bmc-identitydomains/src/main/resources/com/oracle/bmc/identitydomains/client.properties +++ b/bmc-identitydomains/src/main/resources/com/oracle/bmc/identitydomains/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: v1") \ No newline at end of file diff --git a/bmc-integration/pom.xml b/bmc-integration/pom.xml index 68d681aa494..1b25551787e 100644 --- a/bmc-integration/pom.xml +++ b/bmc-integration/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-integration @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-integration/src/main/resources/com/oracle/bmc/integration/client.properties b/bmc-integration/src/main/resources/com/oracle/bmc/integration/client.properties index 2a8ae326e92..e41b406cfee 100644 --- a/bmc-integration/src/main/resources/com/oracle/bmc/integration/client.properties +++ b/bmc-integration/src/main/resources/com/oracle/bmc/integration/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190131") \ No newline at end of file diff --git a/bmc-jms/pom.xml b/bmc-jms/pom.xml index 125f61be8f8..0ca08179e06 100644 --- a/bmc-jms/pom.xml +++ b/bmc-jms/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-jms @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-jms/src/main/resources/com/oracle/bmc/jms/client.properties b/bmc-jms/src/main/resources/com/oracle/bmc/jms/client.properties index 16bd65bdc13..9a5662816d1 100644 --- a/bmc-jms/src/main/resources/com/oracle/bmc/jms/client.properties +++ b/bmc-jms/src/main/resources/com/oracle/bmc/jms/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210610") \ No newline at end of file diff --git a/bmc-jmsjavadownloads/pom.xml b/bmc-jmsjavadownloads/pom.xml index c8528d89880..142a529bf17 100644 --- a/bmc-jmsjavadownloads/pom.xml +++ b/bmc-jmsjavadownloads/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-jmsjavadownloads @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-jmsjavadownloads/src/main/resources/com/oracle/bmc/jmsjavadownloads/client.properties b/bmc-jmsjavadownloads/src/main/resources/com/oracle/bmc/jmsjavadownloads/client.properties index 77b42966bb6..145246efb00 100644 --- a/bmc-jmsjavadownloads/src/main/resources/com/oracle/bmc/jmsjavadownloads/client.properties +++ b/bmc-jmsjavadownloads/src/main/resources/com/oracle/bmc/jmsjavadownloads/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230601") \ No newline at end of file diff --git a/bmc-keymanagement/pom.xml b/bmc-keymanagement/pom.xml index 97ebab35cb5..70400861d33 100644 --- a/bmc-keymanagement/pom.xml +++ b/bmc-keymanagement/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-keymanagement @@ -16,7 +16,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-keymanagement/src/main/resources/com/oracle/bmc/keymanagement/client.properties b/bmc-keymanagement/src/main/resources/com/oracle/bmc/keymanagement/client.properties index f19988cc6c9..5c1492625d2 100644 --- a/bmc-keymanagement/src/main/resources/com/oracle/bmc/keymanagement/client.properties +++ b/bmc-keymanagement/src/main/resources/com/oracle/bmc/keymanagement/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: release") \ No newline at end of file diff --git a/bmc-licensemanager/pom.xml b/bmc-licensemanager/pom.xml index 9fc3303e463..860f43a4355 100644 --- a/bmc-licensemanager/pom.xml +++ b/bmc-licensemanager/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-licensemanager @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-licensemanager/src/main/resources/com/oracle/bmc/licensemanager/client.properties b/bmc-licensemanager/src/main/resources/com/oracle/bmc/licensemanager/client.properties index 6964989b156..b41e103eb01 100644 --- a/bmc-licensemanager/src/main/resources/com/oracle/bmc/licensemanager/client.properties +++ b/bmc-licensemanager/src/main/resources/com/oracle/bmc/licensemanager/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220430") \ No newline at end of file diff --git a/bmc-limits/pom.xml b/bmc-limits/pom.xml index 7eb5b7d0c62..85364af80e7 100644 --- a/bmc-limits/pom.xml +++ b/bmc-limits/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-limits @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-limits/src/main/resources/com/oracle/bmc/limits/client.properties b/bmc-limits/src/main/resources/com/oracle/bmc/limits/client.properties index bfcfb7120e4..6704d02fca0 100644 --- a/bmc-limits/src/main/resources/com/oracle/bmc/limits/client.properties +++ b/bmc-limits/src/main/resources/com/oracle/bmc/limits/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181025") \ No newline at end of file diff --git a/bmc-loadbalancer/pom.xml b/bmc-loadbalancer/pom.xml index 41d09778ca5..36f511d10d0 100644 --- a/bmc-loadbalancer/pom.xml +++ b/bmc-loadbalancer/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml @@ -18,7 +18,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-loadbalancer/src/main/resources/com/oracle/bmc/loadbalancer/client.properties b/bmc-loadbalancer/src/main/resources/com/oracle/bmc/loadbalancer/client.properties index 86852132648..ab578efd989 100644 --- a/bmc-loadbalancer/src/main/resources/com/oracle/bmc/loadbalancer/client.properties +++ b/bmc-loadbalancer/src/main/resources/com/oracle/bmc/loadbalancer/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115") \ No newline at end of file diff --git a/bmc-lockbox/pom.xml b/bmc-lockbox/pom.xml index 1aeba228791..b5b0637118d 100644 --- a/bmc-lockbox/pom.xml +++ b/bmc-lockbox/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-lockbox @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-lockbox/src/main/resources/com/oracle/bmc/lockbox/client.properties b/bmc-lockbox/src/main/resources/com/oracle/bmc/lockbox/client.properties index 6c229926c35..58b27498232 100644 --- a/bmc-lockbox/src/main/resources/com/oracle/bmc/lockbox/client.properties +++ b/bmc-lockbox/src/main/resources/com/oracle/bmc/lockbox/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220126") \ No newline at end of file diff --git a/bmc-loganalytics/pom.xml b/bmc-loganalytics/pom.xml index 7fbdd738b7d..cf0226f37a2 100644 --- a/bmc-loganalytics/pom.xml +++ b/bmc-loganalytics/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-loganalytics @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-loganalytics/src/main/resources/com/oracle/bmc/loganalytics/client.properties b/bmc-loganalytics/src/main/resources/com/oracle/bmc/loganalytics/client.properties index e49693b4846..2af786bb6c2 100644 --- a/bmc-loganalytics/src/main/resources/com/oracle/bmc/loganalytics/client.properties +++ b/bmc-loganalytics/src/main/resources/com/oracle/bmc/loganalytics/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200601") \ No newline at end of file diff --git a/bmc-logging/pom.xml b/bmc-logging/pom.xml index 5e71f2db68c..c9d90bffa6b 100644 --- a/bmc-logging/pom.xml +++ b/bmc-logging/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-logging @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-logging/src/main/resources/com/oracle/bmc/logging/client.properties b/bmc-logging/src/main/resources/com/oracle/bmc/logging/client.properties index 0b38c360011..831635bd81c 100644 --- a/bmc-logging/src/main/resources/com/oracle/bmc/logging/client.properties +++ b/bmc-logging/src/main/resources/com/oracle/bmc/logging/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200531") \ No newline at end of file diff --git a/bmc-loggingingestion/pom.xml b/bmc-loggingingestion/pom.xml index 5f0fcdc8b63..ee02411d2af 100644 --- a/bmc-loggingingestion/pom.xml +++ b/bmc-loggingingestion/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-loggingingestion @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-loggingingestion/src/main/resources/com/oracle/bmc/loggingingestion/client.properties b/bmc-loggingingestion/src/main/resources/com/oracle/bmc/loggingingestion/client.properties index 011735b6de2..2f1b966a42a 100644 --- a/bmc-loggingingestion/src/main/resources/com/oracle/bmc/loggingingestion/client.properties +++ b/bmc-loggingingestion/src/main/resources/com/oracle/bmc/loggingingestion/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200831") \ No newline at end of file diff --git a/bmc-loggingsearch/pom.xml b/bmc-loggingsearch/pom.xml index f645f8d4f41..8505ca38eca 100644 --- a/bmc-loggingsearch/pom.xml +++ b/bmc-loggingsearch/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-loggingsearch @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-loggingsearch/src/main/resources/com/oracle/bmc/loggingsearch/client.properties b/bmc-loggingsearch/src/main/resources/com/oracle/bmc/loggingsearch/client.properties index bfaf4a43336..b5e04a784c2 100644 --- a/bmc-loggingsearch/src/main/resources/com/oracle/bmc/loggingsearch/client.properties +++ b/bmc-loggingsearch/src/main/resources/com/oracle/bmc/loggingsearch/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190909") \ No newline at end of file diff --git a/bmc-managementagent/pom.xml b/bmc-managementagent/pom.xml index 089055b6bca..d74d44286f6 100644 --- a/bmc-managementagent/pom.xml +++ b/bmc-managementagent/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-managementagent @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-managementagent/src/main/resources/com/oracle/bmc/managementagent/client.properties b/bmc-managementagent/src/main/resources/com/oracle/bmc/managementagent/client.properties index 589e96bf7ec..a7f508ceaeb 100644 --- a/bmc-managementagent/src/main/resources/com/oracle/bmc/managementagent/client.properties +++ b/bmc-managementagent/src/main/resources/com/oracle/bmc/managementagent/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200202") \ No newline at end of file diff --git a/bmc-managementdashboard/pom.xml b/bmc-managementdashboard/pom.xml index cb59335d30c..f2da3779a58 100644 --- a/bmc-managementdashboard/pom.xml +++ b/bmc-managementdashboard/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-managementdashboard @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-managementdashboard/src/main/resources/com/oracle/bmc/managementdashboard/client.properties b/bmc-managementdashboard/src/main/resources/com/oracle/bmc/managementdashboard/client.properties index c210a429cdf..2093157c305 100644 --- a/bmc-managementdashboard/src/main/resources/com/oracle/bmc/managementdashboard/client.properties +++ b/bmc-managementdashboard/src/main/resources/com/oracle/bmc/managementdashboard/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200901") \ No newline at end of file diff --git a/bmc-marketplace/pom.xml b/bmc-marketplace/pom.xml index 70be86810b4..fff2c4809a8 100644 --- a/bmc-marketplace/pom.xml +++ b/bmc-marketplace/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-marketplace @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-marketplace/src/main/resources/com/oracle/bmc/marketplace/client.properties b/bmc-marketplace/src/main/resources/com/oracle/bmc/marketplace/client.properties index 65d5d2e04c6..e414a32d4ec 100644 --- a/bmc-marketplace/src/main/resources/com/oracle/bmc/marketplace/client.properties +++ b/bmc-marketplace/src/main/resources/com/oracle/bmc/marketplace/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181001") \ No newline at end of file diff --git a/bmc-marketplaceprivateoffer/pom.xml b/bmc-marketplaceprivateoffer/pom.xml index a11f53ab0f2..80aefacbee7 100644 --- a/bmc-marketplaceprivateoffer/pom.xml +++ b/bmc-marketplaceprivateoffer/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-marketplaceprivateoffer @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-marketplaceprivateoffer/src/main/resources/com/oracle/bmc/marketplaceprivateoffer/client.properties b/bmc-marketplaceprivateoffer/src/main/resources/com/oracle/bmc/marketplaceprivateoffer/client.properties index af491a0f663..ae6e87ee56c 100644 --- a/bmc-marketplaceprivateoffer/src/main/resources/com/oracle/bmc/marketplaceprivateoffer/client.properties +++ b/bmc-marketplaceprivateoffer/src/main/resources/com/oracle/bmc/marketplaceprivateoffer/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220901") \ No newline at end of file diff --git a/bmc-marketplacepublisher/pom.xml b/bmc-marketplacepublisher/pom.xml index 20fe896a677..11c6161c1c7 100644 --- a/bmc-marketplacepublisher/pom.xml +++ b/bmc-marketplacepublisher/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-marketplacepublisher @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-marketplacepublisher/src/main/resources/com/oracle/bmc/marketplacepublisher/client.properties b/bmc-marketplacepublisher/src/main/resources/com/oracle/bmc/marketplacepublisher/client.properties index af491a0f663..ae6e87ee56c 100644 --- a/bmc-marketplacepublisher/src/main/resources/com/oracle/bmc/marketplacepublisher/client.properties +++ b/bmc-marketplacepublisher/src/main/resources/com/oracle/bmc/marketplacepublisher/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220901") \ No newline at end of file diff --git a/bmc-mediaservices/pom.xml b/bmc-mediaservices/pom.xml index b91c53b11ed..3d0951f079f 100644 --- a/bmc-mediaservices/pom.xml +++ b/bmc-mediaservices/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-mediaservices @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-mediaservices/src/main/resources/com/oracle/bmc/mediaservices/client.properties b/bmc-mediaservices/src/main/resources/com/oracle/bmc/mediaservices/client.properties index 84c1ebfb05c..719d461812f 100644 --- a/bmc-mediaservices/src/main/resources/com/oracle/bmc/mediaservices/client.properties +++ b/bmc-mediaservices/src/main/resources/com/oracle/bmc/mediaservices/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20211101") \ No newline at end of file diff --git a/bmc-monitoring/pom.xml b/bmc-monitoring/pom.xml index ba55baa9436..6fa8691f7c1 100644 --- a/bmc-monitoring/pom.xml +++ b/bmc-monitoring/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-monitoring @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-monitoring/src/main/resources/com/oracle/bmc/monitoring/client.properties b/bmc-monitoring/src/main/resources/com/oracle/bmc/monitoring/client.properties index 090b8f955f3..12e38e2be53 100644 --- a/bmc-monitoring/src/main/resources/com/oracle/bmc/monitoring/client.properties +++ b/bmc-monitoring/src/main/resources/com/oracle/bmc/monitoring/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180401") \ No newline at end of file diff --git a/bmc-mysql/pom.xml b/bmc-mysql/pom.xml index 984d8cbdaa3..7d616ab44de 100644 --- a/bmc-mysql/pom.xml +++ b/bmc-mysql/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-mysql @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-mysql/src/main/resources/com/oracle/bmc/mysql/client.properties b/bmc-mysql/src/main/resources/com/oracle/bmc/mysql/client.properties index 12c4e67223f..016418f7a61 100644 --- a/bmc-mysql/src/main/resources/com/oracle/bmc/mysql/client.properties +++ b/bmc-mysql/src/main/resources/com/oracle/bmc/mysql/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190415") \ No newline at end of file diff --git a/bmc-networkfirewall/pom.xml b/bmc-networkfirewall/pom.xml index e1345a617e1..27ceea64dcf 100644 --- a/bmc-networkfirewall/pom.xml +++ b/bmc-networkfirewall/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-networkfirewall @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-networkfirewall/src/main/resources/com/oracle/bmc/networkfirewall/client.properties b/bmc-networkfirewall/src/main/resources/com/oracle/bmc/networkfirewall/client.properties index dc0dce945de..0412e620155 100644 --- a/bmc-networkfirewall/src/main/resources/com/oracle/bmc/networkfirewall/client.properties +++ b/bmc-networkfirewall/src/main/resources/com/oracle/bmc/networkfirewall/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230501") \ No newline at end of file diff --git a/bmc-networkloadbalancer/pom.xml b/bmc-networkloadbalancer/pom.xml index 1eff90b1596..59f8ddc45d9 100644 --- a/bmc-networkloadbalancer/pom.xml +++ b/bmc-networkloadbalancer/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-networkloadbalancer @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-networkloadbalancer/src/main/resources/com/oracle/bmc/networkloadbalancer/client.properties b/bmc-networkloadbalancer/src/main/resources/com/oracle/bmc/networkloadbalancer/client.properties index 804e455a277..503d3e4c455 100644 --- a/bmc-networkloadbalancer/src/main/resources/com/oracle/bmc/networkloadbalancer/client.properties +++ b/bmc-networkloadbalancer/src/main/resources/com/oracle/bmc/networkloadbalancer/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200501") \ No newline at end of file diff --git a/bmc-nosql/pom.xml b/bmc-nosql/pom.xml index 37efdf0fee1..58fd62e02d1 100644 --- a/bmc-nosql/pom.xml +++ b/bmc-nosql/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-nosql @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-nosql/src/main/resources/com/oracle/bmc/nosql/client.properties b/bmc-nosql/src/main/resources/com/oracle/bmc/nosql/client.properties index 15814c8cf82..e1ab28a5105 100644 --- a/bmc-nosql/src/main/resources/com/oracle/bmc/nosql/client.properties +++ b/bmc-nosql/src/main/resources/com/oracle/bmc/nosql/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190828") \ No newline at end of file diff --git a/bmc-objectstorage/bmc-objectstorage-combined/pom.xml b/bmc-objectstorage/bmc-objectstorage-combined/pom.xml index 1caf7b4553f..61b20f80354 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 - 3.54.0 + 3.55.0 ../pom.xml @@ -18,12 +18,12 @@ com.oracle.oci.sdk oci-java-sdk-objectstorage-generated - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-objectstorage-extensions - 3.54.0 + 3.55.0 diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml b/bmc-objectstorage/bmc-objectstorage-extensions/pom.xml index 6ddbef3d09b..28e02642ae5 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 - 3.54.0 + 3.55.0 ../pom.xml @@ -18,17 +18,17 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-common-httpclient - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-objectstorage-generated - 3.54.0 + 3.55.0 org.slf4j diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/DownloadConfiguration.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/DownloadConfiguration.java index a7e3a55fc49..7c3535c10d1 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/DownloadConfiguration.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/DownloadConfiguration.java @@ -56,6 +56,9 @@ public class DownloadConfiguration { /** Executor service for parallel downloads. */ private final ExecutorService executorService; + /** Flag to indicate whether download integrity verification should be enabled. */ + private final boolean enforceDataIntegrityForDownload; + /** * Create a configuration for the {@link DownloadManager}. * @@ -77,6 +80,42 @@ public DownloadConfiguration( long multipartDownloadThresholdInBytes, int parallelDownloads, ExecutorService executorService) { + this( + maxRetries, + initialBackoff, + maxBackoff, + partSizeInBytes, + multipartDownloadThresholdInBytes, + parallelDownloads, + executorService, + false); + } + + /** + * Create a configuration for the {@link DownloadManager} with a flag to enforce data integrity + * for downloads. + * + * @param maxRetries maximum number of retries, not including the initial attempt. + * @param initialBackoff initial backoff, before a retry is performed. + * @param maxBackoff maximum backoff between retries + * @param partSizeInBytes the size in bytes of the individual parts as which the object is + * downloaded. + * @param multipartDownloadThresholdInBytes the threshold size in bytes at which we will start + * splitting the object into parts + * @param parallelDownloads maximum number of parallel downloads + * @param executorService executor service for parallel downloads + * @param enforceDataIntegrityForDownload flag to enable or disable data integrity verification + * for downloads + */ + public DownloadConfiguration( + int maxRetries, + Duration initialBackoff, + Duration maxBackoff, + int partSizeInBytes, + long multipartDownloadThresholdInBytes, + int parallelDownloads, + ExecutorService executorService, + boolean enforceDataIntegrityForDownload) { Validate.isTrue( maxRetries >= 0, "maxRetries [%s] must be greater than or equal to %s", @@ -124,6 +163,7 @@ public DownloadConfiguration( this.multipartDownloadThresholdInBytes = multipartDownloadThresholdInBytes; this.parallelDownloads = parallelDownloads; this.executorService = executorService; + this.enforceDataIntegrityForDownload = enforceDataIntegrityForDownload; } /** @@ -144,6 +184,7 @@ public static class Builder { private long multipartDownloadThresholdInBytes; private int parallelDownloads; private ExecutorService executorService; + private boolean enforceDataIntegrityForDownload; private Builder() { this.maxRetries = 10; @@ -154,6 +195,7 @@ private Builder() { DownloadConfiguration.MIN_PART_SIZE_IN_BYTES * 2; this.parallelDownloads = 3; this.executorService = null; + this.enforceDataIntegrityForDownload = false; } /** @@ -169,7 +211,8 @@ public DownloadConfiguration build() { this.partSizeInBytes, this.multipartDownloadThresholdInBytes, this.parallelDownloads, - this.executorService); + this.executorService, + this.enforceDataIntegrityForDownload); } /** @@ -186,6 +229,7 @@ public Builder copy(DownloadConfiguration that) { this.multipartDownloadThresholdInBytes = that.multipartDownloadThresholdInBytes; this.parallelDownloads = that.parallelDownloads; this.executorService = that.executorService; + this.enforceDataIntegrityForDownload = that.enforceDataIntegrityForDownload; return this; } @@ -290,6 +334,17 @@ public Builder executorService(ExecutorService value) { this.executorService = value; return this; } + + /** + * Set whether download integrity verification should be enabled. + * + * @param value true to enable data integrity verification for downloads, false otherwise + * @return this builder + */ + public Builder enforceDataIntegrityForDownload(boolean value) { + this.enforceDataIntegrityForDownload = value; + return this; + } } /** Maximum number of retries, not including the initial attempt. */ @@ -337,4 +392,9 @@ public int getParallelDownloads() { public ExecutorService getExecutorService() { return this.executorService; } + + /** Flag to indicate whether download integrity verification should be enabled. */ + public boolean isEnforceDataIntegrityForDownload() { + return this.enforceDataIntegrityForDownload; + } } diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/DownloadManager.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/DownloadManager.java index f64452ad39c..04b71d1de92 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/DownloadManager.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/DownloadManager.java @@ -9,9 +9,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.security.NoSuchAlgorithmException; + import com.oracle.bmc.objectstorage.ObjectStorage; import com.oracle.bmc.objectstorage.requests.GetObjectRequest; import com.oracle.bmc.objectstorage.responses.GetObjectResponse; +import com.oracle.bmc.objectstorage.transfer.internal.ChecksumInfo; +import com.oracle.bmc.objectstorage.transfer.internal.ChecksumInputStream; +import com.oracle.bmc.objectstorage.transfer.internal.ChecksumUtils; import com.oracle.bmc.objectstorage.transfer.internal.download.DownloadExecution; import com.oracle.bmc.objectstorage.transfer.internal.download.MultithreadStream; import com.oracle.bmc.objectstorage.transfer.internal.download.RetryingStream; @@ -167,9 +172,31 @@ public GetObjectResponse getObject(GetObjectRequest request) { stream = retryingStream; } - final GetObjectResponse retryingResponse = - GetObjectResponse.builder().copy(response).inputStream(stream).build(); - return retryingResponse; + // Wrap the stream with ChecksumInputStream for data integrity verification + InputStream resultStream; + if (this.config.isEnforceDataIntegrityForDownload() && request.getRange() == null) { + try { + ChecksumInfo checksumInfo = ChecksumUtils.getExpectedChecksumAndAlgorithm(response); + if (checksumInfo.getChecksum() != null) { + resultStream = + new ChecksumInputStream( + stream, + checksumInfo.getAlgorithm(), + checksumInfo.getChecksum(), + response.getContentLength()); + } else { + resultStream = stream; + } + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException( + "Checksum initialization error: The specified algorithm is not available", + e); + } + } else { + resultStream = stream; + } + + return GetObjectResponse.builder().copy(response).inputStream(resultStream).build(); } /** diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssembler.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssembler.java index c4de1d518cb..ec55a8c0b19 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssembler.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssembler.java @@ -11,6 +11,7 @@ import java.util.concurrent.ExecutorService; import com.oracle.bmc.objectstorage.ObjectStorage; import com.oracle.bmc.objectstorage.internal.ObjectStorageUtils; +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; import com.oracle.bmc.objectstorage.model.CommitMultipartUploadDetails; import com.oracle.bmc.objectstorage.model.CreateMultipartUploadDetails; import com.oracle.bmc.objectstorage.model.MultipartUpload; @@ -60,6 +61,7 @@ public class MultipartObjectAssembler { private final ExecutorService executorService; private final String cacheControl; private final String contentDisposition; + private final ChecksumAlgorithm additionalChecksumAlgorithm; private MultipartTransferManager transferManager; private MultipartManifestImpl manifest; @@ -101,7 +103,8 @@ public MultipartObjectAssembler( null /* invocationCallback */, UploadManager.RETRY_CONFIGURATION, /* backwards compatibility */ null /* cacheControl */, - null /* contentDisposition */); + null /* contentDisposition */, + null /* additionalChecksumAlgorithm */); } private MultipartObjectAssembler( @@ -116,7 +119,8 @@ private MultipartObjectAssembler( RequestInterceptor invocationCallback, RetryConfiguration retryConfiguration, String cacheControl, - String contentDisposition) { + String contentDisposition, + ChecksumAlgorithm additionalChecksumAlgorithm) { this.service = service; this.namespaceName = namespaceName; this.bucketName = bucketName; @@ -129,6 +133,7 @@ private MultipartObjectAssembler( this.retryConfiguration = retryConfiguration; this.cacheControl = cacheControl; this.contentDisposition = contentDisposition; + this.additionalChecksumAlgorithm = additionalChecksumAlgorithm; } /** @@ -147,26 +152,31 @@ public synchronized MultipartManifest newRequest( checkInitialized(); String ifNoneMatch = ObjectStorageUtils.getIfNoneMatchHeader(allowOverwrite); + CreateMultipartUploadRequest.Builder requestBuilder = + CreateMultipartUploadRequest.builder() + .invocationCallback(invocationCallback) + .bucketName(bucketName) + .ifNoneMatch(ifNoneMatch) + .namespaceName(namespaceName) + .createMultipartUploadDetails( + CreateMultipartUploadDetails.builder() + .object(objectName) + .contentEncoding(contentEncoding) + .contentLanguage(contentLanguage) + .contentType(contentType) + .metadata(opcMeta) + .storageTier(storageTier) + .cacheControl(cacheControl) + .contentDisposition(contentDisposition) + .build()) + .opcClientRequestId(createClientRequestId("-create")); + + if (additionalChecksumAlgorithm != null) { + requestBuilder.opcChecksumAlgorithm(additionalChecksumAlgorithm); + } + CreateMultipartUploadRequest createMultipartUploadRequest = requestBuilder.build(); CreateMultipartUploadResponse createUploadResponse = - service.createMultipartUpload( - CreateMultipartUploadRequest.builder() - .invocationCallback(invocationCallback) - .bucketName(bucketName) - .ifNoneMatch(ifNoneMatch) - .namespaceName(namespaceName) - .createMultipartUploadDetails( - CreateMultipartUploadDetails.builder() - .object(objectName) - .contentEncoding(contentEncoding) - .contentLanguage(contentLanguage) - .contentType(contentType) - .metadata(opcMeta) - .storageTier(storageTier) - .cacheControl(cacheControl) - .contentDisposition(contentDisposition) - .build()) - .opcClientRequestId(createClientRequestId("-create")) - .build()); + service.createMultipartUpload(createMultipartUploadRequest); this.manifest = new MultipartManifestImpl(createUploadResponse.getMultipartUpload().getUploadId()); @@ -260,6 +270,25 @@ public int addPart(InputStream stream, long contentLength, String md5) { return doUploadPart(stream, contentLength, md5, nextPartNumber); } + /** + * Adds the next part to the upload. Parts will be committed in the order submitted. + * + *

We allow part overwrites to facilitate retries. + * + * @param stream The stream to upload as the next part + * @param contentLength The content length of the part + * @param checksum The checksum of the part, optional + * @param checksumAlgorithm The checksum algorithm used, optional (e.g., "CRC32C") + * @return The part number assigned to this part + * @throws IllegalStateException if the assembler has not been initialized or the upload has + * been aborted + */ + public int addPart( + InputStream stream, long contentLength, String checksum, String checksumAlgorithm) { + int nextPartNumber = manifest.nextPartNumber(); + return doUploadPart(stream, contentLength, checksum, checksumAlgorithm, nextPartNumber); + } + /** * Adds a part to the upload. The part will be ordered based on the part number provided. * @@ -294,6 +323,28 @@ public void setPart(InputStream stream, long contentLength, String md5, int part doUploadPart(stream, contentLength, md5, partNum); } + /** + * Adds a part to the upload. The part will be ordered based on the part number provided. + * + *

This method is for setting parts with additional checksum algorithms. + * + *

Calling this will not set the ifNoneMatch value and will allow overwriting existing parts. + * + * @param stream The stream to upload + * @param contentLength The content length of the part + * @param checksum The checksum value, optional + * @param checksumAlgorithm The checksum algorithm used + * @param partNum The part number to assign to the part + */ + public void setPart( + InputStream stream, + long contentLength, + String checksum, + String checksumAlgorithm, + int partNum) { + doUploadPart(stream, contentLength, checksum, checksumAlgorithm, partNum); + } + private int doUploadPart(InputStream stream, long contentLength, String md5, int partNumber) { validateState(); UploadPartRequest request = @@ -316,6 +367,54 @@ private int doUploadPart(InputStream stream, long contentLength, String md5, int return partNumber; } + private int doUploadPart( + InputStream stream, + long contentLength, + String checksum, + String checksumAlgorithm, + int partNumber) { + validateState(); + UploadPartRequest.Builder requestBuilder = + UploadPartRequest.builder() + .invocationCallback(invocationCallback) + .namespaceName(namespaceName) + .bucketName(bucketName) + .objectName(objectName) + .contentLength(contentLength) + .uploadId(manifest.getUploadId()) + .uploadPartNum(partNumber) + .uploadPartBody(stream) + .opcClientRequestId(createClientRequestId("-" + partNumber)); + + if (checksumAlgorithm != null) { + ChecksumAlgorithm algo = ChecksumAlgorithm.create(checksumAlgorithm); + requestBuilder.opcChecksumAlgorithm(algo); + + if (checksum != null) { + switch (algo) { + case Crc32C: + requestBuilder.opcContentCrc32c(checksum); + break; + case Sha256: + requestBuilder.opcContentSha256(checksum); + break; + case Sha384: + requestBuilder.opcContentSha384(checksum); + break; + default: + throw new IllegalArgumentException( + "Unsupported checksum algorithm: " + checksumAlgorithm); + } + } + } + + UploadPartRequest request = requestBuilder.build(); + request.setRetryConfiguration(this.retryConfiguration); + + transferManager.startTransfer(request); + return partNumber; + } + /** * Aborts the current multi-part assembly and all uploads that are currently in progress. * @@ -446,6 +545,7 @@ public static class MultipartObjectAssemblerBuilder { private RetryConfiguration retryConfiguration; private String cacheControl; private String contentDisposition; + private ChecksumAlgorithm additionalChecksumAlgorithm; MultipartObjectAssemblerBuilder() {} @@ -533,6 +633,13 @@ public MultipartObjectAssembler.MultipartObjectAssemblerBuilder contentDispositi return this; } + /** @return {@code this}. */ + public MultipartObjectAssembler.MultipartObjectAssemblerBuilder additionalChecksumAlgorithm( + final ChecksumAlgorithm additionalChecksumAlgorithm) { + this.additionalChecksumAlgorithm = additionalChecksumAlgorithm; + return this; + } + public MultipartObjectAssembler build() { return new MultipartObjectAssembler( this.service, @@ -546,7 +653,8 @@ public MultipartObjectAssembler build() { this.invocationCallback, this.retryConfiguration, this.cacheControl, - this.contentDisposition); + this.contentDisposition, + this.additionalChecksumAlgorithm); } @java.lang.Override @@ -575,6 +683,8 @@ public java.lang.String toString() { + this.cacheControl + ", contentDisposition=" + this.contentDisposition + + ", additionalChecksumAlgorithm=" + + this.additionalChecksumAlgorithm + ")"; } } diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadConfiguration.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadConfiguration.java index 4cef41d261f..51d8035b905 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadConfiguration.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadConfiguration.java @@ -6,6 +6,7 @@ import com.oracle.bmc.http.client.io.DuplicatableInputStream; +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; import com.oracle.bmc.util.internal.Validate; /** @@ -67,6 +68,60 @@ public class UploadConfiguration { * DuplicatableInputStream}, as the entire part will have to be read into memory. */ private final boolean enforceMd5BeforeMultipartUpload; + + /** + * Flag to indicate that additional checksum should be set on every PutObject call. If not + * provided, the SDK will calculate it before uploading the object. Default is null. + * + *

Note: Valid values are {@link ChecksumAlgorithm#Crc32C}, {@link ChecksumAlgorithm#Sha256}, + * {@link ChecksumAlgorithm#Sha384}. + * + *

Note: If {@link #additionalChecksumAlgorithm} is provided, this value must match it. + * + *

When this value is set, the SDK will set the corresponding header: + * + *

    + *
  • {@code opc-content-crc32c} if the value is "Crc32C" + *
  • {@code opc-content-sha256} if the value is "Sha256" + *
  • {@code opc-content-sha384} if the value is "Sha384" + *
+ * + *

If {@link #additionalChecksumAlgorithm} has a matching value or is null, the header {@code + * opc-checksum-algorithm} will also be set. + * + *

Note, having the SDK calculate it could lead to OutOfMemory exceptions if the source + * stream for the part cannot be duplicated, i.e., does not implement {@link + * DuplicatableInputStream}, as the entire part will have to be read into memory. + */ + private final ChecksumAlgorithm enforceAdditionalChecksumBeforeUpload; + + /** + * Flag to indicate that additional checksum should be set on every part of a multi-part upload. + * The SDK will calculate the additional checksum before uploading for each part it creates. + * Default is null. + * + *

Note: Valid values are {@link ChecksumAlgorithm#Crc32C}, {@link ChecksumAlgorithm#Sha256}, + * {@link ChecksumAlgorithm#Sha384}. + * + *

Note: If {@link #additionalChecksumAlgorithm} is provided, this value must match it. + * + *

When this value is set, the SDK will set the corresponding header: + * + *

    + *
  • {@code opc-content-crc32c} if the value is "Crc32C" + *
  • {@code opc-content-sha256} if the value is "Sha256" + *
  • {@code opc-content-sha384} if the value is "Sha384" + *
+ * + *

If {@link #additionalChecksumAlgorithm} has a matching value or is null, the header {@code + * opc-checksum-algorithm} will also be set. + * + *

Note, having the SDK calculate it could lead to OutOfMemory exceptions if the source + * stream for the part cannot be duplicated, i.e., does not implement {@link + * DuplicatableInputStream}, as the entire part will have to be read into memory. + */ + private final ChecksumAlgorithm enforceAdditionalChecksumBeforeMultipartUpload; + /** Flag to indicate that multi-part uploads can be used. Default is true. */ private final boolean allowMultipartUploads; /** @@ -79,6 +134,21 @@ public class UploadConfiguration { * reponsible for always cleaning up failed uploads themselves). Default is false. */ private final boolean disableAutoAbort; + /** + * The value of the additional checksum algorithm to be used for data integrity checks. Default + * is null. + * + *

Note: Valid values are {@link ChecksumAlgorithm#Crc32C}, {@link ChecksumAlgorithm#Sha256}, + * {@link ChecksumAlgorithm#Sha384}. + * + *

Note: If provided, {@link #enforceAdditionalChecksumBeforeUpload} and {@link + * #enforceAdditionalChecksumBeforeMultipartUpload} must match this value. + * + *

When this value is provided, the additional checksum algorithm will be set for both single + * PutObject requests and each part of a multipart upload. Specifically, the header + * `opc-checksum-algorithm` will be set to the value of this algorithm. + */ + private final ChecksumAlgorithm additionalChecksumAlgorithm; @Deprecated public long getMinimumLengthPerUploadPart() { @@ -91,9 +161,12 @@ private UploadConfiguration( Integer lengthPerUploadPart, Boolean enforceMd5BeforeUpload, Boolean enforceMd5BeforeMultipartUpload, + ChecksumAlgorithm enforceAdditionalChecksumBeforeUpload, + ChecksumAlgorithm enforceAdditionalChecksumBeforeMultipartUpload, Boolean allowMultipartUploads, Boolean allowParallelUploads, - Boolean disableAutoAbort) { + Boolean disableAutoAbort, + ChecksumAlgorithm additionalChecksumAlgorithm) { this.minimumLengthForMultipartUpload = getOrDefault( minimumLengthForMultipartUpload, DEFAULT_MIN_LENGTH_FOR_MULTI_PART_UPLOAD); @@ -102,9 +175,14 @@ private UploadConfiguration( this.maxPartsForMultipartUpload = MAXIMUM_NUM_ALLOWED_PARTS; this.enforceMd5BeforeUpload = getOrDefault(enforceMd5BeforeUpload, false); this.enforceMd5BeforeMultipartUpload = getOrDefault(enforceMd5BeforeMultipartUpload, false); + this.enforceAdditionalChecksumBeforeUpload = + getOrDefault(enforceAdditionalChecksumBeforeUpload, null); + this.enforceAdditionalChecksumBeforeMultipartUpload = + getOrDefault(enforceAdditionalChecksumBeforeMultipartUpload, null); this.allowMultipartUploads = getOrDefault(allowMultipartUploads, true); this.allowParallelUploads = getOrDefault(allowParallelUploads, true); this.disableAutoAbort = getOrDefault(disableAutoAbort, false); + this.additionalChecksumAlgorithm = getOrDefault(additionalChecksumAlgorithm, null); Validate.isTrue( this.minimumLengthForMultipartUpload >= 0L, @@ -120,6 +198,21 @@ private UploadConfiguration( this.lengthPerUploadPart, MINIMUM_ALLOWED_LENGTH_PER_PART_MB, MAXIMUM_ALLOWED_LENGTH_PER_PART_MB)); + Validate.isTrue( + this.enforceAdditionalChecksumBeforeUpload == null + || this.enforceAdditionalChecksumBeforeUpload == ChecksumAlgorithm.Sha256 + || this.enforceAdditionalChecksumBeforeUpload == ChecksumAlgorithm.Sha384 + || this.enforceAdditionalChecksumBeforeUpload == ChecksumAlgorithm.Crc32C, + "Invalid value for enforceAdditionalChecksumBeforeUpload. Valid values are: SHA256, SHA384, CRC32C."); + Validate.isTrue( + this.enforceAdditionalChecksumBeforeMultipartUpload == null + || this.enforceAdditionalChecksumBeforeMultipartUpload + == ChecksumAlgorithm.Sha256 + || this.enforceAdditionalChecksumBeforeMultipartUpload + == ChecksumAlgorithm.Sha384 + || this.enforceAdditionalChecksumBeforeMultipartUpload + == ChecksumAlgorithm.Crc32C, + "Invalid value for enforceAdditionalChecksumBeforeMultipartUpload. Valid values are: SHA256, SHA384, CRC32C."); } public static class UploadConfigurationBuilder { @@ -127,9 +220,12 @@ public static class UploadConfigurationBuilder { private Integer lengthPerUploadPart; private Boolean enforceMd5BeforeUpload; private Boolean enforceMd5BeforeMultipartUpload; + private ChecksumAlgorithm enforceAdditionalChecksumBeforeUpload; + private ChecksumAlgorithm enforceAdditionalChecksumBeforeMultipartUpload; private Boolean allowMultipartUploads; private Boolean allowParallelUploads; private Boolean disableAutoAbort; + private ChecksumAlgorithm additionalChecksumAlgorithm; /** * Sets the enforce MD5 flag for both {@link #enforceMd5BeforeUpload(Boolean)} and {@link @@ -145,6 +241,22 @@ public UploadConfigurationBuilder enforceMd5(Boolean enforceMd5) { return this; } + /** + * Sets the enforce additional checksum flag for both {@link + * #enforceAdditionalChecksumBeforeUpload(ChecksumAlgorithm)} and {@link + * #enforceAdditionalChecksumBeforeMultipartUpload(ChecksumAlgorithm)} in a single call. + * + * @param enforceAdditionalChecksum the additional checksum algorithm to enforce everywhere, + * null to use default values. + * @return the current builder instance + */ + public UploadConfigurationBuilder enforceAdditionalChecksum( + ChecksumAlgorithm enforceAdditionalChecksum) { + this.enforceAdditionalChecksumBeforeUpload = enforceAdditionalChecksum; + this.enforceAdditionalChecksumBeforeMultipartUpload = enforceAdditionalChecksum; + return this; + } + /** * @deprecated maxPartsForMultipartUpload is no longer configurable and will always be set * to {@link #MAXIMUM_NUM_ALLOWED_PARTS} @@ -200,6 +312,22 @@ public UploadConfiguration.UploadConfigurationBuilder enforceMd5BeforeMultipartU return this; } + /** @return {@code this}. */ + public UploadConfiguration.UploadConfigurationBuilder enforceAdditionalChecksumBeforeUpload( + final ChecksumAlgorithm enforceAdditionalChecksumBeforeUpload) { + this.enforceAdditionalChecksumBeforeUpload = enforceAdditionalChecksumBeforeUpload; + return this; + } + + /** @return {@code this}. */ + public UploadConfiguration.UploadConfigurationBuilder + enforceAdditionalChecksumBeforeMultipartUpload( + final ChecksumAlgorithm enforceAdditionalChecksumBeforeMultipartUpload) { + this.enforceAdditionalChecksumBeforeMultipartUpload = + enforceAdditionalChecksumBeforeMultipartUpload; + return this; + } + /** @return {@code this}. */ public UploadConfiguration.UploadConfigurationBuilder allowMultipartUploads( final Boolean allowMultipartUploads) { @@ -221,15 +349,25 @@ public UploadConfiguration.UploadConfigurationBuilder disableAutoAbort( return this; } + /** @return {@code this}. */ + public UploadConfiguration.UploadConfigurationBuilder additionalChecksumAlgorithm( + final ChecksumAlgorithm additionalChecksumAlgorithm) { + this.additionalChecksumAlgorithm = additionalChecksumAlgorithm; + return this; + } + public UploadConfiguration build() { return new UploadConfiguration( this.minimumLengthForMultipartUpload, this.lengthPerUploadPart, this.enforceMd5BeforeUpload, this.enforceMd5BeforeMultipartUpload, + this.enforceAdditionalChecksumBeforeUpload, + this.enforceAdditionalChecksumBeforeMultipartUpload, this.allowMultipartUploads, this.allowParallelUploads, - this.disableAutoAbort); + this.disableAutoAbort, + this.additionalChecksumAlgorithm); } @java.lang.Override @@ -242,12 +380,18 @@ public java.lang.String toString() { + this.enforceMd5BeforeUpload + ", enforceMd5BeforeMultipartUpload=" + this.enforceMd5BeforeMultipartUpload + + ", enforceAdditionalChecksumBeforeUpload=" + + this.enforceAdditionalChecksumBeforeUpload + + ", enforceAdditionalChecksumBeforeMultipartUpload=" + + this.enforceAdditionalChecksumBeforeMultipartUpload + ", allowMultipartUploads=" + this.allowMultipartUploads + ", allowParallelUploads=" + this.allowParallelUploads + ", disableAutoAbort=" + this.disableAutoAbort + + ", additionalChecksumAlgorithm=" + + this.additionalChecksumAlgorithm + ")"; } } @@ -316,6 +460,27 @@ public boolean isEnforceMd5BeforeMultipartUpload() { return this.enforceMd5BeforeMultipartUpload; } + /** + * Flag to indicate that additional checksum should be set on every PutObject call. If not + * provided, the SDK will calculate it before uploading the object. Default is null. + * + *

Note: Valid values are "SHA256", "SHA384", "CRC32C". + */ + public ChecksumAlgorithm getEnforceAdditionalChecksumBeforeUpload() { + return this.enforceAdditionalChecksumBeforeUpload; + } + + /** + * Flag to indicate that additional checksum should be set on every part of a multi-part upload. + * The SDK will calculate the additional checksum before uploading for each part it creates. + * Default is null. + * + *

Note: Valid values are "SHA256", "SHA384", "CRC32C". + */ + public ChecksumAlgorithm getEnforceAdditionalChecksumBeforeMultipartUpload() { + return this.enforceAdditionalChecksumBeforeMultipartUpload; + } + /** Flag to indicate that multi-part uploads can be used. Default is true. */ public boolean isAllowMultipartUploads() { return this.allowMultipartUploads; @@ -337,6 +502,11 @@ public boolean isDisableAutoAbort() { return this.disableAutoAbort; } + /** The value of the additional checksum algorithm. Default is null. */ + public ChecksumAlgorithm getAdditionalChecksumAlgorithm() { + return this.additionalChecksumAlgorithm; + } + @java.lang.Override public java.lang.String toString() { return "UploadConfiguration(minimumLengthForMultipartUpload=" @@ -349,12 +519,18 @@ public java.lang.String toString() { + this.isEnforceMd5BeforeUpload() + ", enforceMd5BeforeMultipartUpload=" + this.isEnforceMd5BeforeMultipartUpload() + + ", enforceAdditionalChecksumBeforeUpload=" + + this.getEnforceAdditionalChecksumBeforeUpload() + + ", enforceAdditionalChecksumBeforeMultipartUpload=" + + this.getEnforceAdditionalChecksumBeforeMultipartUpload() + ", allowMultipartUploads=" + this.isAllowMultipartUploads() + ", allowParallelUploads=" + this.isAllowParallelUploads() + ", disableAutoAbort=" + this.isDisableAutoAbort() + + ", additionalChecksumAlgorithm=" + + this.getAdditionalChecksumAlgorithm() + ")"; } } diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java index 565e2366e64..39fdbe2d8b6 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java @@ -4,10 +4,12 @@ */ package com.oracle.bmc.objectstorage.transfer; +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; +import com.oracle.bmc.objectstorage.transfer.internal.ChecksumUtils; +import com.oracle.bmc.responses.BmcResponse; import com.oracle.bmc.util.VisibleForTesting; import com.oracle.bmc.internal.ClientThreadFactory; import com.oracle.bmc.ClientRuntime; -import com.oracle.bmc.http.client.io.DuplicatableInputStream; import com.oracle.bmc.model.BmcException; import com.oracle.bmc.objectstorage.ObjectStorage; import com.oracle.bmc.objectstorage.internal.ObjectStorageUtils; @@ -16,7 +18,6 @@ import com.oracle.bmc.objectstorage.responses.PutObjectResponse; import com.oracle.bmc.objectstorage.transfer.internal.MultipartUtils; import com.oracle.bmc.objectstorage.transfer.internal.StreamChunkCreator; -import com.oracle.bmc.objectstorage.transfer.internal.StreamHelper; import com.oracle.bmc.retrier.DefaultRetryCondition; import com.oracle.bmc.retrier.RetryCondition; import com.oracle.bmc.retrier.RetryConfiguration; @@ -24,12 +25,9 @@ import com.oracle.bmc.waiter.ExponentialBackoffDelayStrategy; import com.oracle.bmc.waiter.MaxAttemptsTerminationStrategy; import jakarta.annotation.Nonnull; -import java.io.ByteArrayOutputStream; + import java.io.File; -import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; -import java.security.DigestOutputStream; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -109,18 +107,38 @@ private UploadResponse singleUpload(UploadRequest uploadRequest, long contentLen ProgressTrackerFactory.createSingleUploadProgressTrackerFactory( uploadRequest.progressReporter, contentLength); PutObjectRequest putObjectRequest = uploadRequest.putObjectRequest; + ChecksumAlgorithm algorithm = uploadConfiguration.getAdditionalChecksumAlgorithm(); + ChecksumAlgorithm enforceAlgoChecksum = + uploadConfiguration.getEnforceAdditionalChecksumBeforeUpload(); + if (MultipartUtils.shouldCalculateMd5(uploadConfiguration, putObjectRequest)) { - MD5Calculation md5Calculation = - calculateMd5( + ChecksumUtils.MD5Calculation md5Calculation = + ChecksumUtils.calculateMd5( putObjectRequest.getPutObjectBody(), putObjectRequest.getContentLength()); putObjectRequest = PutObjectRequest.builder() .copy(putObjectRequest) - .contentMD5(md5Calculation.md5) + .contentMD5(md5Calculation.getMd5()) .putObjectBody( ProgressTrackingInputStreamFactory.create( - md5Calculation.streamToUse, + md5Calculation.getStreamToUse(), + progressTrackerFactory.getProgressTracker())) + .build(); + } else if (MultipartUtils.shouldCalculateAdditionalChecksum( + uploadConfiguration, putObjectRequest)) { + putObjectRequest = + updateRequestWithChecksum( + putObjectRequest, enforceAlgoChecksum, progressTrackerFactory); + } else if (MultipartUtils.shouldSetAdditionalChecksum( + uploadConfiguration, putObjectRequest)) { + putObjectRequest = + PutObjectRequest.builder() + .copy(putObjectRequest) + .opcChecksumAlgorithm(algorithm) + .putObjectBody( + ProgressTrackingInputStreamFactory.create( + putObjectRequest.getPutObjectBody(), progressTrackerFactory.getProgressTracker())) .build(); } else { @@ -139,12 +157,13 @@ private UploadResponse singleUpload(UploadRequest uploadRequest, long contentLen getRetryToUse(putObjectRequest.getRetryConfiguration())); PutObjectResponse response = objectStorage.putObject(putObjectRequest); - return new UploadResponse( - response.getETag(), - response.getOpcContentMd5(), - null, - response.getOpcRequestId(), - response.getOpcClientRequestId()); + + return buildUploadResponse( + response, + algorithm, + enforceAlgoChecksum, + putObjectRequest.getOpcChecksumAlgorithm(), + false); } private UploadResponse multipartUpload(UploadRequest uploadRequest) { @@ -161,6 +180,10 @@ private UploadResponse multipartUpload(UploadRequest uploadRequest) { final ExecutorService executorServiceToUse; final boolean shutdownExecutor; + ChecksumAlgorithm algorithm = uploadConfiguration.getAdditionalChecksumAlgorithm(); + ChecksumAlgorithm enforceAlgoChecksum = + uploadConfiguration.getEnforceAdditionalChecksumBeforeMultipartUpload(); + if (uploadConfiguration.isAllowParallelUploads() && chunkCreator.supportsParallelReads()) { if (uploadRequest.parallelUploadExecutorService != null) { executorServiceToUse = uploadRequest.parallelUploadExecutorService; @@ -191,13 +214,33 @@ private UploadResponse multipartUpload(UploadRequest uploadRequest) { LOG.trace("Creating part {}", ++partCount); StreamChunkCreator.SubRangeInputStream chunk = chunkCreator.next(); if (uploadConfiguration.isEnforceMd5BeforeMultipartUpload()) { - MD5Calculation md5Calculation = calculateMd5(chunk, chunk.length()); + ChecksumUtils.MD5Calculation md5Calculation = + ChecksumUtils.calculateMd5(chunk, chunk.length()); assembler.addPart( ProgressTrackingInputStreamFactory.create( - md5Calculation.streamToUse, + md5Calculation.getStreamToUse(), progressTrackerFactory.getProgressTracker()), chunk.length(), - md5Calculation.md5); + md5Calculation.getMd5()); + } else if (uploadConfiguration.getEnforceAdditionalChecksumBeforeMultipartUpload() + != null) { + addPartWithChecksum( + assembler, chunk, enforceAlgoChecksum, progressTrackerFactory); + } else if (MultipartUtils.shouldSetAdditionalChecksum( + uploadConfiguration, request)) { + assembler.addPart( + ProgressTrackingInputStreamFactory.create( + chunk, progressTrackerFactory.getProgressTracker()), + chunk.length(), + null, + algorithm.getValue()); + } else if (request.getOpcChecksumAlgorithm() != null) { + assembler.addPart( + ProgressTrackingInputStreamFactory.create( + chunk, progressTrackerFactory.getProgressTracker()), + chunk.length(), + null, + request.getOpcChecksumAlgorithm().getValue()); } else { assembler.addPart( ProgressTrackingInputStreamFactory.create( @@ -208,12 +251,13 @@ private UploadResponse multipartUpload(UploadRequest uploadRequest) { } LOG.debug("Created {} parts", partCount); CommitMultipartUploadResponse response = assembler.commit(); - return new UploadResponse( - response.getETag(), - null, - response.getOpcMultipartMd5(), - response.getOpcRequestId(), - response.getOpcClientRequestId()); + + return buildUploadResponse( + response, + algorithm, + enforceAlgoChecksum, + request.getOpcChecksumAlgorithm(), + true); } catch (Exception e) { if (manifest != null) { LOG.error( @@ -256,6 +300,171 @@ private UploadResponse multipartUpload(UploadRequest uploadRequest) { } } + private UploadResponse buildUploadResponse( + BmcResponse response, + ChecksumAlgorithm algorithm, + ChecksumAlgorithm enforceAlgoChecksum, + ChecksumAlgorithm requestAlgorithm, + boolean isMultipart) { + UploadResponse.Builder responseBuilder = new UploadResponse.Builder(); + + if (response instanceof PutObjectResponse) { + PutObjectResponse putObjectResponse = (PutObjectResponse) response; + responseBuilder + .eTag(putObjectResponse.getETag()) + .opcRequestId(putObjectResponse.getOpcRequestId()) + .opcClientRequestId(putObjectResponse.getOpcClientRequestId()) + .contentMd5(putObjectResponse.getOpcContentMd5()); + } else if (response instanceof CommitMultipartUploadResponse) { + CommitMultipartUploadResponse commitResponse = (CommitMultipartUploadResponse) response; + responseBuilder + .eTag(commitResponse.getETag()) + .opcRequestId(commitResponse.getOpcRequestId()) + .opcClientRequestId(commitResponse.getOpcClientRequestId()) + .multipartMd5(commitResponse.getOpcMultipartMd5()); + } else { + throw new IllegalArgumentException( + "Unsupported response type: " + response.getClass().getName()); + } + + ChecksumAlgorithm checksumAlgorithm = + algorithm != null + ? algorithm + : enforceAlgoChecksum != null ? enforceAlgoChecksum : requestAlgorithm; + + if (checksumAlgorithm != null) { + String responseChecksum = + ChecksumUtils.getResponseChecksum(response, checksumAlgorithm, isMultipart); + if (responseChecksum != null) { + switch (checksumAlgorithm) { + case Crc32C: + responseBuilder.contentCrc32c(responseChecksum); + break; + case Sha256: + if (isMultipart) { + responseBuilder.multipartSha256(responseChecksum); + } else { + responseBuilder.contentSha256(responseChecksum); + } + break; + case Sha384: + if (isMultipart) { + responseBuilder.multipartSha384(responseChecksum); + } else { + responseBuilder.contentSha384(responseChecksum); + } + break; + default: + throw new IllegalArgumentException( + "Unsupported checksum algorithm: " + checksumAlgorithm); + } + } + } + + return responseBuilder.build(); + } + + private PutObjectRequest updateRequestWithChecksum( + PutObjectRequest putObjectRequest, + ChecksumAlgorithm algorithm, + ProgressTrackerFactory progressTrackerFactory) { + + InputStream streamToUse; + String checksum; + PutObjectRequest.Builder requestBuilder = + PutObjectRequest.builder().copy(putObjectRequest).opcChecksumAlgorithm(algorithm); + + switch (algorithm) { + case Crc32C: + ChecksumUtils.CRC32CCalculation crc32CCalculation = + ChecksumUtils.calculateCrc32c( + putObjectRequest.getPutObjectBody(), + putObjectRequest.getContentLength()); + streamToUse = crc32CCalculation.getStreamToUse(); + checksum = crc32CCalculation.getCrc32c(); + requestBuilder.opcContentCrc32c(checksum); + break; + case Sha256: + ChecksumUtils.SHA256Calculation sha256Calculation = + ChecksumUtils.calculateSha256( + putObjectRequest.getPutObjectBody(), + putObjectRequest.getContentLength()); + streamToUse = sha256Calculation.getStreamToUse(); + checksum = sha256Calculation.getSha256(); + requestBuilder.opcContentSha256(checksum); + break; + case Sha384: + ChecksumUtils.SHA384Calculation sha384Calculation = + ChecksumUtils.calculateSha384( + putObjectRequest.getPutObjectBody(), + putObjectRequest.getContentLength()); + streamToUse = sha384Calculation.getStreamToUse(); + checksum = sha384Calculation.getSha384(); + requestBuilder.opcContentSha384(checksum); + break; + default: + throw new IllegalArgumentException("Unsupported checksum algorithm: " + algorithm); + } + + return requestBuilder + .putObjectBody( + ProgressTrackingInputStreamFactory.create( + streamToUse, progressTrackerFactory.getProgressTracker())) + .build(); + } + + private void addPartWithChecksum( + MultipartObjectAssembler assembler, + StreamChunkCreator.SubRangeInputStream chunk, + ChecksumAlgorithm algorithm, + ProgressTrackerFactory progressTrackerFactory) { + + InputStream streamToUse; + String checksum; + + switch (algorithm) { + case Crc32C: + ChecksumUtils.CRC32CCalculation crc32CCalculation = + ChecksumUtils.calculateCrc32c(chunk, chunk.length()); + streamToUse = crc32CCalculation.getStreamToUse(); + checksum = crc32CCalculation.getCrc32c(); + assembler.addPart( + ProgressTrackingInputStreamFactory.create( + streamToUse, progressTrackerFactory.getProgressTracker()), + chunk.length(), + checksum, + algorithm.getValue()); + break; + case Sha256: + ChecksumUtils.SHA256Calculation sha256Calculation = + ChecksumUtils.calculateSha256(chunk, chunk.length()); + streamToUse = sha256Calculation.getStreamToUse(); + checksum = sha256Calculation.getSha256(); + assembler.addPart( + ProgressTrackingInputStreamFactory.create( + streamToUse, progressTrackerFactory.getProgressTracker()), + chunk.length(), + checksum, + algorithm.getValue()); + break; + case Sha384: + ChecksumUtils.SHA384Calculation sha384Calculation = + ChecksumUtils.calculateSha384(chunk, chunk.length()); + streamToUse = sha384Calculation.getStreamToUse(); + checksum = sha384Calculation.getSha384(); + assembler.addPart( + ProgressTrackingInputStreamFactory.create( + streamToUse, progressTrackerFactory.getProgressTracker()), + chunk.length(), + checksum, + algorithm.getValue()); + break; + default: + throw new UnsupportedOperationException( + "Unsupported checksum algorithm: " + algorithm); + } + } + /** * Determines the first non-null RetryConfiguration 1 -> RetryConfiguration set on * UploadConfiguration 2 -> Default static RetryConfiguration for UploadManager @@ -283,20 +492,29 @@ protected MultipartObjectAssembler createAssembler( uploadRequest.putObjectRequest.getRetryConfiguration(), request.getRetryConfiguration()); - return MultipartObjectAssembler.builder() - .allowOverwrite(uploadRequest.allowOverwrite) - .bucketName(request.getBucketName()) - .executorService(executorService) - .invocationCallback(request.getInvocationCallback()) - .namespaceName(request.getNamespaceName()) - .objectName(request.getObjectName()) - .storageTier(request.getStorageTier()) - .opcClientRequestId(request.getOpcClientRequestId()) - .service(objectStorage) - .cacheControl(request.getCacheControl()) - .contentDisposition(request.getContentDisposition()) - .retryConfiguration(retryToUse) - .build(); + MultipartObjectAssembler.MultipartObjectAssemblerBuilder assemblerBuilder = + MultipartObjectAssembler.builder() + .allowOverwrite(uploadRequest.allowOverwrite) + .bucketName(request.getBucketName()) + .executorService(executorService) + .invocationCallback(request.getInvocationCallback()) + .namespaceName(request.getNamespaceName()) + .objectName(request.getObjectName()) + .storageTier(request.getStorageTier()) + .opcClientRequestId(request.getOpcClientRequestId()) + .service(objectStorage) + .cacheControl(request.getCacheControl()) + .contentDisposition(request.getContentDisposition()) + .retryConfiguration(retryToUse); + + if (uploadConfiguration.getAdditionalChecksumAlgorithm() != null) { + assemblerBuilder.additionalChecksumAlgorithm( + uploadConfiguration.getAdditionalChecksumAlgorithm()); + } else if (request.getOpcChecksumAlgorithm() != null) { + assemblerBuilder.additionalChecksumAlgorithm(request.getOpcChecksumAlgorithm()); + } + + return assemblerBuilder.build(); } private static ExecutorService buildDefaultParallelExecutor() { @@ -308,67 +526,6 @@ private static ExecutorService buildDefaultParallelExecutor() { .build()); } - private static MD5Calculation calculateMd5(InputStream stream, Long contentLength) { - String md5 = null; - InputStream streamToReturn = null; - - if (stream instanceof DuplicatableInputStream) { - md5 = - performMd5Calculation( - ((DuplicatableInputStream) stream).duplicate(), - new StreamHelper.NullOutputStream(), - contentLength); - streamToReturn = stream; - } else { - LOG.info( - "About to copy object into memory to calculate MD5, may lead to OutOfMemory exceptions"); - if (contentLength.longValue() > Integer.MAX_VALUE) { - throw new BmcException( - false, - "Cannot compute MD5 client-size as content length (" - + contentLength.longValue() - + ") is larger than max buffer. Disable MD5 enforcement or provide a DuplicableInputStream to avoid this problem", - null, - null); - } - try { - ByteArrayOutputStream baos = new ByteArrayOutputStream(contentLength.intValue()); - md5 = performMd5Calculation(stream, baos, contentLength); - streamToReturn = StreamUtils.createByteArrayInputStream(baos.toByteArray()); - } catch (OutOfMemoryError oom) { - OutOfMemoryError newOom = - new OutOfMemoryError( - "Could not compute MD5. Disable MD5 enforcement or provide a DuplicableInputStream to avoid this problem"); - newOom.initCause(oom); - throw newOom; - } - } - return new MD5Calculation(streamToReturn, md5); - } - - private static String performMd5Calculation( - InputStream stream, OutputStream outputStream, long contentLength) { - DigestOutputStream digestOutputStream = - StreamHelper.createMd5MessageOutputStream(outputStream); - long bytesCopied; - try { - bytesCopied = StreamHelper.copy(stream, digestOutputStream); - } catch (IOException e) { - throw new BmcException(false, "Unable to calculate MD5", e, null); - } - if (bytesCopied != contentLength) { - throw new BmcException( - false, - "Failed to read all bytes while calculating MD5: " - + bytesCopied - + ", " - + contentLength, - null, - null); - } - return StreamHelper.base64Encode(digestOutputStream.getMessageDigest()); - } - public static class UploadRequest { private final PutObjectRequest putObjectRequest; private final ExecutorService parallelUploadExecutorService; @@ -530,6 +687,16 @@ public static class UploadResponse { private final String opcRequestId; /** The opc-client-request-id sent with every request, if provided. */ private final String opcClientRequestId; + /** The CRC32C of the single or multipart object uploaded. */ + private final String contentCrc32c; + /** The SHA256 of the object uploaded. */ + private final String contentSha256; + /** The SHA384 of the object uploaded. */ + private final String contentSha384; + /** The SHA256 of the multipart object uploaded. */ + private final String multipartSha256; + /** The SHA384 of the multipart object uploaded. */ + private final String multipartSha384; @java.beans.ConstructorProperties({ "eTag", @@ -544,11 +711,65 @@ public UploadResponse( final String multipartMd5, final String opcRequestId, final String opcClientRequestId) { + this( + eTag, + contentMd5, + multipartMd5, + opcRequestId, + opcClientRequestId, + null, + null, + null, + null, + null); + } + + @java.beans.ConstructorProperties({ + "eTag", + "contentMd5", + "multipartMd5", + "opcRequestId", + "opcClientRequestId", + "contentCrc32c", + "contentSha256", + "contentSha384", + "multipartSha256", + "multipartSha384" + }) + public UploadResponse( + final String eTag, + final String contentMd5, + final String multipartMd5, + final String opcRequestId, + final String opcClientRequestId, + final String contentCrc32c, + final String contentSha256, + final String contentSha384, + final String multipartSha256, + final String multipartSha384) { this.eTag = eTag; this.contentMd5 = contentMd5; this.multipartMd5 = multipartMd5; this.opcRequestId = opcRequestId; this.opcClientRequestId = opcClientRequestId; + this.contentCrc32c = contentCrc32c; + this.contentSha256 = contentSha256; + this.contentSha384 = contentSha384; + this.multipartSha256 = multipartSha256; + this.multipartSha384 = multipartSha384; + } + + private UploadResponse(Builder builder) { + this.eTag = builder.eTag; + this.contentMd5 = builder.contentMd5; + this.multipartMd5 = builder.multipartMd5; + this.opcRequestId = builder.opcRequestId; + this.opcClientRequestId = builder.opcClientRequestId; + this.contentCrc32c = builder.contentCrc32c; + this.contentSha256 = builder.contentSha256; + this.contentSha384 = builder.contentSha384; + this.multipartSha256 = builder.multipartSha256; + this.multipartSha384 = builder.multipartSha384; } /** The etag of the object uploaded. */ @@ -589,8 +810,33 @@ public String getOpcClientRequestId() { return this.opcClientRequestId; } - @java.lang.Override - public java.lang.String toString() { + /** The CRC32C of the single or multipart object uploaded. */ + public String getContentCrc32c() { + return this.contentCrc32c; + } + + /** The SHA256 of the object uploaded. */ + public String getContentSha256() { + return this.contentSha256; + } + + /** The SHA384 of the object uploaded. */ + public String getContentSha384() { + return this.contentSha384; + } + + /** The SHA256 of the multipart object uploaded. */ + public String getMultipartSha256() { + return this.multipartSha256; + } + + /** The SHA384 of the multipart object uploaded. */ + public String getMultipartSha384() { + return this.multipartSha384; + } + + @Override + public String toString() { return "UploadManager.UploadResponse(eTag=" + this.getETag() + ", contentMd5=" @@ -601,18 +847,84 @@ public java.lang.String toString() { + this.getOpcRequestId() + ", opcClientRequestId=" + this.getOpcClientRequestId() + + ", contentCrc32c=" + + this.getContentCrc32c() + + ", contentSha256=" + + this.getContentSha256() + + ", contentSha384=" + + this.getContentSha384() + + ", multipartSha256=" + + this.getMultipartSha256() + + ", multipartSha384=" + + this.getMultipartSha384() + ")"; } - } - private static class MD5Calculation { - private final InputStream streamToUse; - private final String md5; + public static class Builder { + private String eTag; + private String contentMd5; + private String multipartMd5; + private String opcRequestId; + private String opcClientRequestId; + private String contentCrc32c; + private String contentSha256; + private String contentSha384; + private String multipartSha256; + private String multipartSha384; + + public Builder eTag(String eTag) { + this.eTag = eTag; + return this; + } + + public Builder contentMd5(String contentMd5) { + this.contentMd5 = contentMd5; + return this; + } - @java.beans.ConstructorProperties({"streamToUse", "md5"}) - public MD5Calculation(final InputStream streamToUse, final String md5) { - this.streamToUse = streamToUse; - this.md5 = md5; + public Builder multipartMd5(String multipartMd5) { + this.multipartMd5 = multipartMd5; + return this; + } + + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + public Builder opcClientRequestId(String opcClientRequestId) { + this.opcClientRequestId = opcClientRequestId; + return this; + } + + public Builder contentCrc32c(String contentCrc32c) { + this.contentCrc32c = contentCrc32c; + return this; + } + + public Builder contentSha256(String contentSha256) { + this.contentSha256 = contentSha256; + return this; + } + + public Builder contentSha384(String contentSha384) { + this.contentSha384 = contentSha384; + return this; + } + + public Builder multipartSha256(String multipartSha256) { + this.multipartSha256 = multipartSha256; + return this; + } + + public Builder multipartSha384(String multipartSha384) { + this.multipartSha384 = multipartSha384; + return this; + } + + public UploadResponse build() { + return new UploadResponse(this); + } } } diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32C.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32C.java new file mode 100644 index 00000000000..ec9122daeaa --- /dev/null +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32C.java @@ -0,0 +1,258 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.objectstorage.transfer.internal; + +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.zip.Checksum; + +/** + * This class was refactored from the original Java 9 implementation to be compatible with Java 8. + */ +public final class CRC32C implements Checksum { + + /** CRC-32C Polynomial */ + private static final int CRC32C_POLY = 0x1EDC6F41; + + private static final int REVERSED_CRC32C_POLY = Integer.reverse(CRC32C_POLY); + + private static final int[] byteTable; + private static final int[][] byteTables = new int[8][256]; + private static final int[] byteTable0 = byteTables[0]; + private static final int[] byteTable1 = byteTables[1]; + private static final int[] byteTable2 = byteTables[2]; + private static final int[] byteTable3 = byteTables[3]; + private static final int[] byteTable4 = byteTables[4]; + private static final int[] byteTable5 = byteTables[5]; + private static final int[] byteTable6 = byteTables[6]; + private static final int[] byteTable7 = byteTables[7]; + + static { + for (int index = 0; index < byteTables[0].length; index++) { + int r = index; + for (int i = 0; i < Byte.SIZE; i++) { + if ((r & 1) != 0) { + r = (r >>> 1) ^ REVERSED_CRC32C_POLY; + } else { + r >>>= 1; + } + } + byteTables[0][index] = r; + } + + for (int index = 0; index < byteTables[0].length; index++) { + int r = byteTables[0][index]; + + for (int k = 1; k < byteTables.length; k++) { + r = byteTables[0][r & 0xFF] ^ (r >>> 8); + byteTables[k][index] = r; + } + } + + if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) { + byteTable = byteTables[0]; + } else { + byteTable = new int[byteTable0.length]; + System.arraycopy(byteTable0, 0, byteTable, 0, byteTable0.length); + for (int[] table : byteTables) { + for (int index = 0; index < table.length; index++) { + table[index] = Integer.reverseBytes(table[index]); + } + } + } + } + + /** Calculated CRC-32C value */ + private int crc = 0xFFFFFFFF; + + /** Creates a new CRC32C object. */ + public CRC32C() {} + + /** + * Updates the CRC-32C checksum with the specified byte (the low eight bits of the argument b). + */ + @Override + public void update(int b) { + crc = (crc >>> 8) ^ byteTable[(crc ^ (b & 0xFF)) & 0xFF]; + } + + /** + * Updates the CRC-32C checksum with the specified array of bytes. + * + * @throws ArrayIndexOutOfBoundsException if {@code off} is negative, or {@code len} is + * negative, or {@code off+len} is negative or greater than the length of the array {@code + * b}. + */ + @Override + public void update(byte[] b, int off, int len) { + if (b == null) { + throw new NullPointerException(); + } + if (off < 0 || len < 0 || off > b.length - len) { + throw new ArrayIndexOutOfBoundsException(); + } + crc = updateBytes(crc, b, off, (off + len)); + } + + /** + * Updates the CRC-32C checksum with the bytes from the specified buffer. + * + *

The checksum is updated with the remaining bytes in the buffer, starting at the buffer's + * position. Upon return, the buffer's position will be updated to its limit; its limit will not + * have been changed. + */ + public void update(ByteBuffer buffer) { + int pos = buffer.position(); + int limit = buffer.limit(); + assert (pos <= limit); + int rem = limit - pos; + if (rem <= 0) { + return; + } + + if (buffer.isDirect()) { + crc = updateDirectByteBuffer(crc, buffer, pos, limit); + } else if (buffer.hasArray()) { + crc = + updateBytes( + crc, + buffer.array(), + pos + buffer.arrayOffset(), + limit + buffer.arrayOffset()); + } else { + byte[] b = new byte[Math.min(buffer.remaining(), 4096)]; + while (buffer.hasRemaining()) { + int length = Math.min(buffer.remaining(), b.length); + buffer.get(b, 0, length); + update(b, 0, length); + } + } + buffer.position(limit); + } + + /** Resets CRC-32C to initial value. */ + @Override + public void reset() { + crc = 0xFFFFFFFF; + } + + /** Returns CRC-32C value. */ + @Override + public long getValue() { + return (~crc) & 0xFFFFFFFFL; + } + + /** Updates the CRC-32C checksum with the specified array of bytes. */ + private static int updateBytes(int crc, byte[] b, int off, int end) { + + if (end - off >= 8) { + + int alignLength = (8 - (off & 0x7)) & 0x7; + for (int alignEnd = off + alignLength; off < alignEnd; off++) { + crc = (crc >>> 8) ^ byteTable[(crc ^ b[off]) & 0xFF]; + } + + if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) { + crc = Integer.reverseBytes(crc); + } + + for (; off < (end - Long.BYTES); off += Long.BYTES) { + long value = 0; + for (int i = 0; i < Long.BYTES; i++) { + value |= ((long) b[off + i] & 0xFF) << (i * 8); + } + int firstHalf = (int) value; + int secondHalf = (int) (value >>> 32); + crc ^= firstHalf; + if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) { + crc = + byteTable7[crc & 0xFF] + ^ byteTable6[(crc >>> 8) & 0xFF] + ^ byteTable5[(crc >>> 16) & 0xFF] + ^ byteTable4[crc >>> 24] + ^ byteTable3[secondHalf & 0xFF] + ^ byteTable2[(secondHalf >>> 8) & 0xFF] + ^ byteTable1[(secondHalf >>> 16) & 0xFF] + ^ byteTable0[secondHalf >>> 24]; + } else { + crc = + byteTable0[secondHalf & 0xFF] + ^ byteTable1[(secondHalf >>> 8) & 0xFF] + ^ byteTable2[(secondHalf >>> 16) & 0xFF] + ^ byteTable3[secondHalf >>> 24] + ^ byteTable4[crc & 0xFF] + ^ byteTable5[(crc >>> 8) & 0xFF] + ^ byteTable6[(crc >>> 16) & 0xFF] + ^ byteTable7[crc >>> 24]; + } + } + + if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) { + crc = Integer.reverseBytes(crc); + } + } + + // Tail + for (; off < end; off++) { + crc = (crc >>> 8) ^ byteTable[(crc ^ b[off]) & 0xFF]; + } + + return crc; + } + + /** Updates the CRC-32C checksum reading from the specified address. */ + private static int updateDirectByteBuffer(int crc, ByteBuffer buffer, int off, int end) { + + if (end - off >= 8) { + + int alignLength = (8 - (off & 0x7)) & 0x7; + for (int alignEnd = off + alignLength; off < alignEnd; off++) { + crc = (crc >>> 8) ^ byteTable[(crc ^ buffer.get(off)) & 0xFF]; + } + + if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) { + crc = Integer.reverseBytes(crc); + } + + for (; off <= (end - Long.BYTES); off += Long.BYTES) { + long value = buffer.getLong(off); + int firstHalf = (int) value; + int secondHalf = (int) (value >>> 32); + crc ^= firstHalf; + if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) { + crc = + byteTable7[crc & 0xFF] + ^ byteTable6[(crc >>> 8) & 0xFF] + ^ byteTable5[(crc >>> 16) & 0xFF] + ^ byteTable4[crc >>> 24] + ^ byteTable3[secondHalf & 0xFF] + ^ byteTable2[(secondHalf >>> 8) & 0xFF] + ^ byteTable1[(secondHalf >>> 16) & 0xFF] + ^ byteTable0[secondHalf >>> 24]; + } else { + crc = + byteTable0[secondHalf & 0xFF] + ^ byteTable1[(secondHalf >>> 8) & 0xFF] + ^ byteTable2[(secondHalf >>> 16) & 0xFF] + ^ byteTable3[secondHalf >>> 24] + ^ byteTable4[crc & 0xFF] + ^ byteTable5[(crc >>> 8) & 0xFF] + ^ byteTable6[(crc >>> 16) & 0xFF] + ^ byteTable7[crc >>> 24]; + } + } + + if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) { + crc = Integer.reverseBytes(crc); + } + } + + for (; off < end; off++) { + crc = (crc >>> 8) ^ byteTable[(crc ^ buffer.get(off)) & 0xFF]; + } + + return crc; + } +} diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32CDigest.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32CDigest.java new file mode 100644 index 00000000000..0e437f79961 --- /dev/null +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32CDigest.java @@ -0,0 +1,41 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.objectstorage.transfer.internal; + +import java.security.MessageDigest; +import java.nio.ByteBuffer; + +public class CRC32CDigest extends MessageDigest { + + private final CRC32C crc32c; + + public CRC32CDigest() { + super("CRC32C"); + crc32c = new CRC32C(); + } + + @Override + protected void engineUpdate(byte input) { + crc32c.update(input); + } + + @Override + protected void engineUpdate(byte[] input, int offset, int len) { + crc32c.update(input, offset, len); + } + + @Override + protected byte[] engineDigest() { + long crcValue = crc32c.getValue(); + byte[] crcBytes = ByteBuffer.allocate(4).putInt((int) crcValue).array(); + engineReset(); + return crcBytes; + } + + @Override + protected void engineReset() { + crc32c.reset(); + } +} diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInfo.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInfo.java new file mode 100644 index 00000000000..13ecdce7663 --- /dev/null +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInfo.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.objectstorage.transfer.internal; + +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; + +/** + * Encapsulates a checksum value and its corresponding algorithm. Stores a checksum along with the + * {@link ChecksumAlgorithm}. + */ +public class ChecksumInfo { + private final String checksum; + private final ChecksumAlgorithm algorithm; + + public ChecksumInfo(String checksum, ChecksumAlgorithm algorithm) { + this.checksum = checksum; + this.algorithm = algorithm; // Algorithm can be null for MD5 + } + + public String getChecksum() { + return checksum; + } + + public ChecksumAlgorithm getAlgorithm() { + return algorithm; + } +} diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInputStream.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInputStream.java new file mode 100644 index 00000000000..b4a8b16d498 --- /dev/null +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInputStream.java @@ -0,0 +1,162 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.objectstorage.transfer.internal; + +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; +import com.oracle.bmc.objectstorage.transfer.internal.download.MultithreadStream; +import com.oracle.bmc.objectstorage.transfer.internal.download.RetryingStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.FilterInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; + +/** + * A ChecksumInputStream that computes and verifies a checksum for the data read from the stream. + * Supports CRC32C, SHA-256, SHA-384, and MD5 algorithms. + * + *

Checksum verification is performed before the last byte is read. If the computed checksum does + * not match the expected checksum, an IOException is thrown. + */ +public class ChecksumInputStream extends FilterInputStream { + private static final Logger LOG = LoggerFactory.getLogger(ChecksumInputStream.class); + + private final ChecksumAlgorithm algorithm; + private final String expectedChecksum; + private final CRC32C crc32c; + private final MessageDigest digest; + private final boolean isMd5; + private volatile boolean checksumVerified = false; + private volatile long totalBytesRead = 0; + private final long contentLength; + + public ChecksumInputStream( + InputStream in, + ChecksumAlgorithm algorithm, + String expectedChecksum, + long contentLength) + throws NoSuchAlgorithmException { + super(in); + this.isMd5 = algorithm == null; + this.algorithm = algorithm; + this.expectedChecksum = expectedChecksum; + this.crc32c = this.algorithm == ChecksumAlgorithm.Crc32C ? new CRC32C() : null; + this.digest = selectDigest(this.algorithm, this.isMd5); + this.contentLength = contentLength; + } + + @Override + public int read() throws IOException { + int byteRead = super.read(); + if (byteRead != -1) { + totalBytesRead++; + updateChecksum(byteRead); + if (totalBytesRead == contentLength) { + verifyChecksum(); + checksumVerified = true; + } + } + return byteRead; + } + + @Override + public int read(byte[] b, int off, int len) throws IOException { + int bytesRead = super.read(b, off, len); + if (bytesRead != -1) { + totalBytesRead += bytesRead; + updateChecksum(b, off, bytesRead); + if (totalBytesRead == contentLength) { + verifyChecksum(); + checksumVerified = true; + } + } + return bytesRead; + } + + @Override + public int read(byte[] b) throws IOException { + return read(b, 0, b.length); + } + + /** + * This method throws an IOException because the underlying stream classes {@link + * RetryingStream} and {@link MultithreadStream} do not support the skip operation. + */ + @Override + public long skip(long n) throws IOException { + throw new IOException("skip not supported"); + } + + private void updateChecksum(int byteRead) { + if (algorithm == ChecksumAlgorithm.Crc32C) { + crc32c.update(byteRead); + } else { + digest.update((byte) byteRead); + } + } + + private void updateChecksum(byte[] b, int off, int len) { + if (algorithm == ChecksumAlgorithm.Crc32C) { + crc32c.update(b, off, len); + } else { + digest.update(b, off, len); + } + } + + private void verifyChecksum() throws IOException { + if (expectedChecksum == null) { + throw new IOException("Expected checksum is null"); + } + + if (algorithm == ChecksumAlgorithm.Crc32C) { + long calculatedChecksum = crc32c.getValue(); + byte[] expectedChecksumBytes = Base64.getDecoder().decode(expectedChecksum); + + if (expectedChecksumBytes.length != Integer.BYTES) { + throw new IOException("Expected checksum length is invalid"); + } + + int expectedChecksumValue = ByteBuffer.wrap(expectedChecksumBytes).getInt(); + + if (calculatedChecksum != Integer.toUnsignedLong(expectedChecksumValue)) { + LOG.error( + "Checksum mismatch: expected {}, but calculated {}", + expectedChecksum, + calculatedChecksum); + throw new IOException( + "Checksum mismatch: expected " + + expectedChecksum + + " but calculated " + + calculatedChecksum); + } + LOG.debug("CRC32C checksum verified successfully"); + } else { + byte[] calculatedDigest = digest.digest(); + byte[] expectedDigest = Base64.getDecoder().decode(expectedChecksum); + if (!MessageDigest.isEqual(calculatedDigest, expectedDigest)) { + LOG.error("Checksum mismatch"); + throw new IOException("Checksum mismatch"); + } + LOG.debug("{} checksum verified successfully", isMd5 ? "MD5" : algorithm); + } + } + + private static MessageDigest selectDigest(ChecksumAlgorithm algorithm, boolean isMd5) + throws NoSuchAlgorithmException { + if (algorithm == ChecksumAlgorithm.Sha256) { + return MessageDigest.getInstance("SHA-256"); + } else if (algorithm == ChecksumAlgorithm.Sha384) { + return MessageDigest.getInstance("SHA-384"); + } else if (isMd5) { + return MessageDigest.getInstance("MD5"); + } + return null; + } +} diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumUtils.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumUtils.java new file mode 100644 index 00000000000..326a4c3e2f4 --- /dev/null +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumUtils.java @@ -0,0 +1,395 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.objectstorage.transfer.internal; + +import com.oracle.bmc.http.client.io.DuplicatableInputStream; +import com.oracle.bmc.model.BmcException; +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; +import com.oracle.bmc.objectstorage.responses.CommitMultipartUploadResponse; +import com.oracle.bmc.objectstorage.responses.GetObjectResponse; +import com.oracle.bmc.objectstorage.responses.HeadObjectResponse; +import com.oracle.bmc.objectstorage.responses.PutObjectResponse; +import com.oracle.bmc.objectstorage.responses.UploadPartResponse; +import com.oracle.bmc.objectstorage.transfer.UploadManager; +import com.oracle.bmc.responses.BmcResponse; +import com.oracle.bmc.util.StreamUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.security.DigestOutputStream; +import java.util.Arrays; +import java.util.Base64; + +public class ChecksumUtils { + private static final Logger LOG = LoggerFactory.getLogger(ChecksumUtils.class); + + private ChecksumUtils() {} + + /** Calculate the MD5 checksum of the provided input stream. */ + public static MD5Calculation calculateMd5(InputStream stream, Long contentLength) { + return calculateChecksum( + stream, + contentLength, + StreamHelper::createMd5MessageOutputStream, + MD5Calculation::new, + "MD5"); + } + + /** Calculate the SHA-384 checksum of the provided input stream. */ + public static SHA384Calculation calculateSha384(InputStream stream, Long contentLength) { + return calculateChecksum( + stream, + contentLength, + StreamHelper::createSha384MessageOutputStream, + SHA384Calculation::new, + ChecksumAlgorithm.Sha384.getValue()); + } + + /** Calculate the SHA-256 checksum of the provided input stream. */ + public static SHA256Calculation calculateSha256(InputStream stream, Long contentLength) { + return calculateChecksum( + stream, + contentLength, + StreamHelper::createSha256MessageOutputStream, + SHA256Calculation::new, + ChecksumAlgorithm.Sha256.getValue()); + } + + /** Calculate the CRC32C checksum of the provided input stream. */ + public static CRC32CCalculation calculateCrc32c(InputStream stream, Long contentLength) { + return calculateChecksum( + stream, + contentLength, + StreamHelper::createCrc32cMessageOutputStream, + CRC32CCalculation::new, + ChecksumAlgorithm.Crc32C.getValue()); + } + + /** + * This method is responsible for calculating the checksum of the provided input stream based on + * the specified algorithm. The MD5 checksum calculation logic was refactored and relocated from + * the UploadManager to this utility class, ensuring a consistent approach for calculating + * checksums for various algorithms. + */ + private static T calculateChecksum( + InputStream stream, + Long contentLength, + DigestOutputStreamFactory outputStreamFactory, + ChecksumCalculationFactory calculationFactory, + String algorithmName) { + String checksum; + InputStream streamToReturn; + + if (stream instanceof DuplicatableInputStream) { + checksum = + performChecksumCalculation( + ((DuplicatableInputStream) stream).duplicate(), + new StreamHelper.NullOutputStream(), + contentLength, + outputStreamFactory, + algorithmName); + streamToReturn = stream; + } else { + LOG.info( + "About to copy object into memory to calculate {}, may lead to OutOfMemory exceptions", + algorithmName); + if (contentLength > Integer.MAX_VALUE) { + throw new BmcException( + false, + String.format( + "Cannot compute %s client-side as content length (%d) is larger than max buffer. Disable %s enforcement or provide a DuplicableInputStream to avoid this problem", + algorithmName, contentLength, algorithmName), + null, + null); + } + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(contentLength.intValue()); + checksum = + performChecksumCalculation( + stream, baos, contentLength, outputStreamFactory, algorithmName); + streamToReturn = StreamUtils.createByteArrayInputStream(baos.toByteArray()); + } catch (OutOfMemoryError oom) { + OutOfMemoryError newOom = + new OutOfMemoryError( + String.format( + "Could not compute %s. Disable %s enforcement or provide a DuplicableInputStream to avoid this problem", + algorithmName, algorithmName)); + newOom.initCause(oom); + throw newOom; + } + } + return calculationFactory.create(streamToReturn, checksum); + } + + private static String performChecksumCalculation( + InputStream stream, + OutputStream outputStream, + long contentLength, + DigestOutputStreamFactory outputStreamFactory, + String algorithmName) { + DigestOutputStream digestOutputStream = outputStreamFactory.create(outputStream); + long bytesCopied; + try { + bytesCopied = StreamHelper.copy(stream, digestOutputStream); + } catch (IOException e) { + throw new BmcException( + false, "Unable to calculate " + algorithmName + " checksum", e, null); + } + if (bytesCopied != contentLength) { + throw new BmcException( + false, + String.format( + "Failed to read all bytes while calculating %s checksum: %d, %d", + algorithmName, bytesCopied, contentLength), + null, + null); + } + return StreamHelper.base64Encode(digestOutputStream.getMessageDigest()); + } + + /** Calculate the CRC32C checksum of the provided byte array. */ + public static String calculateCrc32cChecksum(byte[] data) { + CRC32C crc32c = new CRC32C(); + crc32c.update(data, 0, data.length); + long crcValue = crc32c.getValue(); + byte[] crcBytes = ByteBuffer.allocate(Long.BYTES).putLong(crcValue).array(); + crcBytes = Arrays.copyOfRange(crcBytes, 4, Long.BYTES); + return Base64.getEncoder().encodeToString(crcBytes); + } + + public static ChecksumInfo getExpectedChecksumAndAlgorithm(GetObjectResponse response) { + String expectedChecksum; + ChecksumAlgorithm algorithm; + + if (response.getOpcContentCrc32c() != null) { + expectedChecksum = response.getOpcContentCrc32c(); + algorithm = ChecksumAlgorithm.Crc32C; + } else if (response.getOpcContentSha256() != null) { + expectedChecksum = response.getOpcContentSha256(); + algorithm = ChecksumAlgorithm.Sha256; + } else if (response.getOpcContentSha384() != null) { + expectedChecksum = response.getOpcContentSha384(); + algorithm = ChecksumAlgorithm.Sha384; + } else { + expectedChecksum = response.getContentMd5(); + algorithm = null; + } + + return new ChecksumInfo(expectedChecksum, algorithm); + } + + public static String getChecksumFromUploadResponse( + UploadManager.UploadResponse uploadResponse, + ChecksumAlgorithm checksumAlgorithm, + boolean isMultipart) { + if (checksumAlgorithm == null) { + return null; + } + switch (checksumAlgorithm) { + case Crc32C: + return uploadResponse.getContentCrc32c(); + case Sha256: + return isMultipart + ? uploadResponse.getMultipartSha256() + : uploadResponse.getContentSha256(); + case Sha384: + return isMultipart + ? uploadResponse.getMultipartSha384() + : uploadResponse.getContentSha384(); + default: + throw new IllegalArgumentException( + "Unsupported checksum algorithm: " + checksumAlgorithm); + } + } + + public static String getResponseChecksum( + BmcResponse response, ChecksumAlgorithm algorithm, boolean isMultipart) { + if (algorithm == null) { + return null; + } + + if (response instanceof GetObjectResponse) { + return getChecksumForGetObjectResponse( + (GetObjectResponse) response, algorithm, isMultipart); + } else if (response instanceof HeadObjectResponse) { + return getChecksumForHeadObjectResponse( + (HeadObjectResponse) response, algorithm, isMultipart); + } else if (response instanceof PutObjectResponse) { + return getChecksumForPutObjectResponse((PutObjectResponse) response, algorithm); + } else if (response instanceof UploadPartResponse) { + return getChecksumForUploadPartResponse((UploadPartResponse) response, algorithm); + } else if (response instanceof CommitMultipartUploadResponse) { + return getChecksumForCommitMultipartUploadResponse( + (CommitMultipartUploadResponse) response, algorithm); + } else { + throw new IllegalArgumentException("Unsupported response type"); + } + } + + private static String getChecksumForGetObjectResponse( + GetObjectResponse response, ChecksumAlgorithm algorithm, boolean isMultipart) { + switch (algorithm) { + case Crc32C: + return response.getOpcContentCrc32c(); + case Sha256: + return isMultipart + ? response.getOpcMultipartSha256() + : response.getOpcContentSha256(); + case Sha384: + return isMultipart + ? response.getOpcMultipartSha384() + : response.getOpcContentSha384(); + default: + throw new IllegalArgumentException("Unsupported checksum algorithm: " + algorithm); + } + } + + private static String getChecksumForHeadObjectResponse( + HeadObjectResponse response, ChecksumAlgorithm algorithm, boolean isMultipart) { + switch (algorithm) { + case Crc32C: + return response.getOpcContentCrc32c(); + case Sha256: + return isMultipart + ? response.getOpcMultipartSha256() + : response.getOpcContentSha256(); + case Sha384: + return isMultipart + ? response.getOpcMultipartSha384() + : response.getOpcContentSha384(); + default: + throw new IllegalArgumentException("Unsupported checksum algorithm: " + algorithm); + } + } + + private static String getChecksumForPutObjectResponse( + PutObjectResponse response, ChecksumAlgorithm algorithm) { + switch (algorithm) { + case Crc32C: + return response.getOpcContentCrc32c(); + case Sha256: + return response.getOpcContentSha256(); + case Sha384: + return response.getOpcContentSha384(); + default: + throw new IllegalArgumentException("Unsupported checksum algorithm: " + algorithm); + } + } + + private static String getChecksumForUploadPartResponse( + UploadPartResponse response, ChecksumAlgorithm algorithm) { + switch (algorithm) { + case Crc32C: + return response.getOpcContentCrc32c(); + case Sha256: + return response.getOpcContentSha256(); + case Sha384: + return response.getOpcContentSha384(); + default: + throw new IllegalArgumentException("Unsupported checksum algorithm: " + algorithm); + } + } + + private static String getChecksumForCommitMultipartUploadResponse( + CommitMultipartUploadResponse response, ChecksumAlgorithm algorithm) { + switch (algorithm) { + case Crc32C: + return response.getOpcContentCrc32c(); + case Sha256: + return response.getOpcMultipartSha256(); + case Sha384: + return response.getOpcMultipartSha384(); + default: + throw new IllegalArgumentException("Unsupported checksum algorithm: " + algorithm); + } + } + + public static class MD5Calculation { + private final InputStream streamToUse; + private final String md5; + + public MD5Calculation(InputStream streamToUse, String md5) { + this.streamToUse = streamToUse; + this.md5 = md5; + } + + public InputStream getStreamToUse() { + return streamToUse; + } + + public String getMd5() { + return md5; + } + } + + public static class SHA384Calculation { + private final InputStream streamToUse; + private final String sha384; + + public SHA384Calculation(InputStream streamToUse, String sha384) { + this.streamToUse = streamToUse; + this.sha384 = sha384; + } + + public InputStream getStreamToUse() { + return streamToUse; + } + + public String getSha384() { + return sha384; + } + } + + public static class SHA256Calculation { + private final InputStream streamToUse; + private final String sha256; + + public SHA256Calculation(InputStream streamToUse, String sha256) { + this.streamToUse = streamToUse; + this.sha256 = sha256; + } + + public InputStream getStreamToUse() { + return streamToUse; + } + + public String getSha256() { + return sha256; + } + } + + public static class CRC32CCalculation { + private final InputStream streamToUse; + private final String crc32c; + + public CRC32CCalculation(InputStream streamToUse, String crc32c) { + this.streamToUse = streamToUse; + this.crc32c = crc32c; + } + + public InputStream getStreamToUse() { + return streamToUse; + } + + public String getCrc32c() { + return crc32c; + } + } + + @FunctionalInterface + private interface DigestOutputStreamFactory { + DigestOutputStream create(OutputStream outputStream); + } + + @FunctionalInterface + private interface ChecksumCalculationFactory { + T create(InputStream streamToUse, String checksum); + } +} diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/MultipartUtils.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/MultipartUtils.java index 7ebd4a3fec3..d1875050226 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/MultipartUtils.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/MultipartUtils.java @@ -4,6 +4,7 @@ */ package com.oracle.bmc.objectstorage.transfer.internal; +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; import com.oracle.bmc.util.VisibleForTesting; import com.oracle.bmc.objectstorage.requests.PutObjectRequest; import com.oracle.bmc.objectstorage.transfer.UploadConfiguration; @@ -80,6 +81,100 @@ public static boolean shouldCalculateMd5( return config.isEnforceMd5BeforeUpload() && request.getContentMD5() == null; } + /** + * Test whether or not the additional checksum value should be calculated for the given request + * when issuing a single upload (non-multipart) request. + * + * @param config The configuration to use. + * @param request The request being sent. + * @return true to calculate additional checksum, false if it's not necessary. + */ + public static boolean shouldCalculateAdditionalChecksum( + @Nonnull UploadConfiguration config, @Nonnull PutObjectRequest request) { + if (config == null) { + throw new java.lang.NullPointerException("config is marked non-null but is null"); + } + if (request == null) { + throw new java.lang.NullPointerException("request is marked non-null but is null"); + } + + ChecksumAlgorithm checksumAlgorithm = config.getEnforceAdditionalChecksumBeforeUpload(); + ChecksumAlgorithm additionalChecksumAlgorithm = config.getAdditionalChecksumAlgorithm(); + + if (checksumAlgorithm == null) { + return false; + } + + if (additionalChecksumAlgorithm != null + && !checksumAlgorithm.equals(additionalChecksumAlgorithm)) { + throw new IllegalArgumentException( + "If both additionalChecksumAlgorithm and enforceAdditionalChecksumBeforeUpload are provided, they must be the same."); + } + + switch (checksumAlgorithm) { + case Crc32C: + return request.getOpcContentCrc32c() == null; + case Sha256: + return request.getOpcContentSha256() == null; + case Sha384: + return request.getOpcContentSha384() == null; + default: + return false; + } + } + + /** + * Determines whether an additional checksum value should be set for the given request. + * + *

This method covers the following cases: + * + *

    + *
  • If the request already has a checksum algorithm set, the method returns false, as + * there's no need to set it again. + *
  • If both the configuration's additional checksum algorithm and the request's checksum + * algorithm are provided but differ, an IllegalArgumentException is thrown. + *
  • If the configuration has no additional checksum algorithm and the request has no + * checksum algorithm, the method returns false, as there's nothing to set. + *
  • If the configuration has an additional checksum algorithm, and the request has no + * checksum algorithm, the method returns true, indicating that the additional checksum + * should be set. + *
+ * + * @param config The configuration to use. + * @param request The request being sent. + * @return true if the additional checksum should be set, false otherwise. + * @throws NullPointerException if config or request is null. + * @throws IllegalArgumentException if both the configuration and the request have different + * checksum algorithms. + */ + public static boolean shouldSetAdditionalChecksum( + @Nonnull UploadConfiguration config, @Nonnull PutObjectRequest request) { + if (config == null) { + throw new NullPointerException("config is marked non-null but is null"); + } + if (request == null) { + throw new NullPointerException("request is marked non-null but is null"); + } + + ChecksumAlgorithm additionalChecksumAlgorithm = config.getAdditionalChecksumAlgorithm(); + ChecksumAlgorithm requestChecksumAlgorithm = request.getOpcChecksumAlgorithm(); + + if (requestChecksumAlgorithm != null) { + if (additionalChecksumAlgorithm != null + && !additionalChecksumAlgorithm.equals(requestChecksumAlgorithm)) { + throw new IllegalArgumentException( + "If you are providing ChecksumAlgorithm in the upload request and setting the additionalChecksumAlgorithm, then both must be the same."); + } + return false; + } + + if (additionalChecksumAlgorithm == null) { + return false; + } + + return true; + } + private static boolean meetsMinimumSize(UploadConfiguration config, long contentLength) { long min = (config.getMinimumLengthForMultipartUpload() * MiB); return contentLength >= min; diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/StreamHelper.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/StreamHelper.java index 303063afc83..47be984e021 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/StreamHelper.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/internal/StreamHelper.java @@ -63,6 +63,46 @@ public static DigestOutputStream createMd5MessageOutputStream(OutputStream strea return new DigestOutputStream(stream, getMd5MessageDigest()); } + /** + * Creates a DigestOutputStream where the digest uses SHA-384. + * + * @param stream The output stream to write to. + * @return A new DigestOutputStream + */ + public static DigestOutputStream createSha384MessageOutputStream(OutputStream stream) { + try { + MessageDigest sha384Digest = MessageDigest.getInstance("SHA-384"); + return new DigestOutputStream(stream, sha384Digest); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("SHA-384 algorithm not available", e); + } + } + + /** + * Creates a DigestOutputStream where the digest uses SHA-256. + * + * @param stream The output stream to write to. + * @return A new DigestOutputStream + */ + public static DigestOutputStream createSha256MessageOutputStream(OutputStream stream) { + try { + MessageDigest sha256Digest = MessageDigest.getInstance("SHA-256"); + return new DigestOutputStream(stream, sha256Digest); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("SHA-256 algorithm not available", e); + } + } + + /** + * Creates a DigestOutputStream where the digest uses CRC32C. + * + * @param stream The output stream to write to. + * @return A new DigestOutputStream + */ + public static DigestOutputStream createCrc32cMessageOutputStream(OutputStream stream) { + return new DigestOutputStream(stream, new CRC32CDigest()); + } + /** * Base64 encodes the digest (resets the digest). * diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/DownloadManagerTest.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/DownloadManagerTest.java index 67538914b54..3c5e364a457 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/DownloadManagerTest.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/DownloadManagerTest.java @@ -43,6 +43,9 @@ public class DownloadManagerTest { private String bucketName; private String objectName; private String etag; + private String contentCrc32c; + private String contentSha256; + private String contentSha384; @BeforeClass public static void setupClass() { @@ -65,6 +68,9 @@ public void setup() { this.bucketName = mockObject.getBucketName(); this.objectName = mockObject.getObjectName(); this.etag = mockObject.getEtag(); + this.contentCrc32c = mockObject.getContentCrc32c(); + this.contentSha256 = mockObject.getContentSha256(); + this.contentSha384 = mockObject.getContentSha384(); this.objectStorage = MockObjectStorage.create(mockObject); } @@ -342,6 +348,135 @@ public void rangeGets() throws Exception { } } + @Test + public void testAdditionalChecksumSinglePartCorrectCrc32c() throws IOException { + final DownloadConfiguration config = + DownloadConfiguration.builder() + .executorService(executorService) + .enforceDataIntegrityForDownload(true) + .build(); + + final DownloadManager downloadManager = new DownloadManager(objectStorage, config); + final GetObjectRequest request = + GetObjectRequest.builder() + .namespaceName(namespaceName) + .bucketName(bucketName) + .objectName(objectName) + .build(); + final GetObjectResponse response = downloadManager.getObject(request); + verify(request, response); + Assert.assertEquals(contentCrc32c, response.getOpcContentCrc32c()); + } + + @Test + public void testAdditionalChecksumSinglePartCorrectSha256() throws IOException { + final DownloadConfiguration config = + DownloadConfiguration.builder() + .executorService(executorService) + .enforceDataIntegrityForDownload(true) + .build(); + + final DownloadManager downloadManager = new DownloadManager(objectStorage, config); + final GetObjectRequest request = + GetObjectRequest.builder() + .namespaceName(namespaceName) + .bucketName(bucketName) + .objectName(objectName) + .build(); + final GetObjectResponse response = downloadManager.getObject(request); + verify(request, response); + Assert.assertEquals(contentSha256, response.getOpcContentSha256()); + } + + @Test + public void testAdditionalChecksumSinglePartCorrectSha384() throws IOException { + final DownloadConfiguration config = + DownloadConfiguration.builder() + .executorService(executorService) + .enforceDataIntegrityForDownload(true) + .build(); + + final DownloadManager downloadManager = new DownloadManager(objectStorage, config); + final GetObjectRequest request = + GetObjectRequest.builder() + .namespaceName(namespaceName) + .bucketName(bucketName) + .objectName(objectName) + .build(); + final GetObjectResponse response = downloadManager.getObject(request); + verify(request, response); + Assert.assertEquals(contentSha384, response.getOpcContentSha384()); + } + + @Test + public void testAdditionalChecksumMultiPartCorrectCrc32c() throws IOException { + final DownloadConfiguration config = + DownloadConfiguration.builder() + .executorService(executorService) + .partSizeInBytes(4 * 1024 * 1024) + .multipartDownloadThresholdInBytes(4 * 1024 * 1024) + .parallelDownloads(2) + .enforceDataIntegrityForDownload(true) + .build(); + + final DownloadManager downloadManager = new DownloadManager(objectStorage, config); + final GetObjectRequest request = + GetObjectRequest.builder() + .namespaceName(namespaceName) + .bucketName(bucketName) + .objectName(objectName) + .build(); + final GetObjectResponse response = downloadManager.getObject(request); + verify(request, response); + Assert.assertEquals(contentCrc32c, response.getOpcContentCrc32c()); + } + + @Test + public void testAdditionalChecksumMultiPartCorrectSha256() throws IOException { + final DownloadConfiguration config = + DownloadConfiguration.builder() + .executorService(executorService) + .partSizeInBytes(4 * 1024 * 1024) + .multipartDownloadThresholdInBytes(4 * 1024 * 1024) + .parallelDownloads(2) + .enforceDataIntegrityForDownload(true) + .build(); + + final DownloadManager downloadManager = new DownloadManager(objectStorage, config); + final GetObjectRequest request = + GetObjectRequest.builder() + .namespaceName(namespaceName) + .bucketName(bucketName) + .objectName(objectName) + .build(); + final GetObjectResponse response = downloadManager.getObject(request); + verify(request, response); + Assert.assertEquals(contentSha256, response.getOpcContentSha256()); + } + + @Test + public void testAdditionalChecksumMultiPartCorrectSha384() throws IOException { + final DownloadConfiguration config = + DownloadConfiguration.builder() + .executorService(executorService) + .partSizeInBytes(4 * 1024 * 1024) + .multipartDownloadThresholdInBytes(4 * 1024 * 1024) + .parallelDownloads(2) + .enforceDataIntegrityForDownload(true) + .build(); + + final DownloadManager downloadManager = new DownloadManager(objectStorage, config); + final GetObjectRequest request = + GetObjectRequest.builder() + .namespaceName(namespaceName) + .bucketName(bucketName) + .objectName(objectName) + .build(); + final GetObjectResponse response = downloadManager.getObject(request); + verify(request, response); + Assert.assertEquals(contentSha384, response.getOpcContentSha384()); + } + private void verify(GetObjectRequest request, GetObjectResponse response) throws IOException { Assert.assertEquals(etag, response.getETag()); Assert.assertEquals(Long.valueOf(data.length), response.getContentLength()); diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssemblerTest.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssemblerTest.java index 5039baea847..572153d2e49 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssemblerTest.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/MultipartObjectAssemblerTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.Executors; import com.oracle.bmc.http.client.RequestInterceptor; +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; import com.oracle.bmc.retrier.DefaultRetryCondition; import com.oracle.bmc.retrier.RetryConfiguration; import com.oracle.bmc.waiter.ExponentialBackoffDelayStrategy; @@ -509,6 +510,128 @@ public void commit_addPart_afterAbort() throws Exception { } } + @Test + public void newRequest_withChecksumEnabled_andVerifyManifest() { + String uploadId = "uploadId"; + + assembler = + MultipartObjectAssembler.builder() + .allowOverwrite(ALLOW_OVERWRITE) + .bucketName(BUCKET) + .executorService(executorService) + .invocationCallback(mockInvocationCallback) + .namespaceName(NAMESPACE) + .objectName(OBJECT) + .service(service) + .cacheControl(CACHE_CONTROL) + .contentDisposition(CONTENT_DISPOSITION) + .additionalChecksumAlgorithm(ChecksumAlgorithm.Crc32C) + .build(); + + initializeCreateMultipartUpload(uploadId); + + MultipartManifest manifest = + assembler.newRequest(CONTENT_TYPE, CONTENT_LANGUAGE, CONTENT_ENCODING, OPC_META); + assertNotNull(manifest); + assertEquals(uploadId, manifest.getUploadId()); + + ArgumentCaptor captor = + ArgumentCaptor.forClass(CreateMultipartUploadRequest.class); + verify(service).createMultipartUpload(captor.capture()); + + CreateMultipartUploadRequest request = captor.getValue(); + assertEquals(NAMESPACE, request.getNamespaceName()); + assertEquals(BUCKET, request.getBucketName()); + assertEquals(OBJECT, request.getCreateMultipartUploadDetails().getObject()); + assertEquals(CONTENT_TYPE, request.getCreateMultipartUploadDetails().getContentType()); + assertEquals( + CONTENT_LANGUAGE, request.getCreateMultipartUploadDetails().getContentLanguage()); + assertEquals( + CONTENT_ENCODING, request.getCreateMultipartUploadDetails().getContentEncoding()); + assertEquals(OPC_META, request.getCreateMultipartUploadDetails().getMetadata()); + assertEquals(mockInvocationCallback, request.getInvocationCallback()); + assertEquals(CACHE_CONTROL, request.getCreateMultipartUploadDetails().getCacheControl()); + assertEquals( + CONTENT_DISPOSITION, + request.getCreateMultipartUploadDetails().getContentDisposition()); + assertEquals(ChecksumAlgorithm.Crc32C, request.getOpcChecksumAlgorithm()); + } + + @Test + public void addParts_withChecksum_allSuccessful_commit() throws Exception { + String uploadId = "uploadId"; + initializeCreateMultipartUpload(uploadId); + MultipartManifest manifest = + assembler.newRequest(CONTENT_TYPE, CONTENT_LANGUAGE, CONTENT_ENCODING, OPC_META); + + byte[] bytes = "abcd".getBytes(); + + File file = File.createTempFile("unitTest", ".txt"); + file.deleteOnExit(); + try (FileOutputStream fos = new FileOutputStream(file)) { + fos.write(bytes); + } + + String etag1 = "etag1"; + String etag2 = "etag2"; + UploadPartResponse uploadPartResponse1 = UploadPartResponse.builder().eTag(etag1).build(); + UploadPartResponse uploadPartResponse2 = UploadPartResponse.builder().eTag(etag2).build(); + when(service.uploadPart(any(UploadPartRequest.class))) + .thenReturn(uploadPartResponse1) + .thenReturn(uploadPartResponse2); + + CommitMultipartUploadResponse finalCommitResponse = + CommitMultipartUploadResponse.builder().build(); + when(service.commitMultipartUpload(any(CommitMultipartUploadRequest.class))) + .thenReturn(finalCommitResponse); + + String checksum1 = "checksum_1"; + String checksum2 = "checksum_2"; + String checksumAlgorithm = ChecksumAlgorithm.Crc32C.getValue(); + + assembler.addPart( + StreamUtils.createByteArrayInputStream(bytes), + bytes.length, + checksum1, + checksumAlgorithm); + assembler.addPart( + StreamUtils.createByteArrayInputStream(bytes), + bytes.length, + checksum2, + checksumAlgorithm); + + CommitMultipartUploadResponse commitResponse = assembler.commit(); + assertSame(finalCommitResponse, commitResponse); + + ArgumentCaptor commitCaptor = + ArgumentCaptor.forClass(CommitMultipartUploadRequest.class); + verify(service).commitMultipartUpload(commitCaptor.capture()); + CommitMultipartUploadRequest actualCommitRequest = commitCaptor.getValue(); + assertEquals(NAMESPACE, actualCommitRequest.getNamespaceName()); + assertEquals(BUCKET, actualCommitRequest.getBucketName()); + assertEquals(OBJECT, actualCommitRequest.getObjectName()); + assertEquals(uploadId, actualCommitRequest.getUploadId()); + assertEquals(mockInvocationCallback, actualCommitRequest.getInvocationCallback()); + + assertTrue(manifest.isUploadComplete()); + assertTrue(manifest.isUploadSuccessful()); + assertEquals(2, manifest.listCompletedParts().size()); + assertEquals(1, manifest.listCompletedParts().get(0).getPartNum().intValue()); + assertEquals(etag1, manifest.listCompletedParts().get(0).getEtag()); + assertEquals(2, manifest.listCompletedParts().get(1).getPartNum().intValue()); + assertEquals(etag2, manifest.listCompletedParts().get(1).getEtag()); + + ArgumentCaptor uploadCaptor = + ArgumentCaptor.forClass(UploadPartRequest.class); + verify(service, times(2)).uploadPart(uploadCaptor.capture()); + verifyUploadPart( + uploadCaptor.getAllValues().get(0), uploadId, 1, checksum1, checksumAlgorithm); + verifyUploadPart( + uploadCaptor.getAllValues().get(1), uploadId, 2, checksum2, checksumAlgorithm); + + file.delete(); + } + private void verifyUploadPart( UploadPartRequest request, String uploadId, int partNum, String md5) { assertEquals(NAMESPACE, request.getNamespaceName()); @@ -522,6 +645,22 @@ private void verifyUploadPart( assertNotNull(request.getUploadPartBody()); } + private void verifyUploadPart( + UploadPartRequest request, + String uploadId, + int partNum, + String checksum, + String checksumAlgorithm) { + assertEquals(NAMESPACE, request.getNamespaceName()); + assertEquals(BUCKET, request.getBucketName()); + assertEquals(uploadId, request.getUploadId()); + assertEquals(partNum, request.getUploadPartNum().intValue()); + assertEquals(checksum, request.getOpcContentCrc32c()); + assertEquals(checksumAlgorithm, request.getOpcChecksumAlgorithm().getValue()); + assertEquals(mockInvocationCallback, request.getInvocationCallback()); + assertNotNull(request.getUploadPartBody()); + } + @Test public void abort() { String uploadId = "uploadId"; diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/UploadManagerTest.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/UploadManagerTest.java index 45b46bbd6ca..c87f6b1d542 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/UploadManagerTest.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/UploadManagerTest.java @@ -16,6 +16,7 @@ import com.oracle.bmc.model.BmcException; import com.oracle.bmc.objectstorage.ObjectStorage; import com.oracle.bmc.objectstorage.ObjectStorageClient; +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; import com.oracle.bmc.objectstorage.model.MultipartUpload; import com.oracle.bmc.objectstorage.model.StorageTier; import com.oracle.bmc.objectstorage.requests.AbortMultipartUploadRequest; @@ -688,6 +689,225 @@ public void multiplartUpload_shouldAbort_whenNoPartsWereUploaded() { } } + @Test + public void upload_singleUpload_withSha256Checksum() throws IOException { + UploadConfiguration uploadConfiguration = + UploadConfiguration.builder() + .allowMultipartUploads(false) + .additionalChecksumAlgorithm(ChecksumAlgorithm.Sha256) + .build(); + UploadManager uploadManager = new UploadManager(objectStorage, uploadConfiguration); + + UploadRequest request = createUploadRequest(); + + ArgumentCaptor putRequestCaptor = + ArgumentCaptor.forClass(PutObjectRequest.class); + PutObjectResponse putResponse = + PutObjectResponse.builder() + .eTag("etag") + .opcContentSha256("sha256") + .opcRequestId(REQ_ID) + .opcClientRequestId(CLIENT_REQ_ID) + .build(); + when(objectStorage.putObject(putRequestCaptor.capture())).thenReturn(putResponse); + + UploadResponse uploadResponse = uploadManager.upload(request); + + assertNotNull(uploadResponse); + assertEquals("etag", uploadResponse.getETag()); + assertEquals("sha256", uploadResponse.getContentSha256()); + assertNull(uploadResponse.getMultipartMd5()); + assertEquals(REQ_ID, uploadResponse.getOpcRequestId()); + assertEquals(CLIENT_REQ_ID, uploadResponse.getOpcClientRequestId()); + byte[] buffer = new byte[(int) CONTENT_LENGTH]; + putRequestCaptor.getValue().getPutObjectBody().read(buffer); + assertEquals(CONTENT, new String(buffer)); + assertSame( + UploadManager.RETRY_CONFIGURATION, + putRequestCaptor.getValue().getRetryConfiguration()); + assertEquals(CONTENT_LENGTH, putRequestCaptor.getValue().getContentLength().longValue()); + assertEquals(CLIENT_REQ_ID, putRequestCaptor.getValue().getOpcClientRequestId()); + assertSame(METADATA, putRequestCaptor.getValue().getOpcMeta()); + } + + @Test + public void upload_singleUpload_withSha384Checksum() throws IOException { + UploadConfiguration uploadConfiguration = + UploadConfiguration.builder() + .allowMultipartUploads(false) + .additionalChecksumAlgorithm(ChecksumAlgorithm.Sha384) + .build(); + UploadManager uploadManager = new UploadManager(objectStorage, uploadConfiguration); + + UploadRequest request = createUploadRequest(); + + ArgumentCaptor putRequestCaptor = + ArgumentCaptor.forClass(PutObjectRequest.class); + PutObjectResponse putResponse = + PutObjectResponse.builder() + .eTag("etag") + .opcContentSha384("sha384") + .opcRequestId(REQ_ID) + .opcClientRequestId(CLIENT_REQ_ID) + .build(); + when(objectStorage.putObject(putRequestCaptor.capture())).thenReturn(putResponse); + + UploadResponse uploadResponse = uploadManager.upload(request); + + assertNotNull(uploadResponse); + assertEquals("etag", uploadResponse.getETag()); + assertEquals("sha384", uploadResponse.getContentSha384()); + assertNull(uploadResponse.getMultipartMd5()); + assertEquals(REQ_ID, uploadResponse.getOpcRequestId()); + assertEquals(CLIENT_REQ_ID, uploadResponse.getOpcClientRequestId()); + byte[] buffer = new byte[(int) CONTENT_LENGTH]; + putRequestCaptor.getValue().getPutObjectBody().read(buffer); + assertEquals(CONTENT, new String(buffer)); + assertSame( + UploadManager.RETRY_CONFIGURATION, + putRequestCaptor.getValue().getRetryConfiguration()); + assertEquals(CONTENT_LENGTH, putRequestCaptor.getValue().getContentLength().longValue()); + assertEquals(CLIENT_REQ_ID, putRequestCaptor.getValue().getOpcClientRequestId()); + assertSame(METADATA, putRequestCaptor.getValue().getOpcMeta()); + } + + @Test + public void upload_singleUpload_withCrc32cChecksum() throws IOException { + UploadConfiguration uploadConfiguration = + UploadConfiguration.builder() + .allowMultipartUploads(false) + .additionalChecksumAlgorithm(ChecksumAlgorithm.Crc32C) + .build(); + UploadManager uploadManager = new UploadManager(objectStorage, uploadConfiguration); + + UploadRequest request = createUploadRequest(); + + ArgumentCaptor putRequestCaptor = + ArgumentCaptor.forClass(PutObjectRequest.class); + PutObjectResponse putResponse = + PutObjectResponse.builder() + .eTag("etag") + .opcContentCrc32c("crc32c") + .opcRequestId(REQ_ID) + .opcClientRequestId(CLIENT_REQ_ID) + .build(); + when(objectStorage.putObject(putRequestCaptor.capture())).thenReturn(putResponse); + + UploadResponse uploadResponse = uploadManager.upload(request); + + assertNotNull(uploadResponse); + assertEquals("etag", uploadResponse.getETag()); + assertEquals("crc32c", uploadResponse.getContentCrc32c()); + assertNull(uploadResponse.getMultipartMd5()); + assertEquals(REQ_ID, uploadResponse.getOpcRequestId()); + assertEquals(CLIENT_REQ_ID, uploadResponse.getOpcClientRequestId()); + byte[] buffer = new byte[(int) CONTENT_LENGTH]; + putRequestCaptor.getValue().getPutObjectBody().read(buffer); + assertEquals(CONTENT, new String(buffer)); + assertSame( + UploadManager.RETRY_CONFIGURATION, + putRequestCaptor.getValue().getRetryConfiguration()); + assertEquals(CONTENT_LENGTH, putRequestCaptor.getValue().getContentLength().longValue()); + assertEquals(CLIENT_REQ_ID, putRequestCaptor.getValue().getOpcClientRequestId()); + assertSame(METADATA, putRequestCaptor.getValue().getOpcMeta()); + } + + @Test + public void upload_multipartUpload_withSha256Checksum() { + UploadConfiguration uploadConfiguration = + UploadConfiguration.builder() + .minimumLengthForMultipartUpload(10) + .lengthPerUploadPart(10) + .additionalChecksumAlgorithm(ChecksumAlgorithm.Sha256) + .enforceAdditionalChecksumBeforeMultipartUpload(ChecksumAlgorithm.Sha256) + .build(); + UploadManager uploadManager = + new UploadManager(objectStorage, uploadConfiguration) { + @Override + protected MultipartObjectAssembler createAssembler( + PutObjectRequest request, + UploadRequest uploadRequest, + ExecutorService executorService) { + return assembler; + } + }; + + UploadRequest request = createUploadRequest(); + when(assembler.commit()) + .thenReturn( + CommitMultipartUploadResponse.builder() + .eTag("finalEtag") + .opcRequestId(REQ_ID) + .opcClientRequestId(CLIENT_REQ_ID) + .opcMultipartSha256("multipartSha256") + .build()); + + UploadResponse uploadResponse = uploadManager.upload(request); + assertNotNull(uploadResponse); + assertEquals("finalEtag", uploadResponse.getETag()); + assertEquals("multipartSha256", uploadResponse.getMultipartSha256()); + assertNull(uploadResponse.getContentMd5()); + assertNull(uploadResponse.getMultipartMd5()); + assertEquals(REQ_ID, uploadResponse.getOpcRequestId()); + assertEquals(CLIENT_REQ_ID, uploadResponse.getOpcClientRequestId()); + + verify(assembler).newRequest(CONTENT_TYPE, CONTENT_LANG, CONTENT_ENCODING, METADATA); + verify(assembler, times(2)) + .addPart( + any(InputStream.class), + eq(CONTENT_LENGTH / 2), + anyString(), + eq(ChecksumAlgorithm.Sha256.getValue())); + } + + @Test + public void upload_multipartUpload_withCrc32cChecksum() { + UploadConfiguration uploadConfiguration = + UploadConfiguration.builder() + .minimumLengthForMultipartUpload(10) + .lengthPerUploadPart(10) + .additionalChecksumAlgorithm(ChecksumAlgorithm.Crc32C) + .enforceAdditionalChecksumBeforeMultipartUpload(ChecksumAlgorithm.Crc32C) + .build(); + UploadManager uploadManager = + new UploadManager(objectStorage, uploadConfiguration) { + @Override + protected MultipartObjectAssembler createAssembler( + PutObjectRequest request, + UploadRequest uploadRequest, + ExecutorService executorService) { + return assembler; + } + }; + + UploadRequest request = createUploadRequest(); + when(assembler.commit()) + .thenReturn( + CommitMultipartUploadResponse.builder() + .eTag("finalEtag") + .opcRequestId(REQ_ID) + .opcClientRequestId(CLIENT_REQ_ID) + .opcContentCrc32c("contentCrc32c") + .build()); + + UploadResponse uploadResponse = uploadManager.upload(request); + assertNotNull(uploadResponse); + assertEquals("finalEtag", uploadResponse.getETag()); + assertEquals("contentCrc32c", uploadResponse.getContentCrc32c()); + assertNull(uploadResponse.getContentMd5()); + assertNull(uploadResponse.getMultipartMd5()); + assertEquals(REQ_ID, uploadResponse.getOpcRequestId()); + assertEquals(CLIENT_REQ_ID, uploadResponse.getOpcClientRequestId()); + + verify(assembler).newRequest(CONTENT_TYPE, CONTENT_LANG, CONTENT_ENCODING, METADATA); + verify(assembler, times(2)) + .addPart( + any(InputStream.class), + eq(CONTENT_LENGTH / 2), + anyString(), + eq(ChecksumAlgorithm.Crc32C.getValue())); + } + private static UploadConfiguration getMultipartUploadConfiguration() { return UploadConfiguration.builder() .minimumLengthForMultipartUpload(10) diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/helper/MockObject.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/helper/MockObject.java index c7020d528af..75b67f926d6 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/helper/MockObject.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/helper/MockObject.java @@ -7,6 +7,7 @@ import com.oracle.bmc.model.BmcException; import com.oracle.bmc.objectstorage.requests.GetObjectRequest; import com.oracle.bmc.objectstorage.responses.GetObjectResponse; +import com.oracle.bmc.objectstorage.transfer.internal.ChecksumUtils; import org.junit.Assert; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -26,6 +27,9 @@ public final class MockObject implements Answer { private final byte[] data; private final String etag; private final FailureInjector failureInjector; + private final String contentCrc32c; + private final String contentSha256; + private final String contentSha384; public MockObject( Map metadata, @@ -40,6 +44,13 @@ public MockObject( this.metadata = metadata; this.etag = UUID.randomUUID().toString(); this.failureInjector = failureInjector; + this.contentCrc32c = ChecksumUtils.calculateCrc32cChecksum(data); + this.contentSha256 = + ChecksumUtils.calculateSha256(new ByteArrayInputStream(data), (long) data.length) + .getSha256(); + this.contentSha384 = + ChecksumUtils.calculateSha384(new ByteArrayInputStream(data), (long) data.length) + .getSha384(); } public String getNamespaceName() { @@ -70,6 +81,18 @@ public String getEtag() { return etag; } + public String getContentCrc32c() { + return contentCrc32c; + } + + public String getContentSha256() { + return contentSha256; + } + + public String getContentSha384() { + return contentSha384; + } + @Override public GetObjectResponse answer(InvocationOnMock invocationOnMock) throws Throwable { return this.getObject((GetObjectRequest) invocationOnMock.getArguments()[0]); @@ -136,6 +159,9 @@ GetObjectResponse getObject(GetObjectRequest request) { .opcMeta(getMetadata()) .inputStream(new FailingInputStream(failureInjector, inputStream)) .contentLength(contentLength) + .opcContentCrc32c(getContentCrc32c()) + .opcContentSha256(getContentSha256()) + .opcContentSha384(getContentSha384()) .build(); } diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32CTest.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32CTest.java new file mode 100644 index 00000000000..9c2e28b96bf --- /dev/null +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/CRC32CTest.java @@ -0,0 +1,45 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.objectstorage.transfer.internal; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; + +public class CRC32CTest { + + private CRC32C crc32c; + + @Before + public void setUp() { + crc32c = new CRC32C(); + } + + @Test + public void testUpdateWithSingleByte() { + byte[] input = "123456789".getBytes(StandardCharsets.US_ASCII); + for (byte b : input) { + crc32c.update(b); + } + Assert.assertEquals("Checksum value mismatch", 0xE3069283L, crc32c.getValue()); + } + + @Test + public void testUpdateWithByteArray() { + byte[] input = "123456789".getBytes(StandardCharsets.US_ASCII); + crc32c.update(input, 0, input.length); + Assert.assertEquals("Checksum value mismatch", 0xE3069283L, crc32c.getValue()); + } + + @Test + public void testUpdateWithByteBuffer() { + ByteBuffer buffer = ByteBuffer.wrap("123456789".getBytes(StandardCharsets.US_ASCII)); + crc32c.update(buffer); + Assert.assertEquals("Checksum value mismatch", 0xE3069283L, crc32c.getValue()); + } +} diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInputStreamTest.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInputStreamTest.java new file mode 100644 index 00000000000..37277c8d608 --- /dev/null +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumInputStreamTest.java @@ -0,0 +1,216 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.objectstorage.transfer.internal; + +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; +import org.junit.Before; +import org.junit.Test; +import org.junit.Assert; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; + +public class ChecksumInputStreamTest { + + private static final String TEST_DATA = "123456789"; + private InputStream inputStream; + + @Before + public void setUp() { + inputStream = new ByteArrayInputStream(TEST_DATA.getBytes()); + } + + @Test + public void testCrc32cChecksumVerificationSuccess() + throws IOException, NoSuchAlgorithmException { + String expectedChecksum = ChecksumUtils.calculateCrc32cChecksum(TEST_DATA.getBytes()); + try (ChecksumInputStream checksumStream = + new ChecksumInputStream( + inputStream, + ChecksumAlgorithm.Crc32C, + expectedChecksum, + TEST_DATA.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + // If no exception thrown, verification is successful + } + } + + @Test + public void testCrc32cChecksumVerificationFailure() { + String incorrectChecksum = + ChecksumUtils.calculateCrc32cChecksum("12345678".getBytes(StandardCharsets.UTF_8)); + + IOException thrown = + Assert.assertThrows( + IOException.class, + () -> { + try (ChecksumInputStream checksumStream = + new ChecksumInputStream( + inputStream, + ChecksumAlgorithm.Crc32C, + incorrectChecksum, + TEST_DATA.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + } + }); + + Assert.assertTrue(thrown.getMessage().contains("Checksum mismatch")); + } + + @Test + public void testSha256ChecksumVerificationSuccess() + throws IOException, NoSuchAlgorithmException { + MessageDigest sha256 = MessageDigest.getInstance("SHA-256"); + sha256.update(TEST_DATA.getBytes()); + String expectedChecksum = Base64.getEncoder().encodeToString(sha256.digest()); + + try (ChecksumInputStream checksumStream = + new ChecksumInputStream( + inputStream, + ChecksumAlgorithm.Sha256, + expectedChecksum, + TEST_DATA.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + // If no exception thrown, verification is successful + } + } + + @Test + public void testSha256ChecksumVerificationFailure() { + String incorrectChecksum = Base64.getEncoder().encodeToString(new byte[] {1, 2, 3, 4}); + + IOException thrown = + Assert.assertThrows( + IOException.class, + () -> { + try (ChecksumInputStream checksumStream = + new ChecksumInputStream( + inputStream, + ChecksumAlgorithm.Sha256, + incorrectChecksum, + TEST_DATA.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + } + }); + + Assert.assertTrue(thrown.getMessage().contains("Checksum mismatch")); + } + + @Test + public void testSha384ChecksumVerificationSuccess() + throws IOException, NoSuchAlgorithmException { + MessageDigest sha384 = MessageDigest.getInstance("SHA-384"); + sha384.update(TEST_DATA.getBytes()); + String expectedChecksum = Base64.getEncoder().encodeToString(sha384.digest()); + + try (ChecksumInputStream checksumStream = + new ChecksumInputStream( + inputStream, + ChecksumAlgorithm.Sha384, + expectedChecksum, + TEST_DATA.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + // If no exception thrown, verification is successful + } + } + + @Test + public void testSha384ChecksumVerificationFailure() { + String incorrectChecksum = + Base64.getEncoder().encodeToString(new byte[] {1, 2, 3, 4, 5, 6}); + + IOException thrown = + Assert.assertThrows( + IOException.class, + () -> { + try (ChecksumInputStream checksumStream = + new ChecksumInputStream( + inputStream, + ChecksumAlgorithm.Sha384, + incorrectChecksum, + TEST_DATA.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + } + }); + + Assert.assertTrue(thrown.getMessage().contains("Checksum mismatch")); + } + + @Test + public void testLargeDataChecksumVerificationSuccess() + throws IOException, NoSuchAlgorithmException { + String largeData = new String(new char[1000000]).replace("\0", "A"); + InputStream largeInputStream = new ByteArrayInputStream(largeData.getBytes()); + String expectedChecksum = ChecksumUtils.calculateCrc32cChecksum(largeData.getBytes()); + + try (ChecksumInputStream checksumStream = + new ChecksumInputStream( + largeInputStream, + ChecksumAlgorithm.Crc32C, + expectedChecksum, + largeData.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + // If no exception thrown, verification is successful + } + } + + @Test + public void testMd5ChecksumVerificationSuccess() throws IOException, NoSuchAlgorithmException { + MessageDigest md5 = MessageDigest.getInstance("MD5"); + md5.update(TEST_DATA.getBytes()); + String expectedChecksum = Base64.getEncoder().encodeToString(md5.digest()); + + try (ChecksumInputStream checksumStream = + new ChecksumInputStream(inputStream, null, expectedChecksum, TEST_DATA.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + // If no exception thrown, verification is successful + } + } + + @Test + public void testMd5ChecksumVerificationFailure() { + String incorrectChecksum = + Base64.getEncoder().encodeToString("12345678".getBytes(StandardCharsets.UTF_8)); + + IOException thrown = + Assert.assertThrows( + IOException.class, + () -> { + try (ChecksumInputStream checksumStream = + new ChecksumInputStream( + inputStream, + null, + incorrectChecksum, + TEST_DATA.length())) { + while (checksumStream.read() != -1) { + // Read all data + } + } + }); + + Assert.assertTrue(thrown.getMessage().contains("Checksum mismatch")); + } +} diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumUtilsTest.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumUtilsTest.java new file mode 100644 index 00000000000..37dc805e5c9 --- /dev/null +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/ChecksumUtilsTest.java @@ -0,0 +1,74 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.objectstorage.transfer.internal; + +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; +import com.oracle.bmc.objectstorage.requests.GetObjectRequest; +import com.oracle.bmc.objectstorage.responses.GetObjectResponse; +import org.junit.Assert; +import org.junit.Test; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; + +public class ChecksumUtilsTest { + + private static final String TEST_DATA = "123456789"; + private static final long CONTENT_LENGTH = TEST_DATA.length(); + private static final String PRECOMPUTED_MD5 = "JfnnlDI7RTiF9RgfG2JNCw=="; + private static final String PRECOMPUTED_SHA256 = "FeKw08M4keuw8e9gnsQZQgwg4yDOlMZfvIwzEkSOsiU="; + private static final String PRECOMPUTED_SHA384 = + "60VdVtLBpp3mToMgEfM5PUXz+jHWhC8hr5LS/kacSZ2l4xeYRzNKGEecjR3t6hvj"; + private static final String PRECOMPUTED_CRC32C = "4waSgw=="; + + @Test + public void testCalculateMd5() { + InputStream stream = new ByteArrayInputStream(TEST_DATA.getBytes(StandardCharsets.UTF_8)); + ChecksumUtils.MD5Calculation result = ChecksumUtils.calculateMd5(stream, CONTENT_LENGTH); + + Assert.assertNotNull(result); + Assert.assertEquals(PRECOMPUTED_MD5, result.getMd5()); + } + + @Test + public void testCalculateSha384() { + InputStream stream = new ByteArrayInputStream(TEST_DATA.getBytes(StandardCharsets.UTF_8)); + ChecksumUtils.SHA384Calculation result = + ChecksumUtils.calculateSha384(stream, CONTENT_LENGTH); + + Assert.assertNotNull(result); + Assert.assertEquals(PRECOMPUTED_SHA384, result.getSha384()); + } + + @Test + public void testCalculateSha256() { + InputStream stream = new ByteArrayInputStream(TEST_DATA.getBytes(StandardCharsets.UTF_8)); + ChecksumUtils.SHA256Calculation result = + ChecksumUtils.calculateSha256(stream, CONTENT_LENGTH); + + Assert.assertNotNull(result); + Assert.assertEquals(PRECOMPUTED_SHA256, result.getSha256()); + } + + @Test + public void testCalculateCrc32c() { + InputStream stream = new ByteArrayInputStream(TEST_DATA.getBytes(StandardCharsets.UTF_8)); + ChecksumUtils.CRC32CCalculation result = + ChecksumUtils.calculateCrc32c(stream, CONTENT_LENGTH); + + Assert.assertNotNull(result); + Assert.assertEquals(PRECOMPUTED_CRC32C, result.getCrc32c()); + } + + @Test + public void testCalculateCrc32cChecksum() { + String result = + ChecksumUtils.calculateCrc32cChecksum(TEST_DATA.getBytes(StandardCharsets.UTF_8)); + Assert.assertEquals(PRECOMPUTED_CRC32C, result); + } +} diff --git a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/MultipartUtilsTest.java b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/MultipartUtilsTest.java index 23c2b76b365..6e31080eeaa 100644 --- a/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/MultipartUtilsTest.java +++ b/bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/internal/MultipartUtilsTest.java @@ -8,6 +8,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import com.oracle.bmc.objectstorage.model.ChecksumAlgorithm; import org.junit.Rule; import org.junit.Test; @@ -191,4 +192,70 @@ public void shouldCalculateMd5_enabled_notSet() { UploadConfiguration.builder().enforceMd5(true).build(), PutObjectRequest.builder().build())); } + + @Test + public void shouldCalculateAdditionalChecksum_disabled() { + assertFalse( + MultipartUtils.shouldCalculateAdditionalChecksum( + UploadConfiguration.builder() + .enforceAdditionalChecksumBeforeUpload(null) + .build(), + PutObjectRequest.builder().build())); + } + + @Test + public void shouldCalculateAdditionalChecksum_enabled_crc32cAlreadySet() { + assertFalse( + MultipartUtils.shouldCalculateAdditionalChecksum( + UploadConfiguration.builder() + .enforceAdditionalChecksumBeforeUpload(ChecksumAlgorithm.Crc32C) + .build(), + PutObjectRequest.builder().opcContentCrc32c("crc32c").build())); + } + + @Test + public void shouldCalculateAdditionalChecksum_enabled_sha256AlreadySet() { + assertFalse( + MultipartUtils.shouldCalculateAdditionalChecksum( + UploadConfiguration.builder() + .enforceAdditionalChecksumBeforeUpload(ChecksumAlgorithm.Sha256) + .build(), + PutObjectRequest.builder().opcContentSha256("sha256").build())); + } + + @Test + public void shouldCalculateAdditionalChecksum_enabled_sha384AlreadySet() { + assertFalse( + MultipartUtils.shouldCalculateAdditionalChecksum( + UploadConfiguration.builder() + .enforceAdditionalChecksumBeforeUpload(ChecksumAlgorithm.Sha384) + .build(), + PutObjectRequest.builder().opcContentSha384("sha384").build())); + } + + @Test + public void shouldCalculateAdditionalChecksum_enabled_notSet() { + assertTrue( + MultipartUtils.shouldCalculateAdditionalChecksum( + UploadConfiguration.builder() + .enforceAdditionalChecksumBeforeUpload(ChecksumAlgorithm.Crc32C) + .build(), + PutObjectRequest.builder().build())); + } + + @Test + public void shouldCalculateAdditionalChecksum_conflictAlgorithms() { + UploadConfiguration config = + UploadConfiguration.builder() + .enforceAdditionalChecksumBeforeUpload(ChecksumAlgorithm.Crc32C) + .additionalChecksumAlgorithm(ChecksumAlgorithm.Sha256) + .build(); + + PutObjectRequest request = PutObjectRequest.builder().build(); + + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("must be the same"); + + MultipartUtils.shouldCalculateAdditionalChecksum(config, request); + } } diff --git a/bmc-objectstorage/bmc-objectstorage-generated/pom.xml b/bmc-objectstorage/bmc-objectstorage-generated/pom.xml index fa8b20ab2b6..7ac2565678f 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 - 3.54.0 + 3.55.0 ../pom.xml @@ -19,7 +19,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-objectstorage/bmc-objectstorage-generated/src/main/resources/com/oracle/bmc/objectstorage/client.properties b/bmc-objectstorage/bmc-objectstorage-generated/src/main/resources/com/oracle/bmc/objectstorage/client.properties index 73df68dc2f1..0ca15ebfe64 100644 --- a/bmc-objectstorage/bmc-objectstorage-generated/src/main/resources/com/oracle/bmc/objectstorage/client.properties +++ b/bmc-objectstorage/bmc-objectstorage-generated/src/main/resources/com/oracle/bmc/objectstorage/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") \ No newline at end of file diff --git a/bmc-objectstorage/pom.xml b/bmc-objectstorage/pom.xml index 2f27d750824..fbf414fcdf0 100644 --- a/bmc-objectstorage/pom.xml +++ b/bmc-objectstorage/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml diff --git a/bmc-oce/pom.xml b/bmc-oce/pom.xml index 6f96a758a69..8130a3a453d 100644 --- a/bmc-oce/pom.xml +++ b/bmc-oce/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-oce @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-oce/src/main/resources/com/oracle/bmc/oce/client.properties b/bmc-oce/src/main/resources/com/oracle/bmc/oce/client.properties index 283b159de5d..ac1d9cdd1a9 100644 --- a/bmc-oce/src/main/resources/com/oracle/bmc/oce/client.properties +++ b/bmc-oce/src/main/resources/com/oracle/bmc/oce/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190912") \ No newline at end of file diff --git a/bmc-ocicontrolcenter/pom.xml b/bmc-ocicontrolcenter/pom.xml index 42dd75a40c0..bdd42a68252 100644 --- a/bmc-ocicontrolcenter/pom.xml +++ b/bmc-ocicontrolcenter/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-ocicontrolcenter @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-ocicontrolcenter/src/main/resources/com/oracle/bmc/ocicontrolcenter/client.properties b/bmc-ocicontrolcenter/src/main/resources/com/oracle/bmc/ocicontrolcenter/client.properties index 8c3b0a05859..e0514386df7 100644 --- a/bmc-ocicontrolcenter/src/main/resources/com/oracle/bmc/ocicontrolcenter/client.properties +++ b/bmc-ocicontrolcenter/src/main/resources/com/oracle/bmc/ocicontrolcenter/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230515") \ No newline at end of file diff --git a/bmc-ocvp/pom.xml b/bmc-ocvp/pom.xml index 07f7cd38599..1d690285a18 100644 --- a/bmc-ocvp/pom.xml +++ b/bmc-ocvp/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-ocvp @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-ocvp/src/main/resources/com/oracle/bmc/ocvp/client.properties b/bmc-ocvp/src/main/resources/com/oracle/bmc/ocvp/client.properties index a7f3255669f..6259767d966 100644 --- a/bmc-ocvp/src/main/resources/com/oracle/bmc/ocvp/client.properties +++ b/bmc-ocvp/src/main/resources/com/oracle/bmc/ocvp/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230701") \ No newline at end of file diff --git a/bmc-oda/pom.xml b/bmc-oda/pom.xml index 5cf4c00a407..9b63687a797 100644 --- a/bmc-oda/pom.xml +++ b/bmc-oda/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-oda @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-oda/src/main/resources/com/oracle/bmc/oda/client.properties b/bmc-oda/src/main/resources/com/oracle/bmc/oda/client.properties index a677a8b0fcd..8c1e88ea3fd 100644 --- a/bmc-oda/src/main/resources/com/oracle/bmc/oda/client.properties +++ b/bmc-oda/src/main/resources/com/oracle/bmc/oda/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190506") \ No newline at end of file diff --git a/bmc-onesubscription/pom.xml b/bmc-onesubscription/pom.xml index 82bdaa080e8..e8fa4dd1726 100644 --- a/bmc-onesubscription/pom.xml +++ b/bmc-onesubscription/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-onesubscription @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-onesubscription/src/main/resources/com/oracle/bmc/onesubscription/client.properties b/bmc-onesubscription/src/main/resources/com/oracle/bmc/onesubscription/client.properties index 19e835c2771..f690db42340 100644 --- a/bmc-onesubscription/src/main/resources/com/oracle/bmc/onesubscription/client.properties +++ b/bmc-onesubscription/src/main/resources/com/oracle/bmc/onesubscription/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190111") \ No newline at end of file diff --git a/bmc-ons/pom.xml b/bmc-ons/pom.xml index cac185063ad..8496c4e144d 100644 --- a/bmc-ons/pom.xml +++ b/bmc-ons/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-ons @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-ons/src/main/resources/com/oracle/bmc/ons/client.properties b/bmc-ons/src/main/resources/com/oracle/bmc/ons/client.properties index f5c0d9ad84f..758eca6b499 100644 --- a/bmc-ons/src/main/resources/com/oracle/bmc/ons/client.properties +++ b/bmc-ons/src/main/resources/com/oracle/bmc/ons/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181201") \ No newline at end of file diff --git a/bmc-opa/pom.xml b/bmc-opa/pom.xml index 0a2c958cb4d..3ae3cf4b50a 100644 --- a/bmc-opa/pom.xml +++ b/bmc-opa/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-opa @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-opa/src/main/resources/com/oracle/bmc/opa/client.properties b/bmc-opa/src/main/resources/com/oracle/bmc/opa/client.properties index ce3105db7b0..c98cf745854 100644 --- a/bmc-opa/src/main/resources/com/oracle/bmc/opa/client.properties +++ b/bmc-opa/src/main/resources/com/oracle/bmc/opa/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210621") \ No newline at end of file diff --git a/bmc-opensearch/pom.xml b/bmc-opensearch/pom.xml index 8702ea18279..833f8d3ed22 100644 --- a/bmc-opensearch/pom.xml +++ b/bmc-opensearch/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-opensearch @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-opensearch/src/main/resources/com/oracle/bmc/opensearch/client.properties b/bmc-opensearch/src/main/resources/com/oracle/bmc/opensearch/client.properties index 3b22546b248..af810c91a9f 100644 --- a/bmc-opensearch/src/main/resources/com/oracle/bmc/opensearch/client.properties +++ b/bmc-opensearch/src/main/resources/com/oracle/bmc/opensearch/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180828") \ No newline at end of file diff --git a/bmc-operatoraccesscontrol/pom.xml b/bmc-operatoraccesscontrol/pom.xml index 9eca3a1829d..3b0c610ef11 100644 --- a/bmc-operatoraccesscontrol/pom.xml +++ b/bmc-operatoraccesscontrol/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-operatoraccesscontrol @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/AccessRequestsAsyncClient.java b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/AccessRequestsAsyncClient.java index 6c7dcaff278..e21e12f64ad 100644 --- a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/AccessRequestsAsyncClient.java +++ b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/AccessRequestsAsyncClient.java @@ -110,10 +110,7 @@ public java.util.concurrent.Future approveAccessRe return clientCall(request, ApproveAccessRequestResponse::builder) .logger(LOG, "approveAccessRequest") - .serviceDetails( - "AccessRequests", - "ApproveAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ApproveAccessRequest") + .serviceDetails("AccessRequests", "ApproveAccessRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ApproveAccessRequestRequest::builder) .basePath("/20200630") @@ -145,10 +142,7 @@ public java.util.concurrent.Future getAccessRequest( return clientCall(request, GetAccessRequestResponse::builder) .logger(LOG, "getAccessRequest") - .serviceDetails( - "AccessRequests", - "GetAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/GetAccessRequest") + .serviceDetails("AccessRequests", "GetAccessRequest", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetAccessRequestRequest::builder) .basePath("/20200630") @@ -175,10 +169,7 @@ public java.util.concurrent.Future getAuditLogReport( return clientCall(request, GetAuditLogReportResponse::builder) .logger(LOG, "getAuditLogReport") - .serviceDetails( - "AccessRequests", - "GetAuditLogReport", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AuditLogReport/GetAuditLogReport") + .serviceDetails("AccessRequests", "GetAuditLogReport", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetAuditLogReportRequest::builder) .basePath("/20200630") @@ -209,10 +200,7 @@ public java.util.concurrent.Future interactionReques return clientCall(request, InteractionRequestResponse::builder) .logger(LOG, "interactionRequest") - .serviceDetails( - "AccessRequests", - "InteractionRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/InteractionRequest") + .serviceDetails("AccessRequests", "InteractionRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(InteractionRequestRequest::builder) .basePath("/20200630") @@ -247,10 +235,7 @@ public java.util.concurrent.Future interactionReques return clientCall(request, ListAccessRequestHistoriesResponse::builder) .logger(LOG, "listAccessRequestHistories") - .serviceDetails( - "AccessRequests", - "ListAccessRequestHistories", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListAccessRequestHistories") + .serviceDetails("AccessRequests", "ListAccessRequestHistories", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListAccessRequestHistoriesRequest::builder) .basePath("/20200630") @@ -282,10 +267,7 @@ public java.util.concurrent.Future listAccessRequest return clientCall(request, ListAccessRequestsResponse::builder) .logger(LOG, "listAccessRequests") - .serviceDetails( - "AccessRequests", - "ListAccessRequests", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListAccessRequests") + .serviceDetails("AccessRequests", "ListAccessRequests", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListAccessRequestsRequest::builder) .basePath("/20200630") @@ -323,10 +305,7 @@ public java.util.concurrent.Future listInteractions( return clientCall(request, ListInteractionsResponse::builder) .logger(LOG, "listInteractions") - .serviceDetails( - "AccessRequests", - "ListInteractions", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListInteractions") + .serviceDetails("AccessRequests", "ListInteractions", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListInteractionsRequest::builder) .basePath("/20200630") @@ -360,10 +339,7 @@ public java.util.concurrent.Future rejectAccessRequ return clientCall(request, RejectAccessRequestResponse::builder) .logger(LOG, "rejectAccessRequest") - .serviceDetails( - "AccessRequests", - "RejectAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/RejectAccessRequest") + .serviceDetails("AccessRequests", "RejectAccessRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(RejectAccessRequestRequest::builder) .basePath("/20200630") @@ -397,10 +373,7 @@ public java.util.concurrent.Future reviewAccessRequ return clientCall(request, ReviewAccessRequestResponse::builder) .logger(LOG, "reviewAccessRequest") - .serviceDetails( - "AccessRequests", - "ReviewAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ReviewAccessRequest") + .serviceDetails("AccessRequests", "ReviewAccessRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ReviewAccessRequestRequest::builder) .basePath("/20200630") @@ -435,10 +408,7 @@ public java.util.concurrent.Future revokeAccessRequ return clientCall(request, RevokeAccessRequestResponse::builder) .logger(LOG, "revokeAccessRequest") - .serviceDetails( - "AccessRequests", - "RevokeAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/RevokeAccessRequest") + .serviceDetails("AccessRequests", "RevokeAccessRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(RevokeAccessRequestRequest::builder) .basePath("/20200630") diff --git a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/AccessRequestsClient.java b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/AccessRequestsClient.java index c161ad0bdff..e066cc71918 100644 --- a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/AccessRequestsClient.java +++ b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/AccessRequestsClient.java @@ -133,10 +133,7 @@ public ApproveAccessRequestResponse approveAccessRequest(ApproveAccessRequestReq return clientCall(request, ApproveAccessRequestResponse::builder) .logger(LOG, "approveAccessRequest") - .serviceDetails( - "AccessRequests", - "ApproveAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ApproveAccessRequest") + .serviceDetails("AccessRequests", "ApproveAccessRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ApproveAccessRequestRequest::builder) .basePath("/20200630") @@ -165,10 +162,7 @@ public GetAccessRequestResponse getAccessRequest(GetAccessRequestRequest request return clientCall(request, GetAccessRequestResponse::builder) .logger(LOG, "getAccessRequest") - .serviceDetails( - "AccessRequests", - "GetAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/GetAccessRequest") + .serviceDetails("AccessRequests", "GetAccessRequest", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetAccessRequestRequest::builder) .basePath("/20200630") @@ -192,10 +186,7 @@ public GetAuditLogReportResponse getAuditLogReport(GetAuditLogReportRequest requ return clientCall(request, GetAuditLogReportResponse::builder) .logger(LOG, "getAuditLogReport") - .serviceDetails( - "AccessRequests", - "GetAuditLogReport", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AuditLogReport/GetAuditLogReport") + .serviceDetails("AccessRequests", "GetAuditLogReport", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetAuditLogReportRequest::builder) .basePath("/20200630") @@ -223,10 +214,7 @@ public InteractionRequestResponse interactionRequest(InteractionRequestRequest r return clientCall(request, InteractionRequestResponse::builder) .logger(LOG, "interactionRequest") - .serviceDetails( - "AccessRequests", - "InteractionRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/InteractionRequest") + .serviceDetails("AccessRequests", "InteractionRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(InteractionRequestRequest::builder) .basePath("/20200630") @@ -257,10 +245,7 @@ public ListAccessRequestHistoriesResponse listAccessRequestHistories( return clientCall(request, ListAccessRequestHistoriesResponse::builder) .logger(LOG, "listAccessRequestHistories") - .serviceDetails( - "AccessRequests", - "ListAccessRequestHistories", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListAccessRequestHistories") + .serviceDetails("AccessRequests", "ListAccessRequestHistories", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListAccessRequestHistoriesRequest::builder) .basePath("/20200630") @@ -289,10 +274,7 @@ public ListAccessRequestsResponse listAccessRequests(ListAccessRequestsRequest r return clientCall(request, ListAccessRequestsResponse::builder) .logger(LOG, "listAccessRequests") - .serviceDetails( - "AccessRequests", - "ListAccessRequests", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListAccessRequests") + .serviceDetails("AccessRequests", "ListAccessRequests", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListAccessRequestsRequest::builder) .basePath("/20200630") @@ -327,10 +309,7 @@ public ListInteractionsResponse listInteractions(ListInteractionsRequest request return clientCall(request, ListInteractionsResponse::builder) .logger(LOG, "listInteractions") - .serviceDetails( - "AccessRequests", - "ListInteractions", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListInteractions") + .serviceDetails("AccessRequests", "ListInteractions", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListInteractionsRequest::builder) .basePath("/20200630") @@ -361,10 +340,7 @@ public RejectAccessRequestResponse rejectAccessRequest(RejectAccessRequestReques return clientCall(request, RejectAccessRequestResponse::builder) .logger(LOG, "rejectAccessRequest") - .serviceDetails( - "AccessRequests", - "RejectAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/RejectAccessRequest") + .serviceDetails("AccessRequests", "RejectAccessRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(RejectAccessRequestRequest::builder) .basePath("/20200630") @@ -395,10 +371,7 @@ public ReviewAccessRequestResponse reviewAccessRequest(ReviewAccessRequestReques return clientCall(request, ReviewAccessRequestResponse::builder) .logger(LOG, "reviewAccessRequest") - .serviceDetails( - "AccessRequests", - "ReviewAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ReviewAccessRequest") + .serviceDetails("AccessRequests", "ReviewAccessRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ReviewAccessRequestRequest::builder) .basePath("/20200630") @@ -430,10 +403,7 @@ public RevokeAccessRequestResponse revokeAccessRequest(RevokeAccessRequestReques return clientCall(request, RevokeAccessRequestResponse::builder) .logger(LOG, "revokeAccessRequest") - .serviceDetails( - "AccessRequests", - "RevokeAccessRequest", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/RevokeAccessRequest") + .serviceDetails("AccessRequests", "RevokeAccessRequest", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(RevokeAccessRequestRequest::builder) .basePath("/20200630") diff --git a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorActionsAsyncClient.java b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorActionsAsyncClient.java index 8396465a102..084f112e0db 100644 --- a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorActionsAsyncClient.java +++ b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorActionsAsyncClient.java @@ -107,10 +107,7 @@ public java.util.concurrent.Future getOperatorAction( return clientCall(request, GetOperatorActionResponse::builder) .logger(LOG, "getOperatorAction") - .serviceDetails( - "OperatorActions", - "GetOperatorAction", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorAction/GetOperatorAction") + .serviceDetails("OperatorActions", "GetOperatorAction", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetOperatorActionRequest::builder) .basePath("/20200630") @@ -136,10 +133,7 @@ public java.util.concurrent.Future listOperatorActi return clientCall(request, ListOperatorActionsResponse::builder) .logger(LOG, "listOperatorActions") - .serviceDetails( - "OperatorActions", - "ListOperatorActions", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorAction/ListOperatorActions") + .serviceDetails("OperatorActions", "ListOperatorActions", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListOperatorActionsRequest::builder) .basePath("/20200630") diff --git a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorActionsClient.java b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorActionsClient.java index cc6f5c969c7..2ff56813e74 100644 --- a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorActionsClient.java +++ b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorActionsClient.java @@ -96,10 +96,7 @@ public GetOperatorActionResponse getOperatorAction(GetOperatorActionRequest requ return clientCall(request, GetOperatorActionResponse::builder) .logger(LOG, "getOperatorAction") - .serviceDetails( - "OperatorActions", - "GetOperatorAction", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorAction/GetOperatorAction") + .serviceDetails("OperatorActions", "GetOperatorAction", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetOperatorActionRequest::builder) .basePath("/20200630") @@ -122,10 +119,7 @@ public ListOperatorActionsResponse listOperatorActions(ListOperatorActionsReques return clientCall(request, ListOperatorActionsResponse::builder) .logger(LOG, "listOperatorActions") - .serviceDetails( - "OperatorActions", - "ListOperatorActions", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorAction/ListOperatorActions") + .serviceDetails("OperatorActions", "ListOperatorActions", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListOperatorActionsRequest::builder) .basePath("/20200630") diff --git a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAssignmentAsyncClient.java b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAssignmentAsyncClient.java index af901221fbc..f5ffaed1170 100644 --- a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAssignmentAsyncClient.java +++ b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAssignmentAsyncClient.java @@ -118,7 +118,7 @@ public void setRegion(String regionId) { .serviceDetails( "OperatorControlAssignment", "ChangeOperatorControlAssignmentCompartment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ChangeOperatorControlAssignmentCompartment") + "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ChangeOperatorControlAssignmentCompartmentRequest::builder) .basePath("/20200630") @@ -151,10 +151,7 @@ public void setRegion(String regionId) { return clientCall(request, CreateOperatorControlAssignmentResponse::builder) .logger(LOG, "createOperatorControlAssignment") - .serviceDetails( - "OperatorControlAssignment", - "CreateOperatorControlAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/CreateOperatorControlAssignment") + .serviceDetails("OperatorControlAssignment", "CreateOperatorControlAssignment", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateOperatorControlAssignmentRequest::builder) .basePath("/20200630") @@ -192,10 +189,7 @@ public void setRegion(String regionId) { return clientCall(request, DeleteOperatorControlAssignmentResponse::builder) .logger(LOG, "deleteOperatorControlAssignment") - .serviceDetails( - "OperatorControlAssignment", - "DeleteOperatorControlAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/DeleteOperatorControlAssignment") + .serviceDetails("OperatorControlAssignment", "DeleteOperatorControlAssignment", "") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteOperatorControlAssignmentRequest::builder) .basePath("/20200630") @@ -226,10 +220,7 @@ public void setRegion(String regionId) { return clientCall(request, GetAssignmentValidationStatusResponse::builder) .logger(LOG, "getAssignmentValidationStatus") - .serviceDetails( - "OperatorControlAssignment", - "GetAssignmentValidationStatus", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/GetAssignmentValidationStatus") + .serviceDetails("OperatorControlAssignment", "GetAssignmentValidationStatus", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetAssignmentValidationStatusRequest::builder) .basePath("/20200630") @@ -265,10 +256,7 @@ public void setRegion(String regionId) { return clientCall(request, GetOperatorControlAssignmentResponse::builder) .logger(LOG, "getOperatorControlAssignment") - .serviceDetails( - "OperatorControlAssignment", - "GetOperatorControlAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/GetOperatorControlAssignment") + .serviceDetails("OperatorControlAssignment", "GetOperatorControlAssignment", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetOperatorControlAssignmentRequest::builder) .basePath("/20200630") @@ -299,10 +287,7 @@ public void setRegion(String regionId) { return clientCall(request, ListOperatorControlAssignmentsResponse::builder) .logger(LOG, "listOperatorControlAssignments") - .serviceDetails( - "OperatorControlAssignment", - "ListOperatorControlAssignments", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ListOperatorControlAssignments") + .serviceDetails("OperatorControlAssignment", "ListOperatorControlAssignments", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListOperatorControlAssignmentsRequest::builder) .basePath("/20200630") @@ -350,10 +335,7 @@ public void setRegion(String regionId) { return clientCall(request, UpdateOperatorControlAssignmentResponse::builder) .logger(LOG, "updateOperatorControlAssignment") - .serviceDetails( - "OperatorControlAssignment", - "UpdateOperatorControlAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/UpdateOperatorControlAssignment") + .serviceDetails("OperatorControlAssignment", "UpdateOperatorControlAssignment", "") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateOperatorControlAssignmentRequest::builder) .basePath("/20200630") @@ -392,10 +374,7 @@ public void setRegion(String regionId) { return clientCall(request, ValidateOperatorAssignmentResponse::builder) .logger(LOG, "validateOperatorAssignment") - .serviceDetails( - "OperatorControlAssignment", - "ValidateOperatorAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ValidateOperatorAssignment") + .serviceDetails("OperatorControlAssignment", "ValidateOperatorAssignment", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ValidateOperatorAssignmentRequest::builder) .basePath("/20200630") diff --git a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAssignmentClient.java b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAssignmentClient.java index efc7303a977..fa2610457bf 100644 --- a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAssignmentClient.java +++ b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAssignmentClient.java @@ -142,7 +142,7 @@ public void setRegion(String regionId) { .serviceDetails( "OperatorControlAssignment", "ChangeOperatorControlAssignmentCompartment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ChangeOperatorControlAssignmentCompartment") + "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ChangeOperatorControlAssignmentCompartmentRequest::builder) .basePath("/20200630") @@ -171,10 +171,7 @@ public CreateOperatorControlAssignmentResponse createOperatorControlAssignment( return clientCall(request, CreateOperatorControlAssignmentResponse::builder) .logger(LOG, "createOperatorControlAssignment") - .serviceDetails( - "OperatorControlAssignment", - "CreateOperatorControlAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/CreateOperatorControlAssignment") + .serviceDetails("OperatorControlAssignment", "CreateOperatorControlAssignment", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateOperatorControlAssignmentRequest::builder) .basePath("/20200630") @@ -208,10 +205,7 @@ public DeleteOperatorControlAssignmentResponse deleteOperatorControlAssignment( return clientCall(request, DeleteOperatorControlAssignmentResponse::builder) .logger(LOG, "deleteOperatorControlAssignment") - .serviceDetails( - "OperatorControlAssignment", - "DeleteOperatorControlAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/DeleteOperatorControlAssignment") + .serviceDetails("OperatorControlAssignment", "DeleteOperatorControlAssignment", "") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteOperatorControlAssignmentRequest::builder) .basePath("/20200630") @@ -238,10 +232,7 @@ public GetAssignmentValidationStatusResponse getAssignmentValidationStatus( return clientCall(request, GetAssignmentValidationStatusResponse::builder) .logger(LOG, "getAssignmentValidationStatus") - .serviceDetails( - "OperatorControlAssignment", - "GetAssignmentValidationStatus", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/GetAssignmentValidationStatus") + .serviceDetails("OperatorControlAssignment", "GetAssignmentValidationStatus", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetAssignmentValidationStatusRequest::builder) .basePath("/20200630") @@ -273,10 +264,7 @@ public GetOperatorControlAssignmentResponse getOperatorControlAssignment( return clientCall(request, GetOperatorControlAssignmentResponse::builder) .logger(LOG, "getOperatorControlAssignment") - .serviceDetails( - "OperatorControlAssignment", - "GetOperatorControlAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/GetOperatorControlAssignment") + .serviceDetails("OperatorControlAssignment", "GetOperatorControlAssignment", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetOperatorControlAssignmentRequest::builder) .basePath("/20200630") @@ -303,10 +291,7 @@ public ListOperatorControlAssignmentsResponse listOperatorControlAssignments( return clientCall(request, ListOperatorControlAssignmentsResponse::builder) .logger(LOG, "listOperatorControlAssignments") - .serviceDetails( - "OperatorControlAssignment", - "ListOperatorControlAssignments", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ListOperatorControlAssignments") + .serviceDetails("OperatorControlAssignment", "ListOperatorControlAssignments", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListOperatorControlAssignmentsRequest::builder) .basePath("/20200630") @@ -350,10 +335,7 @@ public UpdateOperatorControlAssignmentResponse updateOperatorControlAssignment( return clientCall(request, UpdateOperatorControlAssignmentResponse::builder) .logger(LOG, "updateOperatorControlAssignment") - .serviceDetails( - "OperatorControlAssignment", - "UpdateOperatorControlAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/UpdateOperatorControlAssignment") + .serviceDetails("OperatorControlAssignment", "UpdateOperatorControlAssignment", "") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateOperatorControlAssignmentRequest::builder) .basePath("/20200630") @@ -388,10 +370,7 @@ public ValidateOperatorAssignmentResponse validateOperatorAssignment( return clientCall(request, ValidateOperatorAssignmentResponse::builder) .logger(LOG, "validateOperatorAssignment") - .serviceDetails( - "OperatorControlAssignment", - "ValidateOperatorAssignment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ValidateOperatorAssignment") + .serviceDetails("OperatorControlAssignment", "ValidateOperatorAssignment", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ValidateOperatorAssignmentRequest::builder) .basePath("/20200630") diff --git a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAsyncClient.java b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAsyncClient.java index 92e89bbd00e..99c79f6bb09 100644 --- a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAsyncClient.java +++ b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlAsyncClient.java @@ -112,10 +112,7 @@ public void setRegion(String regionId) { return clientCall(request, ChangeOperatorControlCompartmentResponse::builder) .logger(LOG, "changeOperatorControlCompartment") - .serviceDetails( - "OperatorControl", - "ChangeOperatorControlCompartment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/ChangeOperatorControlCompartment") + .serviceDetails("OperatorControl", "ChangeOperatorControlCompartment", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ChangeOperatorControlCompartmentRequest::builder) .basePath("/20200630") @@ -146,10 +143,7 @@ public java.util.concurrent.Future createOperator return clientCall(request, CreateOperatorControlResponse::builder) .logger(LOG, "createOperatorControl") - .serviceDetails( - "OperatorControl", - "CreateOperatorControl", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/CreateOperatorControl") + .serviceDetails("OperatorControl", "CreateOperatorControl", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateOperatorControlRequest::builder) .basePath("/20200630") @@ -178,10 +172,7 @@ public java.util.concurrent.Future deleteOperator return clientCall(request, DeleteOperatorControlResponse::builder) .logger(LOG, "deleteOperatorControl") - .serviceDetails( - "OperatorControl", - "DeleteOperatorControl", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/DeleteOperatorControl") + .serviceDetails("OperatorControl", "DeleteOperatorControl", "") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteOperatorControlRequest::builder) .basePath("/20200630") @@ -207,10 +198,7 @@ public java.util.concurrent.Future getOperatorContro return clientCall(request, GetOperatorControlResponse::builder) .logger(LOG, "getOperatorControl") - .serviceDetails( - "OperatorControl", - "GetOperatorControl", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/GetOperatorControl") + .serviceDetails("OperatorControl", "GetOperatorControl", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetOperatorControlRequest::builder) .basePath("/20200630") @@ -237,10 +225,7 @@ public java.util.concurrent.Future listOperatorCon return clientCall(request, ListOperatorControlsResponse::builder) .logger(LOG, "listOperatorControls") - .serviceDetails( - "OperatorControl", - "ListOperatorControls", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/ListOperatorControls") + .serviceDetails("OperatorControl", "ListOperatorControls", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListOperatorControlsRequest::builder) .basePath("/20200630") @@ -279,10 +264,7 @@ public java.util.concurrent.Future updateOperator return clientCall(request, UpdateOperatorControlResponse::builder) .logger(LOG, "updateOperatorControl") - .serviceDetails( - "OperatorControl", - "UpdateOperatorControl", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/UpdateOperatorControl") + .serviceDetails("OperatorControl", "UpdateOperatorControl", "") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateOperatorControlRequest::builder) .basePath("/20200630") diff --git a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlClient.java b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlClient.java index 649b95c55de..bf667b8e608 100644 --- a/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlClient.java +++ b/bmc-operatoraccesscontrol/src/main/java/com/oracle/bmc/operatoraccesscontrol/OperatorControlClient.java @@ -134,10 +134,7 @@ public ChangeOperatorControlCompartmentResponse changeOperatorControlCompartment return clientCall(request, ChangeOperatorControlCompartmentResponse::builder) .logger(LOG, "changeOperatorControlCompartment") - .serviceDetails( - "OperatorControl", - "ChangeOperatorControlCompartment", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/ChangeOperatorControlCompartment") + .serviceDetails("OperatorControl", "ChangeOperatorControlCompartment", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ChangeOperatorControlCompartmentRequest::builder) .basePath("/20200630") @@ -166,10 +163,7 @@ public CreateOperatorControlResponse createOperatorControl( return clientCall(request, CreateOperatorControlResponse::builder) .logger(LOG, "createOperatorControl") - .serviceDetails( - "OperatorControl", - "CreateOperatorControl", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/CreateOperatorControl") + .serviceDetails("OperatorControl", "CreateOperatorControl", "") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateOperatorControlRequest::builder) .basePath("/20200630") @@ -196,10 +190,7 @@ public DeleteOperatorControlResponse deleteOperatorControl( return clientCall(request, DeleteOperatorControlResponse::builder) .logger(LOG, "deleteOperatorControl") - .serviceDetails( - "OperatorControl", - "DeleteOperatorControl", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/DeleteOperatorControl") + .serviceDetails("OperatorControl", "DeleteOperatorControl", "") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteOperatorControlRequest::builder) .basePath("/20200630") @@ -222,10 +213,7 @@ public GetOperatorControlResponse getOperatorControl(GetOperatorControlRequest r return clientCall(request, GetOperatorControlResponse::builder) .logger(LOG, "getOperatorControl") - .serviceDetails( - "OperatorControl", - "GetOperatorControl", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/GetOperatorControl") + .serviceDetails("OperatorControl", "GetOperatorControl", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetOperatorControlRequest::builder) .basePath("/20200630") @@ -249,10 +237,7 @@ public ListOperatorControlsResponse listOperatorControls(ListOperatorControlsReq return clientCall(request, ListOperatorControlsResponse::builder) .logger(LOG, "listOperatorControls") - .serviceDetails( - "OperatorControl", - "ListOperatorControls", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/ListOperatorControls") + .serviceDetails("OperatorControl", "ListOperatorControls", "") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListOperatorControlsRequest::builder) .basePath("/20200630") @@ -289,10 +274,7 @@ public UpdateOperatorControlResponse updateOperatorControl( return clientCall(request, UpdateOperatorControlResponse::builder) .logger(LOG, "updateOperatorControl") - .serviceDetails( - "OperatorControl", - "UpdateOperatorControl", - "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/UpdateOperatorControl") + .serviceDetails("OperatorControl", "UpdateOperatorControl", "") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateOperatorControlRequest::builder) .basePath("/20200630") diff --git a/bmc-operatoraccesscontrol/src/main/resources/com/oracle/bmc/operatoraccesscontrol/client.properties b/bmc-operatoraccesscontrol/src/main/resources/com/oracle/bmc/operatoraccesscontrol/client.properties index 8422301a9f6..92396da4c78 100644 --- a/bmc-operatoraccesscontrol/src/main/resources/com/oracle/bmc/operatoraccesscontrol/client.properties +++ b/bmc-operatoraccesscontrol/src/main/resources/com/oracle/bmc/operatoraccesscontrol/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200630") \ No newline at end of file diff --git a/bmc-opsi/pom.xml b/bmc-opsi/pom.xml index 659cfe0fcff..1febe516297 100644 --- a/bmc-opsi/pom.xml +++ b/bmc-opsi/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-opsi @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-opsi/src/main/resources/com/oracle/bmc/opsi/client.properties b/bmc-opsi/src/main/resources/com/oracle/bmc/opsi/client.properties index 8422301a9f6..92396da4c78 100644 --- a/bmc-opsi/src/main/resources/com/oracle/bmc/opsi/client.properties +++ b/bmc-opsi/src/main/resources/com/oracle/bmc/opsi/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200630") \ No newline at end of file diff --git a/bmc-optimizer/pom.xml b/bmc-optimizer/pom.xml index 13705581389..c8d5df8571e 100644 --- a/bmc-optimizer/pom.xml +++ b/bmc-optimizer/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-optimizer @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-optimizer/src/main/resources/com/oracle/bmc/optimizer/client.properties b/bmc-optimizer/src/main/resources/com/oracle/bmc/optimizer/client.properties index 9249c7171e3..35f1a085a7d 100644 --- a/bmc-optimizer/src/main/resources/com/oracle/bmc/optimizer/client.properties +++ b/bmc-optimizer/src/main/resources/com/oracle/bmc/optimizer/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200606") \ No newline at end of file diff --git a/bmc-osmanagement/pom.xml b/bmc-osmanagement/pom.xml index cc3bd2e3da9..5888ca4c6f6 100644 --- a/bmc-osmanagement/pom.xml +++ b/bmc-osmanagement/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-osmanagement @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-osmanagement/src/main/resources/com/oracle/bmc/osmanagement/client.properties b/bmc-osmanagement/src/main/resources/com/oracle/bmc/osmanagement/client.properties index cd3615def24..d173f98f5f6 100644 --- a/bmc-osmanagement/src/main/resources/com/oracle/bmc/osmanagement/client.properties +++ b/bmc-osmanagement/src/main/resources/com/oracle/bmc/osmanagement/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190801") \ No newline at end of file diff --git a/bmc-osmanagementhub/pom.xml b/bmc-osmanagementhub/pom.xml index 0bcc6729ed0..c62cc9ec74a 100644 --- a/bmc-osmanagementhub/pom.xml +++ b/bmc-osmanagementhub/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-osmanagementhub @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-osmanagementhub/src/main/resources/com/oracle/bmc/osmanagementhub/client.properties b/bmc-osmanagementhub/src/main/resources/com/oracle/bmc/osmanagementhub/client.properties index af491a0f663..ae6e87ee56c 100644 --- a/bmc-osmanagementhub/src/main/resources/com/oracle/bmc/osmanagementhub/client.properties +++ b/bmc-osmanagementhub/src/main/resources/com/oracle/bmc/osmanagementhub/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220901") \ No newline at end of file diff --git a/bmc-ospgateway/pom.xml b/bmc-ospgateway/pom.xml index 566be2c3d63..7d87a5a20b7 100644 --- a/bmc-ospgateway/pom.xml +++ b/bmc-ospgateway/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-ospgateway @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-ospgateway/src/main/resources/com/oracle/bmc/ospgateway/client.properties b/bmc-ospgateway/src/main/resources/com/oracle/bmc/ospgateway/client.properties index a91f0ff7992..5001026a712 100644 --- a/bmc-ospgateway/src/main/resources/com/oracle/bmc/ospgateway/client.properties +++ b/bmc-ospgateway/src/main/resources/com/oracle/bmc/ospgateway/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20191001") \ No newline at end of file diff --git a/bmc-osubbillingschedule/pom.xml b/bmc-osubbillingschedule/pom.xml index ca3ec80cddd..c035ca12391 100644 --- a/bmc-osubbillingschedule/pom.xml +++ b/bmc-osubbillingschedule/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-osubbillingschedule @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-osubbillingschedule/src/main/resources/com/oracle/bmc/osubbillingschedule/client.properties b/bmc-osubbillingschedule/src/main/resources/com/oracle/bmc/osubbillingschedule/client.properties index b715816c5b8..b53d22ddd98 100644 --- a/bmc-osubbillingschedule/src/main/resources/com/oracle/bmc/osubbillingschedule/client.properties +++ b/bmc-osubbillingschedule/src/main/resources/com/oracle/bmc/osubbillingschedule/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210501") \ No newline at end of file diff --git a/bmc-osuborganizationsubscription/pom.xml b/bmc-osuborganizationsubscription/pom.xml index c9a7001cb6b..3c015069586 100644 --- a/bmc-osuborganizationsubscription/pom.xml +++ b/bmc-osuborganizationsubscription/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-osuborganizationsubscription @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-osuborganizationsubscription/src/main/resources/com/oracle/bmc/osuborganizationsubscription/client.properties b/bmc-osuborganizationsubscription/src/main/resources/com/oracle/bmc/osuborganizationsubscription/client.properties index b715816c5b8..b53d22ddd98 100644 --- a/bmc-osuborganizationsubscription/src/main/resources/com/oracle/bmc/osuborganizationsubscription/client.properties +++ b/bmc-osuborganizationsubscription/src/main/resources/com/oracle/bmc/osuborganizationsubscription/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210501") \ No newline at end of file diff --git a/bmc-osubsubscription/pom.xml b/bmc-osubsubscription/pom.xml index f771d207da6..73ff09ca34a 100644 --- a/bmc-osubsubscription/pom.xml +++ b/bmc-osubsubscription/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-osubsubscription @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-osubsubscription/src/main/resources/com/oracle/bmc/osubsubscription/client.properties b/bmc-osubsubscription/src/main/resources/com/oracle/bmc/osubsubscription/client.properties index b715816c5b8..b53d22ddd98 100644 --- a/bmc-osubsubscription/src/main/resources/com/oracle/bmc/osubsubscription/client.properties +++ b/bmc-osubsubscription/src/main/resources/com/oracle/bmc/osubsubscription/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210501") \ No newline at end of file diff --git a/bmc-osubusage/pom.xml b/bmc-osubusage/pom.xml index 7eef8dc76c9..d1575fde3ff 100644 --- a/bmc-osubusage/pom.xml +++ b/bmc-osubusage/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-osubusage @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-osubusage/src/main/resources/com/oracle/bmc/osubusage/client.properties b/bmc-osubusage/src/main/resources/com/oracle/bmc/osubusage/client.properties index b715816c5b8..b53d22ddd98 100644 --- a/bmc-osubusage/src/main/resources/com/oracle/bmc/osubusage/client.properties +++ b/bmc-osubusage/src/main/resources/com/oracle/bmc/osubusage/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210501") \ No newline at end of file diff --git a/bmc-other-examples/bmc-jersey-examples/pom.xml b/bmc-other-examples/bmc-jersey-examples/pom.xml index 5513debce21..c5163bb7ab8 100644 --- a/bmc-other-examples/bmc-jersey-examples/pom.xml +++ b/bmc-other-examples/bmc-jersey-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oracle.oci.sdk oci-java-sdk-jersey-examples - 3.54.0 + 3.55.0 Oracle Cloud Infrastructure SDK - Examples using Jersey 2 HTTP client This project contains the examples on how to use the SDK used for Oracle Cloud Infrastructure with the Jersey 2 HTTP client https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm @@ -58,7 +58,7 @@ com.oracle.oci.sdk oci-java-sdk-enforcer-rules - 3.54.0 + 3.55.0 false @@ -95,14 +95,14 @@ com.oracle.oci.sdk oci-java-sdk-bom - 3.54.0 + 3.55.0 pom import com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 pom import diff --git a/bmc-other-examples/bmc-jersey3-examples/pom.xml b/bmc-other-examples/bmc-jersey3-examples/pom.xml index 638bed59a52..a7c2eed9b46 100644 --- a/bmc-other-examples/bmc-jersey3-examples/pom.xml +++ b/bmc-other-examples/bmc-jersey3-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oracle.oci.sdk oci-java-sdk-jersey3-examples - 3.54.0 + 3.55.0 Oracle Cloud Infrastructure SDK - Examples using Jersey 3 HTTP client This project contains the examples on how to use the SDK used for Oracle Cloud Infrastructure with the Jersey 3 HTTP client https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm @@ -58,7 +58,7 @@ com.oracle.oci.sdk oci-java-sdk-enforcer-rules - 3.54.0 + 3.55.0 false @@ -95,14 +95,14 @@ com.oracle.oci.sdk oci-java-sdk-bom - 3.54.0 + 3.55.0 pom import com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey3 - 3.54.0 + 3.55.0 pom import diff --git a/bmc-other-examples/native-maven-example/pom.xml b/bmc-other-examples/native-maven-example/pom.xml index 7d5a96dbba2..ea0a7227cbe 100644 --- a/bmc-other-examples/native-maven-example/pom.xml +++ b/bmc-other-examples/native-maven-example/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oracle.oci.sdk oci-java-sdk-examples-native - 3.54.0 + 3.55.0 Oracle Cloud Infrastructure SDK - Native Example This project contains an example on how to use the SDK used for Oracle Cloud Infrastructure in a native executable https://docs.cloud.oracle.com/Content/API/SDKDocs/javasdk.htm @@ -98,14 +98,14 @@ com.oracle.oci.sdk oci-java-sdk-bom - 3.54.0 + 3.55.0 pom import com.oracle.oci.sdk oci-java-sdk-common-httpclient-jersey - 3.54.0 + 3.55.0 pom import diff --git a/bmc-other-examples/pom.xml b/bmc-other-examples/pom.xml index f0a3fab5023..d766bc951f3 100644 --- a/bmc-other-examples/pom.xml +++ b/bmc-other-examples/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml diff --git a/bmc-psql/pom.xml b/bmc-psql/pom.xml index d4c1f830908..3e16f6419e1 100644 --- a/bmc-psql/pom.xml +++ b/bmc-psql/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-psql @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-psql/src/main/resources/com/oracle/bmc/psql/client.properties b/bmc-psql/src/main/resources/com/oracle/bmc/psql/client.properties index 6f6990a28be..72c5a181475 100644 --- a/bmc-psql/src/main/resources/com/oracle/bmc/psql/client.properties +++ b/bmc-psql/src/main/resources/com/oracle/bmc/psql/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220915") \ No newline at end of file diff --git a/bmc-queue/pom.xml b/bmc-queue/pom.xml index 6ee704200b5..e5baf7bc95a 100644 --- a/bmc-queue/pom.xml +++ b/bmc-queue/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-queue @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-queue/src/main/resources/com/oracle/bmc/queue/client.properties b/bmc-queue/src/main/resources/com/oracle/bmc/queue/client.properties index dcbfe7d74a4..176ce716e7e 100644 --- a/bmc-queue/src/main/resources/com/oracle/bmc/queue/client.properties +++ b/bmc-queue/src/main/resources/com/oracle/bmc/queue/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210201") \ No newline at end of file diff --git a/bmc-recovery/pom.xml b/bmc-recovery/pom.xml index c5f79981e53..f404f04ba47 100644 --- a/bmc-recovery/pom.xml +++ b/bmc-recovery/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-recovery @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-recovery/src/main/resources/com/oracle/bmc/recovery/client.properties b/bmc-recovery/src/main/resources/com/oracle/bmc/recovery/client.properties index 9d59a94c623..23a613ed37c 100644 --- a/bmc-recovery/src/main/resources/com/oracle/bmc/recovery/client.properties +++ b/bmc-recovery/src/main/resources/com/oracle/bmc/recovery/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210216") \ No newline at end of file diff --git a/bmc-redis/pom.xml b/bmc-redis/pom.xml index 20e81b92e77..d38f2f8e1e3 100644 --- a/bmc-redis/pom.xml +++ b/bmc-redis/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-redis @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-redis/src/main/resources/com/oracle/bmc/redis/client.properties b/bmc-redis/src/main/resources/com/oracle/bmc/redis/client.properties index 298a493c8df..3b4d744d17d 100644 --- a/bmc-redis/src/main/resources/com/oracle/bmc/redis/client.properties +++ b/bmc-redis/src/main/resources/com/oracle/bmc/redis/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220315") \ No newline at end of file diff --git a/bmc-resourcemanager/pom.xml b/bmc-resourcemanager/pom.xml index f83063e6357..d77d85277c9 100644 --- a/bmc-resourcemanager/pom.xml +++ b/bmc-resourcemanager/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-resourcemanager @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-resourcemanager/src/main/resources/com/oracle/bmc/resourcemanager/client.properties b/bmc-resourcemanager/src/main/resources/com/oracle/bmc/resourcemanager/client.properties index e85fc9caad3..6904ac15ad3 100644 --- a/bmc-resourcemanager/src/main/resources/com/oracle/bmc/resourcemanager/client.properties +++ b/bmc-resourcemanager/src/main/resources/com/oracle/bmc/resourcemanager/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180917") \ No newline at end of file diff --git a/bmc-resourcescheduler/pom.xml b/bmc-resourcescheduler/pom.xml index 0c1a2e9efad..d187efc49a3 100644 --- a/bmc-resourcescheduler/pom.xml +++ b/bmc-resourcescheduler/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-resourcescheduler @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-resourcescheduler/src/main/resources/com/oracle/bmc/resourcescheduler/client.properties b/bmc-resourcescheduler/src/main/resources/com/oracle/bmc/resourcescheduler/client.properties index 50b50b22f0d..be82145b2f3 100644 --- a/bmc-resourcescheduler/src/main/resources/com/oracle/bmc/resourcescheduler/client.properties +++ b/bmc-resourcescheduler/src/main/resources/com/oracle/bmc/resourcescheduler/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20240430") \ No newline at end of file diff --git a/bmc-resourcesearch/pom.xml b/bmc-resourcesearch/pom.xml index e0793bbc922..5a932e90dd5 100644 --- a/bmc-resourcesearch/pom.xml +++ b/bmc-resourcesearch/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-resourcesearch @@ -16,7 +16,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-resourcesearch/src/main/resources/com/oracle/bmc/resourcesearch/client.properties b/bmc-resourcesearch/src/main/resources/com/oracle/bmc/resourcesearch/client.properties index f8cf461da7c..bcd1272cd23 100644 --- a/bmc-resourcesearch/src/main/resources/com/oracle/bmc/resourcesearch/client.properties +++ b/bmc-resourcesearch/src/main/resources/com/oracle/bmc/resourcesearch/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180409") \ No newline at end of file diff --git a/bmc-rover/pom.xml b/bmc-rover/pom.xml index fe56b4428c5..f80e031f184 100644 --- a/bmc-rover/pom.xml +++ b/bmc-rover/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-rover @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-rover/src/main/resources/com/oracle/bmc/rover/client.properties b/bmc-rover/src/main/resources/com/oracle/bmc/rover/client.properties index 6e811549955..4af2688876c 100644 --- a/bmc-rover/src/main/resources/com/oracle/bmc/rover/client.properties +++ b/bmc-rover/src/main/resources/com/oracle/bmc/rover/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20201210") \ No newline at end of file diff --git a/bmc-sch/pom.xml b/bmc-sch/pom.xml index c4d7c9e261b..28091542969 100644 --- a/bmc-sch/pom.xml +++ b/bmc-sch/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-sch @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-sch/src/main/resources/com/oracle/bmc/sch/client.properties b/bmc-sch/src/main/resources/com/oracle/bmc/sch/client.properties index 32c0e17bb9b..9514600a009 100644 --- a/bmc-sch/src/main/resources/com/oracle/bmc/sch/client.properties +++ b/bmc-sch/src/main/resources/com/oracle/bmc/sch/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200909") \ No newline at end of file diff --git a/bmc-secrets/pom.xml b/bmc-secrets/pom.xml index 6c9d26b9a94..3700f9b79a7 100644 --- a/bmc-secrets/pom.xml +++ b/bmc-secrets/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-secrets @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-secrets/src/main/resources/com/oracle/bmc/secrets/client.properties b/bmc-secrets/src/main/resources/com/oracle/bmc/secrets/client.properties index 8ca699e3d48..a72182bf518 100644 --- a/bmc-secrets/src/main/resources/com/oracle/bmc/secrets/client.properties +++ b/bmc-secrets/src/main/resources/com/oracle/bmc/secrets/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190301") \ No newline at end of file diff --git a/bmc-securityattribute/pom.xml b/bmc-securityattribute/pom.xml index c01f45794cd..2f86a112899 100644 --- a/bmc-securityattribute/pom.xml +++ b/bmc-securityattribute/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-securityattribute @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-securityattribute/src/main/java/com/oracle/bmc/securityattribute/SecurityAttributeAsyncClient.java b/bmc-securityattribute/src/main/java/com/oracle/bmc/securityattribute/SecurityAttributeAsyncClient.java index 173af4cd306..aa7dd7545d3 100644 --- a/bmc-securityattribute/src/main/java/com/oracle/bmc/securityattribute/SecurityAttributeAsyncClient.java +++ b/bmc-securityattribute/src/main/java/com/oracle/bmc/securityattribute/SecurityAttributeAsyncClient.java @@ -110,7 +110,10 @@ public void setRegion(String regionId) { return clientCall(request, BulkDeleteSecurityAttributesResponse::builder) .logger(LOG, "bulkDeleteSecurityAttributes") - .serviceDetails("SecurityAttribute", "BulkDeleteSecurityAttributes", "") + .serviceDetails( + "SecurityAttribute", + "BulkDeleteSecurityAttributes", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/BulkDeleteSecurityAttributes") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(BulkDeleteSecurityAttributesRequest::builder) .basePath("/20240815") @@ -141,7 +144,10 @@ public void setRegion(String regionId) { return clientCall(request, BulkEditSecurityAttributesResponse::builder) .logger(LOG, "bulkEditSecurityAttributes") - .serviceDetails("SecurityAttribute", "BulkEditSecurityAttributes", "") + .serviceDetails( + "SecurityAttribute", + "BulkEditSecurityAttributes", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/BulkEditSecurityAttributes") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(BulkEditSecurityAttributesRequest::builder) .basePath("/20240815") @@ -176,7 +182,9 @@ public void setRegion(String regionId) { return clientCall(request, CascadingDeleteSecurityAttributeNamespaceResponse::builder) .logger(LOG, "cascadingDeleteSecurityAttributeNamespace") .serviceDetails( - "SecurityAttribute", "CascadingDeleteSecurityAttributeNamespace", "") + "SecurityAttribute", + "CascadingDeleteSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/CascadingDeleteSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CascadingDeleteSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") @@ -216,7 +224,9 @@ public void setRegion(String regionId) { return clientCall(request, ChangeSecurityAttributeNamespaceCompartmentResponse::builder) .logger(LOG, "changeSecurityAttributeNamespaceCompartment") .serviceDetails( - "SecurityAttribute", "ChangeSecurityAttributeNamespaceCompartment", "") + "SecurityAttribute", + "ChangeSecurityAttributeNamespaceCompartment", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/ChangeSecurityAttributeNamespaceCompartment") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ChangeSecurityAttributeNamespaceCompartmentRequest::builder) .basePath("/20240815") @@ -251,7 +261,10 @@ public java.util.concurrent.Future createSecuri return clientCall(request, CreateSecurityAttributeResponse::builder) .logger(LOG, "createSecurityAttribute") - .serviceDetails("SecurityAttribute", "CreateSecurityAttribute", "") + .serviceDetails( + "SecurityAttribute", + "CreateSecurityAttribute", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/CreateSecurityAttribute") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateSecurityAttributeRequest::builder) .basePath("/20240815") @@ -285,7 +298,10 @@ public java.util.concurrent.Future createSecuri return clientCall(request, CreateSecurityAttributeNamespaceResponse::builder) .logger(LOG, "createSecurityAttributeNamespace") - .serviceDetails("SecurityAttribute", "CreateSecurityAttributeNamespace", "") + .serviceDetails( + "SecurityAttribute", + "CreateSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/CreateSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") @@ -322,7 +338,10 @@ public java.util.concurrent.Future deleteSecuri return clientCall(request, DeleteSecurityAttributeResponse::builder) .logger(LOG, "deleteSecurityAttribute") - .serviceDetails("SecurityAttribute", "DeleteSecurityAttribute", "") + .serviceDetails( + "SecurityAttribute", + "DeleteSecurityAttribute", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/DeleteSecurityAttribute") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteSecurityAttributeRequest::builder) .basePath("/20240815") @@ -357,7 +376,10 @@ public java.util.concurrent.Future deleteSecuri return clientCall(request, DeleteSecurityAttributeNamespaceResponse::builder) .logger(LOG, "deleteSecurityAttributeNamespace") - .serviceDetails("SecurityAttribute", "DeleteSecurityAttributeNamespace", "") + .serviceDetails( + "SecurityAttribute", + "DeleteSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/DeleteSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") @@ -389,7 +411,10 @@ public java.util.concurrent.Future getSecurityAttr return clientCall(request, GetSecurityAttributeResponse::builder) .logger(LOG, "getSecurityAttribute") - .serviceDetails("SecurityAttribute", "GetSecurityAttribute", "") + .serviceDetails( + "SecurityAttribute", + "GetSecurityAttribute", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/GetSecurityAttribute") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetSecurityAttributeRequest::builder) .basePath("/20240815") @@ -423,7 +448,10 @@ public java.util.concurrent.Future getSecurityAttr return clientCall(request, GetSecurityAttributeNamespaceResponse::builder) .logger(LOG, "getSecurityAttributeNamespace") - .serviceDetails("SecurityAttribute", "GetSecurityAttributeNamespace", "") + .serviceDetails( + "SecurityAttribute", + "GetSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/GetSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") @@ -455,7 +483,10 @@ public java.util.concurrent.Future getSecurityAttr return clientCall(request, GetSecurityAttributeWorkRequestResponse::builder) .logger(LOG, "getSecurityAttributeWorkRequest") - .serviceDetails("SecurityAttribute", "GetSecurityAttributeWorkRequest", "") + .serviceDetails( + "SecurityAttribute", + "GetSecurityAttributeWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeWorkRequest/GetSecurityAttributeWorkRequest") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetSecurityAttributeWorkRequestRequest::builder) .basePath("/20240815") @@ -486,7 +517,10 @@ public java.util.concurrent.Future getSecurityAttr return clientCall(request, ListSecurityAttributeNamespacesResponse::builder) .logger(LOG, "listSecurityAttributeNamespaces") - .serviceDetails("SecurityAttribute", "ListSecurityAttributeNamespaces", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributeNamespaces", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespaceSummary/ListSecurityAttributeNamespaces") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributeNamespacesRequest::builder) .basePath("/20240815") @@ -527,7 +561,10 @@ public java.util.concurrent.Future getSecurityAttr return clientCall(request, ListSecurityAttributeWorkRequestErrorsResponse::builder) .logger(LOG, "listSecurityAttributeWorkRequestErrors") - .serviceDetails("SecurityAttribute", "ListSecurityAttributeWorkRequestErrors", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributeWorkRequestErrors", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeWorkRequestErrorSummary/ListSecurityAttributeWorkRequestErrors") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributeWorkRequestErrorsRequest::builder) .basePath("/20240815") @@ -567,7 +604,10 @@ public java.util.concurrent.Future getSecurityAttr return clientCall(request, ListSecurityAttributeWorkRequestLogsResponse::builder) .logger(LOG, "listSecurityAttributeWorkRequestLogs") - .serviceDetails("SecurityAttribute", "ListSecurityAttributeWorkRequestLogs", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributeWorkRequestLogs", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeWorkRequestLogSummary/ListSecurityAttributeWorkRequestLogs") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributeWorkRequestLogsRequest::builder) .basePath("/20240815") @@ -605,7 +645,10 @@ public java.util.concurrent.Future getSecurityAttr return clientCall(request, ListSecurityAttributeWorkRequestsResponse::builder) .logger(LOG, "listSecurityAttributeWorkRequests") - .serviceDetails("SecurityAttribute", "ListSecurityAttributeWorkRequests", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributeWorkRequests", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeWorkRequestSummary/ListSecurityAttributeWorkRequests") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributeWorkRequestsRequest::builder) .basePath("/20240815") @@ -642,7 +685,10 @@ public java.util.concurrent.Future listSecurityA return clientCall(request, ListSecurityAttributesResponse::builder) .logger(LOG, "listSecurityAttributes") - .serviceDetails("SecurityAttribute", "ListSecurityAttributes", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributes", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeSummary/ListSecurityAttributes") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributesRequest::builder) .basePath("/20240815") @@ -683,7 +729,10 @@ public java.util.concurrent.Future updateSecuri return clientCall(request, UpdateSecurityAttributeResponse::builder) .logger(LOG, "updateSecurityAttribute") - .serviceDetails("SecurityAttribute", "UpdateSecurityAttribute", "") + .serviceDetails( + "SecurityAttribute", + "UpdateSecurityAttribute", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/UpdateSecurityAttribute") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateSecurityAttributeRequest::builder) .basePath("/20240815") @@ -723,7 +772,10 @@ public java.util.concurrent.Future updateSecuri return clientCall(request, UpdateSecurityAttributeNamespaceResponse::builder) .logger(LOG, "updateSecurityAttributeNamespace") - .serviceDetails("SecurityAttribute", "UpdateSecurityAttributeNamespace", "") + .serviceDetails( + "SecurityAttribute", + "UpdateSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/UpdateSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") diff --git a/bmc-securityattribute/src/main/java/com/oracle/bmc/securityattribute/SecurityAttributeClient.java b/bmc-securityattribute/src/main/java/com/oracle/bmc/securityattribute/SecurityAttributeClient.java index d5921a03be1..67c314cd790 100644 --- a/bmc-securityattribute/src/main/java/com/oracle/bmc/securityattribute/SecurityAttributeClient.java +++ b/bmc-securityattribute/src/main/java/com/oracle/bmc/securityattribute/SecurityAttributeClient.java @@ -133,7 +133,10 @@ public BulkDeleteSecurityAttributesResponse bulkDeleteSecurityAttributes( return clientCall(request, BulkDeleteSecurityAttributesResponse::builder) .logger(LOG, "bulkDeleteSecurityAttributes") - .serviceDetails("SecurityAttribute", "BulkDeleteSecurityAttributes", "") + .serviceDetails( + "SecurityAttribute", + "BulkDeleteSecurityAttributes", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/BulkDeleteSecurityAttributes") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(BulkDeleteSecurityAttributesRequest::builder) .basePath("/20240815") @@ -160,7 +163,10 @@ public BulkEditSecurityAttributesResponse bulkEditSecurityAttributes( return clientCall(request, BulkEditSecurityAttributesResponse::builder) .logger(LOG, "bulkEditSecurityAttributes") - .serviceDetails("SecurityAttribute", "BulkEditSecurityAttributes", "") + .serviceDetails( + "SecurityAttribute", + "BulkEditSecurityAttributes", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/BulkEditSecurityAttributes") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(BulkEditSecurityAttributesRequest::builder) .basePath("/20240815") @@ -192,7 +198,9 @@ public BulkEditSecurityAttributesResponse bulkEditSecurityAttributes( return clientCall(request, CascadingDeleteSecurityAttributeNamespaceResponse::builder) .logger(LOG, "cascadingDeleteSecurityAttributeNamespace") .serviceDetails( - "SecurityAttribute", "CascadingDeleteSecurityAttributeNamespace", "") + "SecurityAttribute", + "CascadingDeleteSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/CascadingDeleteSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CascadingDeleteSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") @@ -229,7 +237,9 @@ public BulkEditSecurityAttributesResponse bulkEditSecurityAttributes( return clientCall(request, ChangeSecurityAttributeNamespaceCompartmentResponse::builder) .logger(LOG, "changeSecurityAttributeNamespaceCompartment") .serviceDetails( - "SecurityAttribute", "ChangeSecurityAttributeNamespaceCompartment", "") + "SecurityAttribute", + "ChangeSecurityAttributeNamespaceCompartment", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/ChangeSecurityAttributeNamespaceCompartment") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(ChangeSecurityAttributeNamespaceCompartmentRequest::builder) .basePath("/20240815") @@ -262,7 +272,10 @@ public CreateSecurityAttributeResponse createSecurityAttribute( return clientCall(request, CreateSecurityAttributeResponse::builder) .logger(LOG, "createSecurityAttribute") - .serviceDetails("SecurityAttribute", "CreateSecurityAttribute", "") + .serviceDetails( + "SecurityAttribute", + "CreateSecurityAttribute", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/CreateSecurityAttribute") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateSecurityAttributeRequest::builder) .basePath("/20240815") @@ -292,7 +305,10 @@ public CreateSecurityAttributeNamespaceResponse createSecurityAttributeNamespace return clientCall(request, CreateSecurityAttributeNamespaceResponse::builder) .logger(LOG, "createSecurityAttributeNamespace") - .serviceDetails("SecurityAttribute", "CreateSecurityAttributeNamespace", "") + .serviceDetails( + "SecurityAttribute", + "CreateSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/CreateSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") @@ -327,7 +343,10 @@ public DeleteSecurityAttributeResponse deleteSecurityAttribute( return clientCall(request, DeleteSecurityAttributeResponse::builder) .logger(LOG, "deleteSecurityAttribute") - .serviceDetails("SecurityAttribute", "DeleteSecurityAttribute", "") + .serviceDetails( + "SecurityAttribute", + "DeleteSecurityAttribute", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/DeleteSecurityAttribute") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteSecurityAttributeRequest::builder) .basePath("/20240815") @@ -358,7 +377,10 @@ public DeleteSecurityAttributeNamespaceResponse deleteSecurityAttributeNamespace return clientCall(request, DeleteSecurityAttributeNamespaceResponse::builder) .logger(LOG, "deleteSecurityAttributeNamespace") - .serviceDetails("SecurityAttribute", "DeleteSecurityAttributeNamespace", "") + .serviceDetails( + "SecurityAttribute", + "DeleteSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/DeleteSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") @@ -387,7 +409,10 @@ public GetSecurityAttributeResponse getSecurityAttribute(GetSecurityAttributeReq return clientCall(request, GetSecurityAttributeResponse::builder) .logger(LOG, "getSecurityAttribute") - .serviceDetails("SecurityAttribute", "GetSecurityAttribute", "") + .serviceDetails( + "SecurityAttribute", + "GetSecurityAttribute", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/GetSecurityAttribute") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetSecurityAttributeRequest::builder) .basePath("/20240815") @@ -417,7 +442,10 @@ public GetSecurityAttributeNamespaceResponse getSecurityAttributeNamespace( return clientCall(request, GetSecurityAttributeNamespaceResponse::builder) .logger(LOG, "getSecurityAttributeNamespace") - .serviceDetails("SecurityAttribute", "GetSecurityAttributeNamespace", "") + .serviceDetails( + "SecurityAttribute", + "GetSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/GetSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") @@ -445,7 +473,10 @@ public GetSecurityAttributeWorkRequestResponse getSecurityAttributeWorkRequest( return clientCall(request, GetSecurityAttributeWorkRequestResponse::builder) .logger(LOG, "getSecurityAttributeWorkRequest") - .serviceDetails("SecurityAttribute", "GetSecurityAttributeWorkRequest", "") + .serviceDetails( + "SecurityAttribute", + "GetSecurityAttributeWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeWorkRequest/GetSecurityAttributeWorkRequest") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetSecurityAttributeWorkRequestRequest::builder) .basePath("/20240815") @@ -472,7 +503,10 @@ public ListSecurityAttributeNamespacesResponse listSecurityAttributeNamespaces( return clientCall(request, ListSecurityAttributeNamespacesResponse::builder) .logger(LOG, "listSecurityAttributeNamespaces") - .serviceDetails("SecurityAttribute", "ListSecurityAttributeNamespaces", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributeNamespaces", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespaceSummary/ListSecurityAttributeNamespaces") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributeNamespacesRequest::builder) .basePath("/20240815") @@ -509,7 +543,10 @@ public ListSecurityAttributeWorkRequestErrorsResponse listSecurityAttributeWorkR return clientCall(request, ListSecurityAttributeWorkRequestErrorsResponse::builder) .logger(LOG, "listSecurityAttributeWorkRequestErrors") - .serviceDetails("SecurityAttribute", "ListSecurityAttributeWorkRequestErrors", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributeWorkRequestErrors", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeWorkRequestErrorSummary/ListSecurityAttributeWorkRequestErrors") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributeWorkRequestErrorsRequest::builder) .basePath("/20240815") @@ -545,7 +582,10 @@ public ListSecurityAttributeWorkRequestLogsResponse listSecurityAttributeWorkReq return clientCall(request, ListSecurityAttributeWorkRequestLogsResponse::builder) .logger(LOG, "listSecurityAttributeWorkRequestLogs") - .serviceDetails("SecurityAttribute", "ListSecurityAttributeWorkRequestLogs", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributeWorkRequestLogs", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeWorkRequestLogSummary/ListSecurityAttributeWorkRequestLogs") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributeWorkRequestLogsRequest::builder) .basePath("/20240815") @@ -579,7 +619,10 @@ public ListSecurityAttributeWorkRequestsResponse listSecurityAttributeWorkReques return clientCall(request, ListSecurityAttributeWorkRequestsResponse::builder) .logger(LOG, "listSecurityAttributeWorkRequests") - .serviceDetails("SecurityAttribute", "ListSecurityAttributeWorkRequests", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributeWorkRequests", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeWorkRequestSummary/ListSecurityAttributeWorkRequests") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributeWorkRequestsRequest::builder) .basePath("/20240815") @@ -614,7 +657,10 @@ public ListSecurityAttributesResponse listSecurityAttributes( return clientCall(request, ListSecurityAttributesResponse::builder) .logger(LOG, "listSecurityAttributes") - .serviceDetails("SecurityAttribute", "ListSecurityAttributes", "") + .serviceDetails( + "SecurityAttribute", + "ListSecurityAttributes", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeSummary/ListSecurityAttributes") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListSecurityAttributesRequest::builder) .basePath("/20240815") @@ -653,7 +699,10 @@ public UpdateSecurityAttributeResponse updateSecurityAttribute( return clientCall(request, UpdateSecurityAttributeResponse::builder) .logger(LOG, "updateSecurityAttribute") - .serviceDetails("SecurityAttribute", "UpdateSecurityAttribute", "") + .serviceDetails( + "SecurityAttribute", + "UpdateSecurityAttribute", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttribute/UpdateSecurityAttribute") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateSecurityAttributeRequest::builder) .basePath("/20240815") @@ -689,7 +738,10 @@ public UpdateSecurityAttributeNamespaceResponse updateSecurityAttributeNamespace return clientCall(request, UpdateSecurityAttributeNamespaceResponse::builder) .logger(LOG, "updateSecurityAttributeNamespace") - .serviceDetails("SecurityAttribute", "UpdateSecurityAttributeNamespace", "") + .serviceDetails( + "SecurityAttribute", + "UpdateSecurityAttributeNamespace", + "https://docs.oracle.com/iaas/api/#/en/security-attribute/20240815/SecurityAttributeNamespace/UpdateSecurityAttributeNamespace") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateSecurityAttributeNamespaceRequest::builder) .basePath("/20240815") diff --git a/bmc-securityattribute/src/main/resources/com/oracle/bmc/securityattribute/client.properties b/bmc-securityattribute/src/main/resources/com/oracle/bmc/securityattribute/client.properties index 28be846b5da..883f1274539 100644 --- a/bmc-securityattribute/src/main/resources/com/oracle/bmc/securityattribute/client.properties +++ b/bmc-securityattribute/src/main/resources/com/oracle/bmc/securityattribute/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20240815") \ No newline at end of file diff --git a/bmc-servicecatalog/pom.xml b/bmc-servicecatalog/pom.xml index 66ca5892696..ec5046cbf75 100644 --- a/bmc-servicecatalog/pom.xml +++ b/bmc-servicecatalog/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-servicecatalog @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-servicecatalog/src/main/resources/com/oracle/bmc/servicecatalog/client.properties b/bmc-servicecatalog/src/main/resources/com/oracle/bmc/servicecatalog/client.properties index 28f2654801d..6882256cf70 100644 --- a/bmc-servicecatalog/src/main/resources/com/oracle/bmc/servicecatalog/client.properties +++ b/bmc-servicecatalog/src/main/resources/com/oracle/bmc/servicecatalog/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210527") \ No newline at end of file diff --git a/bmc-servicemanagerproxy/pom.xml b/bmc-servicemanagerproxy/pom.xml index 20ea0f00443..15e4985e715 100644 --- a/bmc-servicemanagerproxy/pom.xml +++ b/bmc-servicemanagerproxy/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-servicemanagerproxy @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-servicemanagerproxy/src/main/resources/com/oracle/bmc/servicemanagerproxy/client.properties b/bmc-servicemanagerproxy/src/main/resources/com/oracle/bmc/servicemanagerproxy/client.properties index dd2e67276ae..85339f4c8fb 100644 --- a/bmc-servicemanagerproxy/src/main/resources/com/oracle/bmc/servicemanagerproxy/client.properties +++ b/bmc-servicemanagerproxy/src/main/resources/com/oracle/bmc/servicemanagerproxy/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210914") \ No newline at end of file diff --git a/bmc-servicemesh/pom.xml b/bmc-servicemesh/pom.xml index c06a64911f2..3a3cfd03a66 100644 --- a/bmc-servicemesh/pom.xml +++ b/bmc-servicemesh/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-servicemesh @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-servicemesh/src/main/resources/com/oracle/bmc/servicemesh/client.properties b/bmc-servicemesh/src/main/resources/com/oracle/bmc/servicemesh/client.properties index 75e196253a9..1f0aa38f0aa 100644 --- a/bmc-servicemesh/src/main/resources/com/oracle/bmc/servicemesh/client.properties +++ b/bmc-servicemesh/src/main/resources/com/oracle/bmc/servicemesh/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220615") \ No newline at end of file diff --git a/bmc-shaded/bmc-shaded-full/pom.xml b/bmc-shaded/bmc-shaded-full/pom.xml index b8159689be0..18025d34c5c 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 - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-shaded-full diff --git a/bmc-shaded/pom.xml b/bmc-shaded/pom.xml index 01f32d0fbbc..e5dba59db76 100644 --- a/bmc-shaded/pom.xml +++ b/bmc-shaded/pom.xml @@ -5,7 +5,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml diff --git a/bmc-stackmonitoring/pom.xml b/bmc-stackmonitoring/pom.xml index 31c255f92be..a028bab384b 100644 --- a/bmc-stackmonitoring/pom.xml +++ b/bmc-stackmonitoring/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-stackmonitoring @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-stackmonitoring/src/main/resources/com/oracle/bmc/stackmonitoring/client.properties b/bmc-stackmonitoring/src/main/resources/com/oracle/bmc/stackmonitoring/client.properties index 6674c78d709..5e369501eb6 100644 --- a/bmc-stackmonitoring/src/main/resources/com/oracle/bmc/stackmonitoring/client.properties +++ b/bmc-stackmonitoring/src/main/resources/com/oracle/bmc/stackmonitoring/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210330") \ No newline at end of file diff --git a/bmc-streaming/pom.xml b/bmc-streaming/pom.xml index 21b2329e961..c3dc2fcdfa2 100644 --- a/bmc-streaming/pom.xml +++ b/bmc-streaming/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-streaming @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-streaming/src/main/resources/com/oracle/bmc/streaming/client.properties b/bmc-streaming/src/main/resources/com/oracle/bmc/streaming/client.properties index 4b32d6c783f..fa9098bb8d7 100644 --- a/bmc-streaming/src/main/resources/com/oracle/bmc/streaming/client.properties +++ b/bmc-streaming/src/main/resources/com/oracle/bmc/streaming/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180418") \ No newline at end of file diff --git a/bmc-tenantmanagercontrolplane/pom.xml b/bmc-tenantmanagercontrolplane/pom.xml index fbec05d9e21..4d41133a1f2 100644 --- a/bmc-tenantmanagercontrolplane/pom.xml +++ b/bmc-tenantmanagercontrolplane/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-tenantmanagercontrolplane @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-tenantmanagercontrolplane/src/main/resources/com/oracle/bmc/tenantmanagercontrolplane/client.properties b/bmc-tenantmanagercontrolplane/src/main/resources/com/oracle/bmc/tenantmanagercontrolplane/client.properties index e9126de884d..68d9b57f543 100644 --- a/bmc-tenantmanagercontrolplane/src/main/resources/com/oracle/bmc/tenantmanagercontrolplane/client.properties +++ b/bmc-tenantmanagercontrolplane/src/main/resources/com/oracle/bmc/tenantmanagercontrolplane/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20230401") \ No newline at end of file diff --git a/bmc-threatintelligence/pom.xml b/bmc-threatintelligence/pom.xml index c6f7af36a02..a27dbf6cab8 100644 --- a/bmc-threatintelligence/pom.xml +++ b/bmc-threatintelligence/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-threatintelligence @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-threatintelligence/src/main/resources/com/oracle/bmc/threatintelligence/client.properties b/bmc-threatintelligence/src/main/resources/com/oracle/bmc/threatintelligence/client.properties index af491a0f663..ae6e87ee56c 100644 --- a/bmc-threatintelligence/src/main/resources/com/oracle/bmc/threatintelligence/client.properties +++ b/bmc-threatintelligence/src/main/resources/com/oracle/bmc/threatintelligence/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20220901") \ No newline at end of file diff --git a/bmc-usage/pom.xml b/bmc-usage/pom.xml index bca3451422c..586b10f439b 100644 --- a/bmc-usage/pom.xml +++ b/bmc-usage/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-usage @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-usage/src/main/resources/com/oracle/bmc/usage/client.properties b/bmc-usage/src/main/resources/com/oracle/bmc/usage/client.properties index 19e835c2771..f690db42340 100644 --- a/bmc-usage/src/main/resources/com/oracle/bmc/usage/client.properties +++ b/bmc-usage/src/main/resources/com/oracle/bmc/usage/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20190111") \ No newline at end of file diff --git a/bmc-usageapi/pom.xml b/bmc-usageapi/pom.xml index 90031d3d14e..dff5a7074af 100644 --- a/bmc-usageapi/pom.xml +++ b/bmc-usageapi/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-usageapi @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-usageapi/src/main/resources/com/oracle/bmc/usageapi/client.properties b/bmc-usageapi/src/main/resources/com/oracle/bmc/usageapi/client.properties index 07ae63d8853..1aa57efc8f5 100644 --- a/bmc-usageapi/src/main/resources/com/oracle/bmc/usageapi/client.properties +++ b/bmc-usageapi/src/main/resources/com/oracle/bmc/usageapi/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20200107") \ No newline at end of file diff --git a/bmc-vault/pom.xml b/bmc-vault/pom.xml index a6c9248e6da..099de6e730a 100644 --- a/bmc-vault/pom.xml +++ b/bmc-vault/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-vault @@ -15,12 +15,12 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 com.oracle.oci.sdk oci-java-sdk-workrequests - 3.54.0 + 3.55.0 diff --git a/bmc-vault/src/main/resources/com/oracle/bmc/vault/client.properties b/bmc-vault/src/main/resources/com/oracle/bmc/vault/client.properties index 260aa97a6f1..bc796555203 100644 --- a/bmc-vault/src/main/resources/com/oracle/bmc/vault/client.properties +++ b/bmc-vault/src/main/resources/com/oracle/bmc/vault/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180608") \ No newline at end of file diff --git a/bmc-vbsinst/pom.xml b/bmc-vbsinst/pom.xml index 41f2f884efe..3964418b45a 100644 --- a/bmc-vbsinst/pom.xml +++ b/bmc-vbsinst/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-vbsinst @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-vbsinst/src/main/resources/com/oracle/bmc/vbsinst/client.properties b/bmc-vbsinst/src/main/resources/com/oracle/bmc/vbsinst/client.properties index 3b22546b248..af810c91a9f 100644 --- a/bmc-vbsinst/src/main/resources/com/oracle/bmc/vbsinst/client.properties +++ b/bmc-vbsinst/src/main/resources/com/oracle/bmc/vbsinst/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20180828") \ No newline at end of file diff --git a/bmc-visualbuilder/pom.xml b/bmc-visualbuilder/pom.xml index 85b271a1c24..97983fa8bde 100644 --- a/bmc-visualbuilder/pom.xml +++ b/bmc-visualbuilder/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-visualbuilder @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstance.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstance.java index 0977fa48500..655d4ae6ac0 100644 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstance.java +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstance.java @@ -211,6 +211,27 @@ ChangeVbInstanceCompartmentResponse changeVbInstanceCompartment( */ ListWorkRequestsResponse listWorkRequests(ListWorkRequestsRequest request); + /** + * Reconfigures the Private Endpoint associated with the private visual builder instance. Use + * this action in case the Private Endpoint is not working and needs to be reset. The VB + * instance has to be in ACTIVE state and should be a private instance to perform this + * operation. If the previous state is not ACTIVE, then the state of the vbInstance will not be + * changed and a 409 response returned. + * + * @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. This operation will not retry by default, users + * can also use RetryConfiguration.SDK_DEFAULT_RETRY_CONFIGURATION provided by the SDK to + * enable retries for it. The specifics of the default retry strategy are described here + * https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/javasdkconcepts.htm#javasdkconcepts_topic_Retries + *

Example: Click here to see how to use + * ReconfigurePrivateEndpointVbInstance API. + */ + ReconfigurePrivateEndpointVbInstanceResponse reconfigurePrivateEndpointVbInstance( + ReconfigurePrivateEndpointVbInstanceRequest request); + /** * Summarizes the applications for a vb instance. * diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceAsync.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceAsync.java index 06cc5edd97f..7bf00496bdc 100644 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceAsync.java +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceAsync.java @@ -203,6 +203,28 @@ java.util.concurrent.Future listWorkRequests( com.oracle.bmc.responses.AsyncHandler handler); + /** + * Reconfigures the Private Endpoint associated with the private visual builder instance. Use + * this action in case the Private Endpoint is not working and needs to be reset. The VB + * instance has to be in ACTIVE state and should be a private instance to perform this + * operation. If the previous state is not ACTIVE, then the state of the vbInstance will not be + * changed and a 409 response returned. + * + * @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 + reconfigurePrivateEndpointVbInstance( + ReconfigurePrivateEndpointVbInstanceRequest request, + com.oracle.bmc.responses.AsyncHandler< + ReconfigurePrivateEndpointVbInstanceRequest, + ReconfigurePrivateEndpointVbInstanceResponse> + handler); + /** * Summarizes the applications for a vb instance. * diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceAsyncClient.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceAsyncClient.java index e957c3c3574..5a38afd771f 100644 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceAsyncClient.java +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceAsyncClient.java @@ -411,6 +411,43 @@ public java.util.concurrent.Future listWorkRequests( .callAsync(handler); } + @Override + public java.util.concurrent.Future + reconfigurePrivateEndpointVbInstance( + ReconfigurePrivateEndpointVbInstanceRequest request, + final com.oracle.bmc.responses.AsyncHandler< + ReconfigurePrivateEndpointVbInstanceRequest, + ReconfigurePrivateEndpointVbInstanceResponse> + handler) { + + Validate.notBlank(request.getVbInstanceId(), "vbInstanceId must not be blank"); + + return clientCall(request, ReconfigurePrivateEndpointVbInstanceResponse::builder) + .logger(LOG, "reconfigurePrivateEndpointVbInstance") + .serviceDetails( + "VbInstance", + "ReconfigurePrivateEndpointVbInstance", + "https://docs.oracle.com/iaas/api/#/en/visual-builder/20210601/VbInstance/ReconfigurePrivateEndpointVbInstance") + .method(com.oracle.bmc.http.client.Method.POST) + .requestBuilder(ReconfigurePrivateEndpointVbInstanceRequest::builder) + .basePath("/20210601") + .appendPathParam("vbInstances") + .appendPathParam(request.getVbInstanceId()) + .appendPathParam("actions") + .appendPathParam("reconfigurePrivateEndpoint") + .accept("application/json") + .appendHeader("if-match", request.getIfMatch()) + .appendHeader("opc-request-id", request.getOpcRequestId()) + .appendHeader("opc-retry-token", request.getOpcRetryToken()) + .handleResponseHeaderString( + "opc-work-request-id", + ReconfigurePrivateEndpointVbInstanceResponse.Builder::opcWorkRequestId) + .handleResponseHeaderString( + "opc-request-id", + ReconfigurePrivateEndpointVbInstanceResponse.Builder::opcRequestId) + .callAsync(handler); + } + @Override public java.util.concurrent.Future requestSummarizedApplications( diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceClient.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceClient.java index 9448c6acf28..d93cf91614b 100644 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceClient.java +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/VbInstanceClient.java @@ -410,6 +410,38 @@ public ListWorkRequestsResponse listWorkRequests(ListWorkRequestsRequest request .callSync(); } + @Override + public ReconfigurePrivateEndpointVbInstanceResponse reconfigurePrivateEndpointVbInstance( + ReconfigurePrivateEndpointVbInstanceRequest request) { + + Validate.notBlank(request.getVbInstanceId(), "vbInstanceId must not be blank"); + + return clientCall(request, ReconfigurePrivateEndpointVbInstanceResponse::builder) + .logger(LOG, "reconfigurePrivateEndpointVbInstance") + .serviceDetails( + "VbInstance", + "ReconfigurePrivateEndpointVbInstance", + "https://docs.oracle.com/iaas/api/#/en/visual-builder/20210601/VbInstance/ReconfigurePrivateEndpointVbInstance") + .method(com.oracle.bmc.http.client.Method.POST) + .requestBuilder(ReconfigurePrivateEndpointVbInstanceRequest::builder) + .basePath("/20210601") + .appendPathParam("vbInstances") + .appendPathParam(request.getVbInstanceId()) + .appendPathParam("actions") + .appendPathParam("reconfigurePrivateEndpoint") + .accept("application/json") + .appendHeader("if-match", request.getIfMatch()) + .appendHeader("opc-request-id", request.getOpcRequestId()) + .appendHeader("opc-retry-token", request.getOpcRetryToken()) + .handleResponseHeaderString( + "opc-work-request-id", + ReconfigurePrivateEndpointVbInstanceResponse.Builder::opcWorkRequestId) + .handleResponseHeaderString( + "opc-request-id", + ReconfigurePrivateEndpointVbInstanceResponse.Builder::opcRequestId) + .callSync(); + } + @Override public RequestSummarizedApplicationsResponse requestSummarizedApplications( RequestSummarizedApplicationsRequest request) { diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/AttachmentDetails.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/AttachmentDetails.java deleted file mode 100644 index 99386975358..00000000000 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/AttachmentDetails.java +++ /dev/null @@ -1,372 +0,0 @@ -/** - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. - * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. - */ -package com.oracle.bmc.visualbuilder.model; - -/** - * Description of an attachments for this instance
- * 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 Builder#__explicitlySet__}. The {@link - * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set - * fields into account. The constructor, on the other hand, does not take the explicitly set fields - * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code - * null}). - */ -@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") -@com.fasterxml.jackson.databind.annotation.JsonDeserialize( - builder = AttachmentDetails.Builder.class) -@com.fasterxml.jackson.annotation.JsonFilter( - com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) -public final class AttachmentDetails - extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { - @Deprecated - @java.beans.ConstructorProperties({ - "targetRole", - "isImplicit", - "targetId", - "targetInstanceUrl", - "targetServiceType" - }) - public AttachmentDetails( - TargetRole targetRole, - Boolean isImplicit, - String targetId, - String targetInstanceUrl, - String targetServiceType) { - super(); - this.targetRole = targetRole; - this.isImplicit = isImplicit; - this.targetId = targetId; - this.targetInstanceUrl = targetInstanceUrl; - this.targetServiceType = targetServiceType; - } - - @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") - public static class Builder { - /** - * The role of the target attachment. * {@code PARENT} - The target instance is the parent - * of this attachment. * {@code CHILD} - The target instance is the child of this - * attachment. - */ - @com.fasterxml.jackson.annotation.JsonProperty("targetRole") - private TargetRole targetRole; - - /** - * The role of the target attachment. * {@code PARENT} - The target instance is the parent - * of this attachment. * {@code CHILD} - The target instance is the child of this - * attachment. - * - * @param targetRole the value to set - * @return this builder - */ - public Builder targetRole(TargetRole targetRole) { - this.targetRole = targetRole; - this.__explicitlySet__.add("targetRole"); - return this; - } - /** - * * If role == {@code PARENT}, the attached instance was created by this service instance * - * If role == {@code CHILD}, this instance was created from attached instance on behalf of a - * user - */ - @com.fasterxml.jackson.annotation.JsonProperty("isImplicit") - private Boolean isImplicit; - - /** - * * If role == {@code PARENT}, the attached instance was created by this service instance * - * If role == {@code CHILD}, this instance was created from attached instance on behalf of a - * user - * - * @param isImplicit the value to set - * @return this builder - */ - public Builder isImplicit(Boolean isImplicit) { - this.isImplicit = isImplicit; - this.__explicitlySet__.add("isImplicit"); - return this; - } - /** - * The OCID of the target instance (which could be any other OCI PaaS/SaaS resource), to - * which this instance is attached. - */ - @com.fasterxml.jackson.annotation.JsonProperty("targetId") - private String targetId; - - /** - * The OCID of the target instance (which could be any other OCI PaaS/SaaS resource), to - * which this instance is attached. - * - * @param targetId the value to set - * @return this builder - */ - public Builder targetId(String targetId) { - this.targetId = targetId; - this.__explicitlySet__.add("targetId"); - return this; - } - /** The dataplane instance URL of the attached instance */ - @com.fasterxml.jackson.annotation.JsonProperty("targetInstanceUrl") - private String targetInstanceUrl; - - /** - * The dataplane instance URL of the attached instance - * - * @param targetInstanceUrl the value to set - * @return this builder - */ - public Builder targetInstanceUrl(String targetInstanceUrl) { - this.targetInstanceUrl = targetInstanceUrl; - this.__explicitlySet__.add("targetInstanceUrl"); - return this; - } - /** The type of the target instance, such as "FUSION". */ - @com.fasterxml.jackson.annotation.JsonProperty("targetServiceType") - private String targetServiceType; - - /** - * The type of the target instance, such as "FUSION". - * - * @param targetServiceType the value to set - * @return this builder - */ - public Builder targetServiceType(String targetServiceType) { - this.targetServiceType = targetServiceType; - this.__explicitlySet__.add("targetServiceType"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonIgnore - private final java.util.Set __explicitlySet__ = new java.util.HashSet(); - - public AttachmentDetails build() { - AttachmentDetails model = - new AttachmentDetails( - this.targetRole, - this.isImplicit, - this.targetId, - this.targetInstanceUrl, - this.targetServiceType); - for (String explicitlySetProperty : this.__explicitlySet__) { - model.markPropertyAsExplicitlySet(explicitlySetProperty); - } - return model; - } - - @com.fasterxml.jackson.annotation.JsonIgnore - public Builder copy(AttachmentDetails model) { - if (model.wasPropertyExplicitlySet("targetRole")) { - this.targetRole(model.getTargetRole()); - } - if (model.wasPropertyExplicitlySet("isImplicit")) { - this.isImplicit(model.getIsImplicit()); - } - if (model.wasPropertyExplicitlySet("targetId")) { - this.targetId(model.getTargetId()); - } - if (model.wasPropertyExplicitlySet("targetInstanceUrl")) { - this.targetInstanceUrl(model.getTargetInstanceUrl()); - } - if (model.wasPropertyExplicitlySet("targetServiceType")) { - this.targetServiceType(model.getTargetServiceType()); - } - return this; - } - } - - /** Create a new builder. */ - public static Builder builder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder().copy(this); - } - - /** - * The role of the target attachment. * {@code PARENT} - The target instance is the parent of - * this attachment. * {@code CHILD} - The target instance is the child of this attachment. - */ - public enum TargetRole implements com.oracle.bmc.http.internal.BmcEnum { - Parent("PARENT"), - Child("CHILD"), - - /** - * 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 static final org.slf4j.Logger LOG = - org.slf4j.LoggerFactory.getLogger(TargetRole.class); - - private final String value; - private static java.util.Map map; - - static { - map = new java.util.HashMap<>(); - for (TargetRole v : TargetRole.values()) { - if (v != UnknownEnumValue) { - map.put(v.getValue(), v); - } - } - } - - TargetRole(String value) { - this.value = value; - } - - @com.fasterxml.jackson.annotation.JsonValue - public String getValue() { - return value; - } - - @com.fasterxml.jackson.annotation.JsonCreator - public static TargetRole create(String key) { - if (map.containsKey(key)) { - return map.get(key); - } - LOG.warn( - "Received unknown value '{}' for enum 'TargetRole', returning UnknownEnumValue", - key); - return UnknownEnumValue; - } - }; - /** - * The role of the target attachment. * {@code PARENT} - The target instance is the parent of - * this attachment. * {@code CHILD} - The target instance is the child of this attachment. - */ - @com.fasterxml.jackson.annotation.JsonProperty("targetRole") - private final TargetRole targetRole; - - /** - * The role of the target attachment. * {@code PARENT} - The target instance is the parent of - * this attachment. * {@code CHILD} - The target instance is the child of this attachment. - * - * @return the value - */ - public TargetRole getTargetRole() { - return targetRole; - } - - /** - * * If role == {@code PARENT}, the attached instance was created by this service instance * If - * role == {@code CHILD}, this instance was created from attached instance on behalf of a user - */ - @com.fasterxml.jackson.annotation.JsonProperty("isImplicit") - private final Boolean isImplicit; - - /** - * * If role == {@code PARENT}, the attached instance was created by this service instance * If - * role == {@code CHILD}, this instance was created from attached instance on behalf of a user - * - * @return the value - */ - public Boolean getIsImplicit() { - return isImplicit; - } - - /** - * The OCID of the target instance (which could be any other OCI PaaS/SaaS resource), to which - * this instance is attached. - */ - @com.fasterxml.jackson.annotation.JsonProperty("targetId") - private final String targetId; - - /** - * The OCID of the target instance (which could be any other OCI PaaS/SaaS resource), to which - * this instance is attached. - * - * @return the value - */ - public String getTargetId() { - return targetId; - } - - /** The dataplane instance URL of the attached instance */ - @com.fasterxml.jackson.annotation.JsonProperty("targetInstanceUrl") - private final String targetInstanceUrl; - - /** - * The dataplane instance URL of the attached instance - * - * @return the value - */ - public String getTargetInstanceUrl() { - return targetInstanceUrl; - } - - /** The type of the target instance, such as "FUSION". */ - @com.fasterxml.jackson.annotation.JsonProperty("targetServiceType") - private final String targetServiceType; - - /** - * The type of the target instance, such as "FUSION". - * - * @return the value - */ - public String getTargetServiceType() { - return targetServiceType; - } - - @Override - public String toString() { - return this.toString(true); - } - - /** - * Return a string representation of the object. - * - * @param includeByteArrayContents true to include the full contents of byte arrays - * @return string representation - */ - public String toString(boolean includeByteArrayContents) { - java.lang.StringBuilder sb = new java.lang.StringBuilder(); - sb.append("AttachmentDetails("); - sb.append("super=").append(super.toString()); - sb.append("targetRole=").append(String.valueOf(this.targetRole)); - sb.append(", isImplicit=").append(String.valueOf(this.isImplicit)); - sb.append(", targetId=").append(String.valueOf(this.targetId)); - sb.append(", targetInstanceUrl=").append(String.valueOf(this.targetInstanceUrl)); - sb.append(", targetServiceType=").append(String.valueOf(this.targetServiceType)); - sb.append(")"); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof AttachmentDetails)) { - return false; - } - - AttachmentDetails other = (AttachmentDetails) o; - return java.util.Objects.equals(this.targetRole, other.targetRole) - && java.util.Objects.equals(this.isImplicit, other.isImplicit) - && java.util.Objects.equals(this.targetId, other.targetId) - && java.util.Objects.equals(this.targetInstanceUrl, other.targetInstanceUrl) - && java.util.Objects.equals(this.targetServiceType, other.targetServiceType) - && super.equals(other); - } - - @Override - public int hashCode() { - final int PRIME = 59; - int result = 1; - result = (result * PRIME) + (this.targetRole == null ? 43 : this.targetRole.hashCode()); - result = (result * PRIME) + (this.isImplicit == null ? 43 : this.isImplicit.hashCode()); - result = (result * PRIME) + (this.targetId == null ? 43 : this.targetId.hashCode()); - result = - (result * PRIME) - + (this.targetInstanceUrl == null ? 43 : this.targetInstanceUrl.hashCode()); - result = - (result * PRIME) - + (this.targetServiceType == null ? 43 : this.targetServiceType.hashCode()); - result = (result * PRIME) + super.hashCode(); - return result; - } -} diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/CreateVbInstanceDetails.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/CreateVbInstanceDetails.java index 5f7912c8548..a28ad65f413 100644 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/CreateVbInstanceDetails.java +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/CreateVbInstanceDetails.java @@ -33,7 +33,8 @@ public final class CreateVbInstanceDetails "isVisualBuilderEnabled", "customEndpoint", "alternateCustomEndpoints", - "consumptionModel" + "consumptionModel", + "networkEndpointDetails" }) public CreateVbInstanceDetails( String displayName, @@ -45,7 +46,8 @@ public CreateVbInstanceDetails( Boolean isVisualBuilderEnabled, CreateCustomEndpointDetails customEndpoint, java.util.List alternateCustomEndpoints, - ConsumptionModel consumptionModel) { + ConsumptionModel consumptionModel, + NetworkEndpointDetails networkEndpointDetails) { super(); this.displayName = displayName; this.compartmentId = compartmentId; @@ -57,6 +59,7 @@ public CreateVbInstanceDetails( this.customEndpoint = customEndpoint; this.alternateCustomEndpoints = alternateCustomEndpoints; this.consumptionModel = consumptionModel; + this.networkEndpointDetails = networkEndpointDetails; } @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @@ -228,6 +231,15 @@ public Builder consumptionModel(ConsumptionModel consumptionModel) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("networkEndpointDetails") + private NetworkEndpointDetails networkEndpointDetails; + + public Builder networkEndpointDetails(NetworkEndpointDetails networkEndpointDetails) { + this.networkEndpointDetails = networkEndpointDetails; + this.__explicitlySet__.add("networkEndpointDetails"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -243,7 +255,8 @@ public CreateVbInstanceDetails build() { this.isVisualBuilderEnabled, this.customEndpoint, this.alternateCustomEndpoints, - this.consumptionModel); + this.consumptionModel, + this.networkEndpointDetails); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -282,6 +295,9 @@ public Builder copy(CreateVbInstanceDetails model) { if (model.wasPropertyExplicitlySet("consumptionModel")) { this.consumptionModel(model.getConsumptionModel()); } + if (model.wasPropertyExplicitlySet("networkEndpointDetails")) { + this.networkEndpointDetails(model.getNetworkEndpointDetails()); + } return this; } } @@ -476,6 +492,13 @@ public ConsumptionModel getConsumptionModel() { return consumptionModel; } + @com.fasterxml.jackson.annotation.JsonProperty("networkEndpointDetails") + private final NetworkEndpointDetails networkEndpointDetails; + + public NetworkEndpointDetails getNetworkEndpointDetails() { + return networkEndpointDetails; + } + @Override public String toString() { return this.toString(true); @@ -502,6 +525,7 @@ public String toString(boolean includeByteArrayContents) { sb.append(", alternateCustomEndpoints=") .append(String.valueOf(this.alternateCustomEndpoints)); sb.append(", consumptionModel=").append(String.valueOf(this.consumptionModel)); + sb.append(", networkEndpointDetails=").append(String.valueOf(this.networkEndpointDetails)); sb.append(")"); return sb.toString(); } @@ -528,6 +552,8 @@ public boolean equals(Object o) { && java.util.Objects.equals( this.alternateCustomEndpoints, other.alternateCustomEndpoints) && java.util.Objects.equals(this.consumptionModel, other.consumptionModel) + && java.util.Objects.equals( + this.networkEndpointDetails, other.networkEndpointDetails) && super.equals(other); } @@ -559,6 +585,11 @@ public int hashCode() { result = (result * PRIME) + (this.consumptionModel == null ? 43 : this.consumptionModel.hashCode()); + result = + (result * PRIME) + + (this.networkEndpointDetails == null + ? 43 + : this.networkEndpointDetails.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/IdcsInfoDetails.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/IdcsInfoDetails.java deleted file mode 100644 index c57b6a6ce46..00000000000 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/IdcsInfoDetails.java +++ /dev/null @@ -1,310 +0,0 @@ -/** - * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. - * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. - */ -package com.oracle.bmc.visualbuilder.model; - -/** - * Information for IDCS access
- * 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 Builder#__explicitlySet__}. The {@link - * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set - * fields into account. The constructor, on the other hand, does not take the explicitly set fields - * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code - * null}). - */ -@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") -@com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = IdcsInfoDetails.Builder.class) -@com.fasterxml.jackson.annotation.JsonFilter( - com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) -public final class IdcsInfoDetails - extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { - @Deprecated - @java.beans.ConstructorProperties({ - "idcsAppLocationUrl", - "idcsAppDisplayName", - "idcsAppId", - "idcsAppName", - "instancePrimaryAudienceUrl" - }) - public IdcsInfoDetails( - String idcsAppLocationUrl, - String idcsAppDisplayName, - String idcsAppId, - String idcsAppName, - String instancePrimaryAudienceUrl) { - super(); - this.idcsAppLocationUrl = idcsAppLocationUrl; - this.idcsAppDisplayName = idcsAppDisplayName; - this.idcsAppId = idcsAppId; - this.idcsAppName = idcsAppName; - this.instancePrimaryAudienceUrl = instancePrimaryAudienceUrl; - } - - @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") - public static class Builder { - /** URL for the location of the IDCS Application (used by IDCS APIs) */ - @com.fasterxml.jackson.annotation.JsonProperty("idcsAppLocationUrl") - private String idcsAppLocationUrl; - - /** - * URL for the location of the IDCS Application (used by IDCS APIs) - * - * @param idcsAppLocationUrl the value to set - * @return this builder - */ - public Builder idcsAppLocationUrl(String idcsAppLocationUrl) { - this.idcsAppLocationUrl = idcsAppLocationUrl; - this.__explicitlySet__.add("idcsAppLocationUrl"); - return this; - } - /** The IDCS application display name associated with the instance */ - @com.fasterxml.jackson.annotation.JsonProperty("idcsAppDisplayName") - private String idcsAppDisplayName; - - /** - * The IDCS application display name associated with the instance - * - * @param idcsAppDisplayName the value to set - * @return this builder - */ - public Builder idcsAppDisplayName(String idcsAppDisplayName) { - this.idcsAppDisplayName = idcsAppDisplayName; - this.__explicitlySet__.add("idcsAppDisplayName"); - return this; - } - /** The IDCS application ID associated with the instance */ - @com.fasterxml.jackson.annotation.JsonProperty("idcsAppId") - private String idcsAppId; - - /** - * The IDCS application ID associated with the instance - * - * @param idcsAppId the value to set - * @return this builder - */ - public Builder idcsAppId(String idcsAppId) { - this.idcsAppId = idcsAppId; - this.__explicitlySet__.add("idcsAppId"); - return this; - } - /** The IDCS application name associated with the instance */ - @com.fasterxml.jackson.annotation.JsonProperty("idcsAppName") - private String idcsAppName; - - /** - * The IDCS application name associated with the instance - * - * @param idcsAppName the value to set - * @return this builder - */ - public Builder idcsAppName(String idcsAppName) { - this.idcsAppName = idcsAppName; - this.__explicitlySet__.add("idcsAppName"); - return this; - } - /** - * The URL used as the primary audience for visual builder flows in this instance type: - * string - */ - @com.fasterxml.jackson.annotation.JsonProperty("instancePrimaryAudienceUrl") - private String instancePrimaryAudienceUrl; - - /** - * The URL used as the primary audience for visual builder flows in this instance type: - * string - * - * @param instancePrimaryAudienceUrl the value to set - * @return this builder - */ - public Builder instancePrimaryAudienceUrl(String instancePrimaryAudienceUrl) { - this.instancePrimaryAudienceUrl = instancePrimaryAudienceUrl; - this.__explicitlySet__.add("instancePrimaryAudienceUrl"); - return this; - } - - @com.fasterxml.jackson.annotation.JsonIgnore - private final java.util.Set __explicitlySet__ = new java.util.HashSet(); - - public IdcsInfoDetails build() { - IdcsInfoDetails model = - new IdcsInfoDetails( - this.idcsAppLocationUrl, - this.idcsAppDisplayName, - this.idcsAppId, - this.idcsAppName, - this.instancePrimaryAudienceUrl); - for (String explicitlySetProperty : this.__explicitlySet__) { - model.markPropertyAsExplicitlySet(explicitlySetProperty); - } - return model; - } - - @com.fasterxml.jackson.annotation.JsonIgnore - public Builder copy(IdcsInfoDetails model) { - if (model.wasPropertyExplicitlySet("idcsAppLocationUrl")) { - this.idcsAppLocationUrl(model.getIdcsAppLocationUrl()); - } - if (model.wasPropertyExplicitlySet("idcsAppDisplayName")) { - this.idcsAppDisplayName(model.getIdcsAppDisplayName()); - } - if (model.wasPropertyExplicitlySet("idcsAppId")) { - this.idcsAppId(model.getIdcsAppId()); - } - if (model.wasPropertyExplicitlySet("idcsAppName")) { - this.idcsAppName(model.getIdcsAppName()); - } - if (model.wasPropertyExplicitlySet("instancePrimaryAudienceUrl")) { - this.instancePrimaryAudienceUrl(model.getInstancePrimaryAudienceUrl()); - } - return this; - } - } - - /** Create a new builder. */ - public static Builder builder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder().copy(this); - } - - /** URL for the location of the IDCS Application (used by IDCS APIs) */ - @com.fasterxml.jackson.annotation.JsonProperty("idcsAppLocationUrl") - private final String idcsAppLocationUrl; - - /** - * URL for the location of the IDCS Application (used by IDCS APIs) - * - * @return the value - */ - public String getIdcsAppLocationUrl() { - return idcsAppLocationUrl; - } - - /** The IDCS application display name associated with the instance */ - @com.fasterxml.jackson.annotation.JsonProperty("idcsAppDisplayName") - private final String idcsAppDisplayName; - - /** - * The IDCS application display name associated with the instance - * - * @return the value - */ - public String getIdcsAppDisplayName() { - return idcsAppDisplayName; - } - - /** The IDCS application ID associated with the instance */ - @com.fasterxml.jackson.annotation.JsonProperty("idcsAppId") - private final String idcsAppId; - - /** - * The IDCS application ID associated with the instance - * - * @return the value - */ - public String getIdcsAppId() { - return idcsAppId; - } - - /** The IDCS application name associated with the instance */ - @com.fasterxml.jackson.annotation.JsonProperty("idcsAppName") - private final String idcsAppName; - - /** - * The IDCS application name associated with the instance - * - * @return the value - */ - public String getIdcsAppName() { - return idcsAppName; - } - - /** - * The URL used as the primary audience for visual builder flows in this instance type: string - */ - @com.fasterxml.jackson.annotation.JsonProperty("instancePrimaryAudienceUrl") - private final String instancePrimaryAudienceUrl; - - /** - * The URL used as the primary audience for visual builder flows in this instance type: string - * - * @return the value - */ - public String getInstancePrimaryAudienceUrl() { - return instancePrimaryAudienceUrl; - } - - @Override - public String toString() { - return this.toString(true); - } - - /** - * Return a string representation of the object. - * - * @param includeByteArrayContents true to include the full contents of byte arrays - * @return string representation - */ - public String toString(boolean includeByteArrayContents) { - java.lang.StringBuilder sb = new java.lang.StringBuilder(); - sb.append("IdcsInfoDetails("); - sb.append("super=").append(super.toString()); - sb.append("idcsAppLocationUrl=").append(String.valueOf(this.idcsAppLocationUrl)); - sb.append(", idcsAppDisplayName=").append(String.valueOf(this.idcsAppDisplayName)); - sb.append(", idcsAppId=").append(String.valueOf(this.idcsAppId)); - sb.append(", idcsAppName=").append(String.valueOf(this.idcsAppName)); - sb.append(", instancePrimaryAudienceUrl=") - .append(String.valueOf(this.instancePrimaryAudienceUrl)); - sb.append(")"); - return sb.toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof IdcsInfoDetails)) { - return false; - } - - IdcsInfoDetails other = (IdcsInfoDetails) o; - return java.util.Objects.equals(this.idcsAppLocationUrl, other.idcsAppLocationUrl) - && java.util.Objects.equals(this.idcsAppDisplayName, other.idcsAppDisplayName) - && java.util.Objects.equals(this.idcsAppId, other.idcsAppId) - && java.util.Objects.equals(this.idcsAppName, other.idcsAppName) - && java.util.Objects.equals( - this.instancePrimaryAudienceUrl, other.instancePrimaryAudienceUrl) - && super.equals(other); - } - - @Override - public int hashCode() { - final int PRIME = 59; - int result = 1; - result = - (result * PRIME) - + (this.idcsAppLocationUrl == null - ? 43 - : this.idcsAppLocationUrl.hashCode()); - result = - (result * PRIME) - + (this.idcsAppDisplayName == null - ? 43 - : this.idcsAppDisplayName.hashCode()); - result = (result * PRIME) + (this.idcsAppId == null ? 43 : this.idcsAppId.hashCode()); - result = (result * PRIME) + (this.idcsAppName == null ? 43 : this.idcsAppName.hashCode()); - result = - (result * PRIME) - + (this.instancePrimaryAudienceUrl == null - ? 43 - : this.instancePrimaryAudienceUrl.hashCode()); - result = (result * PRIME) + super.hashCode(); - return result; - } -} diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/NetworkEndpointDetails.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/NetworkEndpointDetails.java new file mode 100644 index 00000000000..ac7d9227e04 --- /dev/null +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/NetworkEndpointDetails.java @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.visualbuilder.model; + +/** + * Base representation of a network endpoint. In input payload to update an Visual Builder instance + * endpoint details, an empty payload will clear out any existing configuration for Public Visual + * Builder instance.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "networkEndpointType", + defaultImpl = NetworkEndpointDetails.class) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = PrivateEndpointDetails.class, + name = "PRIVATE") +}) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public class NetworkEndpointDetails + extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({}) + protected NetworkEndpointDetails() { + super(); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("NetworkEndpointDetails("); + sb.append("super=").append(super.toString()); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof NetworkEndpointDetails)) { + return false; + } + + NetworkEndpointDetails other = (NetworkEndpointDetails) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + super.hashCode(); + return result; + } +} diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/NetworkEndpointType.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/NetworkEndpointType.java new file mode 100644 index 00000000000..d4468f2d5ba --- /dev/null +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/NetworkEndpointType.java @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.visualbuilder.model; + +/** Public/Private endpoint access type. */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") +public enum NetworkEndpointType implements com.oracle.bmc.http.internal.BmcEnum { + Private("PRIVATE"), + + /** + * 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 static final org.slf4j.Logger LOG = + org.slf4j.LoggerFactory.getLogger(NetworkEndpointType.class); + + private final String value; + private static java.util.Map map; + + static { + map = new java.util.HashMap<>(); + for (NetworkEndpointType v : NetworkEndpointType.values()) { + if (v != UnknownEnumValue) { + map.put(v.getValue(), v); + } + } + } + + NetworkEndpointType(String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonValue + public String getValue() { + return value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static NetworkEndpointType create(String key) { + if (map.containsKey(key)) { + return map.get(key); + } + LOG.warn( + "Received unknown value '{}' for enum 'NetworkEndpointType', returning UnknownEnumValue", + key); + return UnknownEnumValue; + } +} diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/PrivateEndpointDetails.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/PrivateEndpointDetails.java new file mode 100644 index 00000000000..e02e68aa7ba --- /dev/null +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/PrivateEndpointDetails.java @@ -0,0 +1,218 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.visualbuilder.model; + +/** + * Private endpoint configuration details.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = PrivateEndpointDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "networkEndpointType") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class PrivateEndpointDetails extends NetworkEndpointDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + /** The subnet OCID for the private endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private String subnetId; + + /** + * The subnet OCID for the private endpoint. + * + * @param subnetId the value to set + * @return this builder + */ + public Builder subnetId(String subnetId) { + this.subnetId = subnetId; + this.__explicitlySet__.add("subnetId"); + return this; + } + /** Network Security Group OCIDs for the Private Endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("networkSecurityGroupIds") + private java.util.List networkSecurityGroupIds; + + /** + * Network Security Group OCIDs for the Private Endpoint. + * + * @param networkSecurityGroupIds the value to set + * @return this builder + */ + public Builder networkSecurityGroupIds(java.util.List networkSecurityGroupIds) { + this.networkSecurityGroupIds = networkSecurityGroupIds; + this.__explicitlySet__.add("networkSecurityGroupIds"); + return this; + } + /** The IP address to be assigned to Private Endpoint */ + @com.fasterxml.jackson.annotation.JsonProperty("privateEndpointIp") + private String privateEndpointIp; + + /** + * The IP address to be assigned to Private Endpoint + * + * @param privateEndpointIp the value to set + * @return this builder + */ + public Builder privateEndpointIp(String privateEndpointIp) { + this.privateEndpointIp = privateEndpointIp; + this.__explicitlySet__.add("privateEndpointIp"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public PrivateEndpointDetails build() { + PrivateEndpointDetails model = + new PrivateEndpointDetails( + this.subnetId, this.networkSecurityGroupIds, this.privateEndpointIp); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(PrivateEndpointDetails model) { + if (model.wasPropertyExplicitlySet("subnetId")) { + this.subnetId(model.getSubnetId()); + } + if (model.wasPropertyExplicitlySet("networkSecurityGroupIds")) { + this.networkSecurityGroupIds(model.getNetworkSecurityGroupIds()); + } + if (model.wasPropertyExplicitlySet("privateEndpointIp")) { + this.privateEndpointIp(model.getPrivateEndpointIp()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public PrivateEndpointDetails( + String subnetId, + java.util.List networkSecurityGroupIds, + String privateEndpointIp) { + super(); + this.subnetId = subnetId; + this.networkSecurityGroupIds = networkSecurityGroupIds; + this.privateEndpointIp = privateEndpointIp; + } + + /** The subnet OCID for the private endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private final String subnetId; + + /** + * The subnet OCID for the private endpoint. + * + * @return the value + */ + public String getSubnetId() { + return subnetId; + } + + /** Network Security Group OCIDs for the Private Endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("networkSecurityGroupIds") + private final java.util.List networkSecurityGroupIds; + + /** + * Network Security Group OCIDs for the Private Endpoint. + * + * @return the value + */ + public java.util.List getNetworkSecurityGroupIds() { + return networkSecurityGroupIds; + } + + /** The IP address to be assigned to Private Endpoint */ + @com.fasterxml.jackson.annotation.JsonProperty("privateEndpointIp") + private final String privateEndpointIp; + + /** + * The IP address to be assigned to Private Endpoint + * + * @return the value + */ + public String getPrivateEndpointIp() { + return privateEndpointIp; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("PrivateEndpointDetails("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", subnetId=").append(String.valueOf(this.subnetId)); + sb.append(", networkSecurityGroupIds=") + .append(String.valueOf(this.networkSecurityGroupIds)); + sb.append(", privateEndpointIp=").append(String.valueOf(this.privateEndpointIp)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof PrivateEndpointDetails)) { + return false; + } + + PrivateEndpointDetails other = (PrivateEndpointDetails) o; + return java.util.Objects.equals(this.subnetId, other.subnetId) + && java.util.Objects.equals( + this.networkSecurityGroupIds, other.networkSecurityGroupIds) + && java.util.Objects.equals(this.privateEndpointIp, other.privateEndpointIp) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = (result * PRIME) + (this.subnetId == null ? 43 : this.subnetId.hashCode()); + result = + (result * PRIME) + + (this.networkSecurityGroupIds == null + ? 43 + : this.networkSecurityGroupIds.hashCode()); + result = + (result * PRIME) + + (this.privateEndpointIp == null ? 43 : this.privateEndpointIp.hashCode()); + return result; + } +} diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdateNetworkEndpointDetails.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdateNetworkEndpointDetails.java new file mode 100644 index 00000000000..5327f9ba53b --- /dev/null +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdateNetworkEndpointDetails.java @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.visualbuilder.model; + +/** + * Base representation of a network endpoint. In input payload to update an Visual Builder instance + * endpoint details, an empty payload will clear out any existing configuration for Public Visual + * Builder instance.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "networkEndpointType", + defaultImpl = UpdateNetworkEndpointDetails.class) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type( + value = UpdatePrivateEndpointDetails.class, + name = "PRIVATE") +}) +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public class UpdateNetworkEndpointDetails + extends com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel { + @Deprecated + @java.beans.ConstructorProperties({}) + protected UpdateNetworkEndpointDetails() { + super(); + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("UpdateNetworkEndpointDetails("); + sb.append("super=").append(super.toString()); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof UpdateNetworkEndpointDetails)) { + return false; + } + + UpdateNetworkEndpointDetails other = (UpdateNetworkEndpointDetails) o; + return super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = 1; + result = (result * PRIME) + super.hashCode(); + return result; + } +} diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdatePrivateEndpointDetails.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdatePrivateEndpointDetails.java new file mode 100644 index 00000000000..efe3220e445 --- /dev/null +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdatePrivateEndpointDetails.java @@ -0,0 +1,186 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.visualbuilder.model; + +/** + * Private endpoint update configuration details.
+ * 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 Builder#__explicitlySet__}. The {@link + * #hashCode()} and {@link #equals(Object)} methods are implemented to take the explicitly set + * fields into account. The constructor, on the other hand, does not take the explicitly set fields + * into account (since the constructor cannot distinguish explicit {@code null} from unset {@code + * null}). + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize( + builder = UpdatePrivateEndpointDetails.Builder.class) +@com.fasterxml.jackson.annotation.JsonTypeInfo( + use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, + include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, + property = "networkEndpointType") +@com.fasterxml.jackson.annotation.JsonFilter( + com.oracle.bmc.http.client.internal.ExplicitlySetBmcModel.EXPLICITLY_SET_FILTER_NAME) +public final class UpdatePrivateEndpointDetails extends UpdateNetworkEndpointDetails { + @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") + public static class Builder { + /** + * The subnet OCID for the private endpoint. If provided then a new Private Endpoint will be + * created and a new Private Endpoint IP may be generated. + */ + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private String subnetId; + + /** + * The subnet OCID for the private endpoint. If provided then a new Private Endpoint will be + * created and a new Private Endpoint IP may be generated. + * + * @param subnetId the value to set + * @return this builder + */ + public Builder subnetId(String subnetId) { + this.subnetId = subnetId; + this.__explicitlySet__.add("subnetId"); + return this; + } + /** Network Security Group OCIDs for the Private Endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("networkSecurityGroupIds") + private java.util.List networkSecurityGroupIds; + + /** + * Network Security Group OCIDs for the Private Endpoint. + * + * @param networkSecurityGroupIds the value to set + * @return this builder + */ + public Builder networkSecurityGroupIds(java.util.List networkSecurityGroupIds) { + this.networkSecurityGroupIds = networkSecurityGroupIds; + this.__explicitlySet__.add("networkSecurityGroupIds"); + return this; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + private final java.util.Set __explicitlySet__ = new java.util.HashSet(); + + public UpdatePrivateEndpointDetails build() { + UpdatePrivateEndpointDetails model = + new UpdatePrivateEndpointDetails(this.subnetId, this.networkSecurityGroupIds); + for (String explicitlySetProperty : this.__explicitlySet__) { + model.markPropertyAsExplicitlySet(explicitlySetProperty); + } + return model; + } + + @com.fasterxml.jackson.annotation.JsonIgnore + public Builder copy(UpdatePrivateEndpointDetails model) { + if (model.wasPropertyExplicitlySet("subnetId")) { + this.subnetId(model.getSubnetId()); + } + if (model.wasPropertyExplicitlySet("networkSecurityGroupIds")) { + this.networkSecurityGroupIds(model.getNetworkSecurityGroupIds()); + } + return this; + } + } + + /** Create a new builder. */ + public static Builder builder() { + return new Builder(); + } + + public Builder toBuilder() { + return new Builder().copy(this); + } + + @Deprecated + public UpdatePrivateEndpointDetails( + String subnetId, java.util.List networkSecurityGroupIds) { + super(); + this.subnetId = subnetId; + this.networkSecurityGroupIds = networkSecurityGroupIds; + } + + /** + * The subnet OCID for the private endpoint. If provided then a new Private Endpoint will be + * created and a new Private Endpoint IP may be generated. + */ + @com.fasterxml.jackson.annotation.JsonProperty("subnetId") + private final String subnetId; + + /** + * The subnet OCID for the private endpoint. If provided then a new Private Endpoint will be + * created and a new Private Endpoint IP may be generated. + * + * @return the value + */ + public String getSubnetId() { + return subnetId; + } + + /** Network Security Group OCIDs for the Private Endpoint. */ + @com.fasterxml.jackson.annotation.JsonProperty("networkSecurityGroupIds") + private final java.util.List networkSecurityGroupIds; + + /** + * Network Security Group OCIDs for the Private Endpoint. + * + * @return the value + */ + public java.util.List getNetworkSecurityGroupIds() { + return networkSecurityGroupIds; + } + + @Override + public String toString() { + return this.toString(true); + } + + /** + * Return a string representation of the object. + * + * @param includeByteArrayContents true to include the full contents of byte arrays + * @return string representation + */ + public String toString(boolean includeByteArrayContents) { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("UpdatePrivateEndpointDetails("); + sb.append("super=").append(super.toString(includeByteArrayContents)); + sb.append(", subnetId=").append(String.valueOf(this.subnetId)); + sb.append(", networkSecurityGroupIds=") + .append(String.valueOf(this.networkSecurityGroupIds)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof UpdatePrivateEndpointDetails)) { + return false; + } + + UpdatePrivateEndpointDetails other = (UpdatePrivateEndpointDetails) o; + return java.util.Objects.equals(this.subnetId, other.subnetId) + && java.util.Objects.equals( + this.networkSecurityGroupIds, other.networkSecurityGroupIds) + && super.equals(other); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = (result * PRIME) + (this.subnetId == null ? 43 : this.subnetId.hashCode()); + result = + (result * PRIME) + + (this.networkSecurityGroupIds == null + ? 43 + : this.networkSecurityGroupIds.hashCode()); + return result; + } +} diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdateVbInstanceDetails.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdateVbInstanceDetails.java index cbb2a8c7119..ba4bce0f809 100644 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdateVbInstanceDetails.java +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/UpdateVbInstanceDetails.java @@ -31,7 +31,8 @@ public final class UpdateVbInstanceDetails "nodeCount", "isVisualBuilderEnabled", "customEndpoint", - "alternateCustomEndpoints" + "alternateCustomEndpoints", + "networkEndpointDetails" }) public UpdateVbInstanceDetails( String displayName, @@ -41,7 +42,8 @@ public UpdateVbInstanceDetails( Integer nodeCount, Boolean isVisualBuilderEnabled, UpdateCustomEndpointDetails customEndpoint, - java.util.List alternateCustomEndpoints) { + java.util.List alternateCustomEndpoints, + UpdateNetworkEndpointDetails networkEndpointDetails) { super(); this.displayName = displayName; this.freeformTags = freeformTags; @@ -51,6 +53,7 @@ public UpdateVbInstanceDetails( this.isVisualBuilderEnabled = isVisualBuilderEnabled; this.customEndpoint = customEndpoint; this.alternateCustomEndpoints = alternateCustomEndpoints; + this.networkEndpointDetails = networkEndpointDetails; } @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @@ -190,6 +193,15 @@ public Builder alternateCustomEndpoints( return this; } + @com.fasterxml.jackson.annotation.JsonProperty("networkEndpointDetails") + private UpdateNetworkEndpointDetails networkEndpointDetails; + + public Builder networkEndpointDetails(UpdateNetworkEndpointDetails networkEndpointDetails) { + this.networkEndpointDetails = networkEndpointDetails; + this.__explicitlySet__.add("networkEndpointDetails"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -203,7 +215,8 @@ public UpdateVbInstanceDetails build() { this.nodeCount, this.isVisualBuilderEnabled, this.customEndpoint, - this.alternateCustomEndpoints); + this.alternateCustomEndpoints, + this.networkEndpointDetails); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -236,6 +249,9 @@ public Builder copy(UpdateVbInstanceDetails model) { if (model.wasPropertyExplicitlySet("alternateCustomEndpoints")) { this.alternateCustomEndpoints(model.getAlternateCustomEndpoints()); } + if (model.wasPropertyExplicitlySet("networkEndpointDetails")) { + this.networkEndpointDetails(model.getNetworkEndpointDetails()); + } return this; } } @@ -363,6 +379,13 @@ public java.util.List getAlternateCustomEndpoints() return alternateCustomEndpoints; } + @com.fasterxml.jackson.annotation.JsonProperty("networkEndpointDetails") + private final UpdateNetworkEndpointDetails networkEndpointDetails; + + public UpdateNetworkEndpointDetails getNetworkEndpointDetails() { + return networkEndpointDetails; + } + @Override public String toString() { return this.toString(true); @@ -387,6 +410,7 @@ public String toString(boolean includeByteArrayContents) { sb.append(", customEndpoint=").append(String.valueOf(this.customEndpoint)); sb.append(", alternateCustomEndpoints=") .append(String.valueOf(this.alternateCustomEndpoints)); + sb.append(", networkEndpointDetails=").append(String.valueOf(this.networkEndpointDetails)); sb.append(")"); return sb.toString(); } @@ -411,6 +435,8 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.customEndpoint, other.customEndpoint) && java.util.Objects.equals( this.alternateCustomEndpoints, other.alternateCustomEndpoints) + && java.util.Objects.equals( + this.networkEndpointDetails, other.networkEndpointDetails) && super.equals(other); } @@ -436,6 +462,11 @@ public int hashCode() { + (this.alternateCustomEndpoints == null ? 43 : this.alternateCustomEndpoints.hashCode()); + result = + (result * PRIME) + + (this.networkEndpointDetails == null + ? 43 + : this.networkEndpointDetails.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/VbInstance.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/VbInstance.java index c65fb02a892..7694d672ab9 100644 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/VbInstance.java +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/VbInstance.java @@ -38,12 +38,11 @@ public final class VbInstance extends com.oracle.bmc.http.client.internal.Explic "customEndpoint", "alternateCustomEndpoints", "consumptionModel", - "idcsInfo", - "attachments", "serviceNatGatewayIp", "managementNatGatewayIp", "serviceVcnId", - "managementVcnId" + "managementVcnId", + "networkEndpointDetails" }) public VbInstance( String id, @@ -62,12 +61,11 @@ public VbInstance( CustomEndpointDetails customEndpoint, java.util.List alternateCustomEndpoints, ConsumptionModel consumptionModel, - IdcsInfoDetails idcsInfo, - java.util.List attachments, String serviceNatGatewayIp, String managementNatGatewayIp, String serviceVcnId, - String managementVcnId) { + String managementVcnId, + NetworkEndpointDetails networkEndpointDetails) { super(); this.id = id; this.displayName = displayName; @@ -85,12 +83,11 @@ public VbInstance( this.customEndpoint = customEndpoint; this.alternateCustomEndpoints = alternateCustomEndpoints; this.consumptionModel = consumptionModel; - this.idcsInfo = idcsInfo; - this.attachments = attachments; this.serviceNatGatewayIp = serviceNatGatewayIp; this.managementNatGatewayIp = managementNatGatewayIp; this.serviceVcnId = serviceVcnId; this.managementVcnId = managementVcnId; + this.networkEndpointDetails = networkEndpointDetails; } @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @@ -347,30 +344,6 @@ public Builder consumptionModel(ConsumptionModel consumptionModel) { this.__explicitlySet__.add("consumptionModel"); return this; } - - @com.fasterxml.jackson.annotation.JsonProperty("idcsInfo") - private IdcsInfoDetails idcsInfo; - - public Builder idcsInfo(IdcsInfoDetails idcsInfo) { - this.idcsInfo = idcsInfo; - this.__explicitlySet__.add("idcsInfo"); - return this; - } - /** A list of associated attachments to other services */ - @com.fasterxml.jackson.annotation.JsonProperty("attachments") - private java.util.List attachments; - - /** - * A list of associated attachments to other services - * - * @param attachments the value to set - * @return this builder - */ - public Builder attachments(java.util.List attachments) { - this.attachments = attachments; - this.__explicitlySet__.add("attachments"); - return this; - } /** The NAT gateway IP address for the VB service VCN */ @com.fasterxml.jackson.annotation.JsonProperty("serviceNatGatewayIp") private String serviceNatGatewayIp; @@ -432,6 +405,15 @@ public Builder managementVcnId(String managementVcnId) { return this; } + @com.fasterxml.jackson.annotation.JsonProperty("networkEndpointDetails") + private NetworkEndpointDetails networkEndpointDetails; + + public Builder networkEndpointDetails(NetworkEndpointDetails networkEndpointDetails) { + this.networkEndpointDetails = networkEndpointDetails; + this.__explicitlySet__.add("networkEndpointDetails"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -454,12 +436,11 @@ public VbInstance build() { this.customEndpoint, this.alternateCustomEndpoints, this.consumptionModel, - this.idcsInfo, - this.attachments, this.serviceNatGatewayIp, this.managementNatGatewayIp, this.serviceVcnId, - this.managementVcnId); + this.managementVcnId, + this.networkEndpointDetails); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -516,12 +497,6 @@ public Builder copy(VbInstance model) { if (model.wasPropertyExplicitlySet("consumptionModel")) { this.consumptionModel(model.getConsumptionModel()); } - if (model.wasPropertyExplicitlySet("idcsInfo")) { - this.idcsInfo(model.getIdcsInfo()); - } - if (model.wasPropertyExplicitlySet("attachments")) { - this.attachments(model.getAttachments()); - } if (model.wasPropertyExplicitlySet("serviceNatGatewayIp")) { this.serviceNatGatewayIp(model.getServiceNatGatewayIp()); } @@ -534,6 +509,9 @@ public Builder copy(VbInstance model) { if (model.wasPropertyExplicitlySet("managementVcnId")) { this.managementVcnId(model.getManagementVcnId()); } + if (model.wasPropertyExplicitlySet("networkEndpointDetails")) { + this.networkEndpointDetails(model.getNetworkEndpointDetails()); + } return this; } } @@ -863,26 +841,6 @@ public ConsumptionModel getConsumptionModel() { return consumptionModel; } - @com.fasterxml.jackson.annotation.JsonProperty("idcsInfo") - private final IdcsInfoDetails idcsInfo; - - public IdcsInfoDetails getIdcsInfo() { - return idcsInfo; - } - - /** A list of associated attachments to other services */ - @com.fasterxml.jackson.annotation.JsonProperty("attachments") - private final java.util.List attachments; - - /** - * A list of associated attachments to other services - * - * @return the value - */ - public java.util.List getAttachments() { - return attachments; - } - /** The NAT gateway IP address for the VB service VCN */ @com.fasterxml.jackson.annotation.JsonProperty("serviceNatGatewayIp") private final String serviceNatGatewayIp; @@ -935,6 +893,13 @@ public String getManagementVcnId() { return managementVcnId; } + @com.fasterxml.jackson.annotation.JsonProperty("networkEndpointDetails") + private final NetworkEndpointDetails networkEndpointDetails; + + public NetworkEndpointDetails getNetworkEndpointDetails() { + return networkEndpointDetails; + } + @Override public String toString() { return this.toString(true); @@ -967,12 +932,11 @@ public String toString(boolean includeByteArrayContents) { sb.append(", alternateCustomEndpoints=") .append(String.valueOf(this.alternateCustomEndpoints)); sb.append(", consumptionModel=").append(String.valueOf(this.consumptionModel)); - sb.append(", idcsInfo=").append(String.valueOf(this.idcsInfo)); - sb.append(", attachments=").append(String.valueOf(this.attachments)); sb.append(", serviceNatGatewayIp=").append(String.valueOf(this.serviceNatGatewayIp)); sb.append(", managementNatGatewayIp=").append(String.valueOf(this.managementNatGatewayIp)); sb.append(", serviceVcnId=").append(String.valueOf(this.serviceVcnId)); sb.append(", managementVcnId=").append(String.valueOf(this.managementVcnId)); + sb.append(", networkEndpointDetails=").append(String.valueOf(this.networkEndpointDetails)); sb.append(")"); return sb.toString(); } @@ -1005,13 +969,13 @@ public boolean equals(Object o) { && java.util.Objects.equals( this.alternateCustomEndpoints, other.alternateCustomEndpoints) && java.util.Objects.equals(this.consumptionModel, other.consumptionModel) - && java.util.Objects.equals(this.idcsInfo, other.idcsInfo) - && java.util.Objects.equals(this.attachments, other.attachments) && java.util.Objects.equals(this.serviceNatGatewayIp, other.serviceNatGatewayIp) && java.util.Objects.equals( this.managementNatGatewayIp, other.managementNatGatewayIp) && java.util.Objects.equals(this.serviceVcnId, other.serviceVcnId) && java.util.Objects.equals(this.managementVcnId, other.managementVcnId) + && java.util.Objects.equals( + this.networkEndpointDetails, other.networkEndpointDetails) && super.equals(other); } @@ -1051,8 +1015,6 @@ public int hashCode() { result = (result * PRIME) + (this.consumptionModel == null ? 43 : this.consumptionModel.hashCode()); - result = (result * PRIME) + (this.idcsInfo == null ? 43 : this.idcsInfo.hashCode()); - result = (result * PRIME) + (this.attachments == null ? 43 : this.attachments.hashCode()); result = (result * PRIME) + (this.serviceNatGatewayIp == null @@ -1067,6 +1029,11 @@ public int hashCode() { result = (result * PRIME) + (this.managementVcnId == null ? 43 : this.managementVcnId.hashCode()); + result = + (result * PRIME) + + (this.networkEndpointDetails == null + ? 43 + : this.networkEndpointDetails.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/VbInstanceSummary.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/VbInstanceSummary.java index 776875a3e0c..d7a50949f6b 100644 --- a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/VbInstanceSummary.java +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/model/VbInstanceSummary.java @@ -39,7 +39,8 @@ public final class VbInstanceSummary "consumptionModel", "freeformTags", "definedTags", - "systemTags" + "systemTags", + "networkEndpointDetails" }) public VbInstanceSummary( String id, @@ -57,7 +58,8 @@ public VbInstanceSummary( ConsumptionModel consumptionModel, java.util.Map freeformTags, java.util.Map> definedTags, - java.util.Map> systemTags) { + java.util.Map> systemTags, + NetworkEndpointDetails networkEndpointDetails) { super(); this.id = id; this.displayName = displayName; @@ -75,6 +77,7 @@ public VbInstanceSummary( this.freeformTags = freeformTags; this.definedTags = definedTags; this.systemTags = systemTags; + this.networkEndpointDetails = networkEndpointDetails; } @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "") @@ -332,6 +335,15 @@ public Builder systemTags(java.util.Map> s return this; } + @com.fasterxml.jackson.annotation.JsonProperty("networkEndpointDetails") + private NetworkEndpointDetails networkEndpointDetails; + + public Builder networkEndpointDetails(NetworkEndpointDetails networkEndpointDetails) { + this.networkEndpointDetails = networkEndpointDetails; + this.__explicitlySet__.add("networkEndpointDetails"); + return this; + } + @com.fasterxml.jackson.annotation.JsonIgnore private final java.util.Set __explicitlySet__ = new java.util.HashSet(); @@ -353,7 +365,8 @@ public VbInstanceSummary build() { this.consumptionModel, this.freeformTags, this.definedTags, - this.systemTags); + this.systemTags, + this.networkEndpointDetails); for (String explicitlySetProperty : this.__explicitlySet__) { model.markPropertyAsExplicitlySet(explicitlySetProperty); } @@ -410,6 +423,9 @@ public Builder copy(VbInstanceSummary model) { if (model.wasPropertyExplicitlySet("systemTags")) { this.systemTags(model.getSystemTags()); } + if (model.wasPropertyExplicitlySet("networkEndpointDetails")) { + this.networkEndpointDetails(model.getNetworkEndpointDetails()); + } return this; } } @@ -739,6 +755,13 @@ public java.util.Map> getSystemTags() { return systemTags; } + @com.fasterxml.jackson.annotation.JsonProperty("networkEndpointDetails") + private final NetworkEndpointDetails networkEndpointDetails; + + public NetworkEndpointDetails getNetworkEndpointDetails() { + return networkEndpointDetails; + } + @Override public String toString() { return this.toString(true); @@ -771,6 +794,7 @@ public String toString(boolean includeByteArrayContents) { sb.append(", freeformTags=").append(String.valueOf(this.freeformTags)); sb.append(", definedTags=").append(String.valueOf(this.definedTags)); sb.append(", systemTags=").append(String.valueOf(this.systemTags)); + sb.append(", networkEndpointDetails=").append(String.valueOf(this.networkEndpointDetails)); sb.append(")"); return sb.toString(); } @@ -803,6 +827,8 @@ public boolean equals(Object o) { && java.util.Objects.equals(this.freeformTags, other.freeformTags) && java.util.Objects.equals(this.definedTags, other.definedTags) && java.util.Objects.equals(this.systemTags, other.systemTags) + && java.util.Objects.equals( + this.networkEndpointDetails, other.networkEndpointDetails) && super.equals(other); } @@ -842,6 +868,11 @@ public int hashCode() { result = (result * PRIME) + (this.freeformTags == null ? 43 : this.freeformTags.hashCode()); result = (result * PRIME) + (this.definedTags == null ? 43 : this.definedTags.hashCode()); result = (result * PRIME) + (this.systemTags == null ? 43 : this.systemTags.hashCode()); + result = + (result * PRIME) + + (this.networkEndpointDetails == null + ? 43 + : this.networkEndpointDetails.hashCode()); result = (result * PRIME) + super.hashCode(); return result; } diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/requests/ReconfigurePrivateEndpointVbInstanceRequest.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/requests/ReconfigurePrivateEndpointVbInstanceRequest.java new file mode 100644 index 00000000000..7324c9cb619 --- /dev/null +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/requests/ReconfigurePrivateEndpointVbInstanceRequest.java @@ -0,0 +1,295 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.visualbuilder.requests; + +import com.oracle.bmc.visualbuilder.model.*; +/** + * Example: Click here to see how to use + * ReconfigurePrivateEndpointVbInstanceRequest. + */ +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") +public class ReconfigurePrivateEndpointVbInstanceRequest + extends com.oracle.bmc.requests.BmcRequest { + + /** Unique Vb Instance identifier. */ + private String vbInstanceId; + + /** Unique Vb Instance identifier. */ + public String getVbInstanceId() { + return vbInstanceId; + } + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the {@code + * 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; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the {@code + * 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. + */ + public String getIfMatch() { + return ifMatch; + } + /** The client request ID for tracing. */ + private String opcRequestId; + + /** The client request ID for tracing. */ + public String getOpcRequestId() { + return opcRequestId; + } + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after 24 + * hours, but can be invalidated before then due to conflicting operations. For example, if a + * resource has been deleted and purged from the system, then a retry of the original creation + * request might be rejected. + */ + private String opcRetryToken; + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after 24 + * hours, but can be invalidated before then due to conflicting operations. For example, if a + * resource has been deleted and purged from the system, then a retry of the original creation + * request might be rejected. + */ + public String getOpcRetryToken() { + return opcRetryToken; + } + + public static class Builder + implements com.oracle.bmc.requests.BmcRequest.Builder< + ReconfigurePrivateEndpointVbInstanceRequest, java.lang.Void> { + private com.oracle.bmc.http.client.RequestInterceptor invocationCallback = null; + private com.oracle.bmc.retrier.RetryConfiguration retryConfiguration = null; + + /** Unique Vb Instance identifier. */ + private String vbInstanceId = null; + + /** + * Unique Vb Instance identifier. + * + * @param vbInstanceId the value to set + * @return this builder instance + */ + public Builder vbInstanceId(String vbInstanceId) { + this.vbInstanceId = vbInstanceId; + return this; + } + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the + * {@code 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 = null; + + /** + * For optimistic concurrency control. In the PUT or DELETE call for a resource, set the + * {@code 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. + * + * @param ifMatch the value to set + * @return this builder instance + */ + public Builder ifMatch(String ifMatch) { + this.ifMatch = ifMatch; + return this; + } + + /** The client request ID for tracing. */ + private String opcRequestId = null; + + /** + * The client request ID for tracing. + * + * @param opcRequestId the value to set + * @return this builder instance + */ + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after + * 24 hours, but can be invalidated before then due to conflicting operations. For example, + * if a resource has been deleted and purged from the system, then a retry of the original + * creation request might be rejected. + */ + private String opcRetryToken = null; + + /** + * A token that uniquely identifies a request so it can be retried in case of a timeout or + * server error without risk of executing that same action again. Retry tokens expire after + * 24 hours, but can be invalidated before then due to conflicting operations. For example, + * if a resource has been deleted and purged from the system, then a retry of the original + * creation request might be rejected. + * + * @param opcRetryToken the value to set + * @return this builder instance + */ + public Builder opcRetryToken(String opcRetryToken) { + this.opcRetryToken = opcRetryToken; + return this; + } + + /** + * 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.http.client.RequestInterceptor invocationCallback) { + this.invocationCallback = invocationCallback; + return this; + } + + /** + * Set the retry configuration for the request to be built. + * + * @param retryConfiguration the retry configuration to be used for the request + * @return this builder instance + */ + public Builder retryConfiguration( + com.oracle.bmc.retrier.RetryConfiguration retryConfiguration) { + this.retryConfiguration = retryConfiguration; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * + * @return this builder instance + */ + public Builder copy(ReconfigurePrivateEndpointVbInstanceRequest o) { + vbInstanceId(o.getVbInstanceId()); + ifMatch(o.getIfMatch()); + opcRequestId(o.getOpcRequestId()); + opcRetryToken(o.getOpcRetryToken()); + invocationCallback(o.getInvocationCallback()); + retryConfiguration(o.getRetryConfiguration()); + return this; + } + + /** + * Build the instance of ReconfigurePrivateEndpointVbInstanceRequest as configured by this + * builder + * + *

Note that this method takes calls to {@link + * Builder#invocationCallback(com.oracle.bmc.http.client.RequestInterceptor)} into account, + * while the method {@link Builder#buildWithoutInvocationCallback} does not. + * + *

This is the preferred method to build an instance. + * + * @return instance of ReconfigurePrivateEndpointVbInstanceRequest + */ + public ReconfigurePrivateEndpointVbInstanceRequest build() { + ReconfigurePrivateEndpointVbInstanceRequest request = buildWithoutInvocationCallback(); + request.setInvocationCallback(invocationCallback); + request.setRetryConfiguration(retryConfiguration); + return request; + } + + /** + * Build the instance of ReconfigurePrivateEndpointVbInstanceRequest as configured by this + * builder + * + *

Note that this method does not take calls to {@link + * Builder#invocationCallback(com.oracle.bmc.http.client.RequestInterceptor)} into account, + * while the method {@link Builder#build} does + * + * @return instance of ReconfigurePrivateEndpointVbInstanceRequest + */ + public ReconfigurePrivateEndpointVbInstanceRequest buildWithoutInvocationCallback() { + ReconfigurePrivateEndpointVbInstanceRequest request = + new ReconfigurePrivateEndpointVbInstanceRequest(); + request.vbInstanceId = vbInstanceId; + request.ifMatch = ifMatch; + request.opcRequestId = opcRequestId; + request.opcRetryToken = opcRetryToken; + return request; + // new ReconfigurePrivateEndpointVbInstanceRequest(vbInstanceId, ifMatch, opcRequestId, + // opcRetryToken); + } + } + + /** + * Return an instance of {@link Builder} that allows you to modify request properties. + * + * @return instance of {@link Builder} that allows you to modify request properties. + */ + public Builder toBuilder() { + return new Builder() + .vbInstanceId(vbInstanceId) + .ifMatch(ifMatch) + .opcRequestId(opcRequestId) + .opcRetryToken(opcRetryToken); + } + + /** + * Return a new builder for this request object. + * + * @return builder for the request object + */ + public static Builder builder() { + return new Builder(); + } + + @Override + public String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("("); + sb.append("super=").append(super.toString()); + sb.append(",vbInstanceId=").append(String.valueOf(this.vbInstanceId)); + sb.append(",ifMatch=").append(String.valueOf(this.ifMatch)); + sb.append(",opcRequestId=").append(String.valueOf(this.opcRequestId)); + sb.append(",opcRetryToken=").append(String.valueOf(this.opcRetryToken)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof ReconfigurePrivateEndpointVbInstanceRequest)) { + return false; + } + + ReconfigurePrivateEndpointVbInstanceRequest other = + (ReconfigurePrivateEndpointVbInstanceRequest) o; + return super.equals(o) + && java.util.Objects.equals(this.vbInstanceId, other.vbInstanceId) + && java.util.Objects.equals(this.ifMatch, other.ifMatch) + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId) + && java.util.Objects.equals(this.opcRetryToken, other.opcRetryToken); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = (result * PRIME) + (this.vbInstanceId == null ? 43 : this.vbInstanceId.hashCode()); + result = (result * PRIME) + (this.ifMatch == null ? 43 : this.ifMatch.hashCode()); + result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + result = + (result * PRIME) + + (this.opcRetryToken == null ? 43 : this.opcRetryToken.hashCode()); + return result; + } +} diff --git a/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/responses/ReconfigurePrivateEndpointVbInstanceResponse.java b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/responses/ReconfigurePrivateEndpointVbInstanceResponse.java new file mode 100644 index 00000000000..05000f8b158 --- /dev/null +++ b/bmc-visualbuilder/src/main/java/com/oracle/bmc/visualbuilder/responses/ReconfigurePrivateEndpointVbInstanceResponse.java @@ -0,0 +1,188 @@ +/** + * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. + * This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + */ +package com.oracle.bmc.visualbuilder.responses; + +import com.oracle.bmc.visualbuilder.model.*; + +@jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") +public class ReconfigurePrivateEndpointVbInstanceResponse + extends com.oracle.bmc.responses.BmcResponse { + /** + * Unique Oracle-assigned identifier for the asynchronous request. You can use this to query + * status of the asynchronous operation. + */ + private String opcWorkRequestId; + + /** + * Unique Oracle-assigned identifier for the asynchronous request. You can use this to query + * status of the asynchronous operation. + * + * @return the value + */ + public String getOpcWorkRequestId() { + return opcWorkRequestId; + } + + /** + * 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; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a + * particular request, please provide the request ID. + * + * @return the value + */ + public String getOpcRequestId() { + return opcRequestId; + } + + @java.beans.ConstructorProperties({ + "__httpStatusCode__", + "headers", + "opcWorkRequestId", + "opcRequestId" + }) + private ReconfigurePrivateEndpointVbInstanceResponse( + int __httpStatusCode__, + java.util.Map> headers, + String opcWorkRequestId, + String opcRequestId) { + super(__httpStatusCode__, headers); + this.opcWorkRequestId = opcWorkRequestId; + this.opcRequestId = opcRequestId; + } + + public static class Builder + implements com.oracle.bmc.responses.BmcResponse.Builder< + ReconfigurePrivateEndpointVbInstanceResponse> { + private int __httpStatusCode__; + + @Override + public Builder __httpStatusCode__(int __httpStatusCode__) { + this.__httpStatusCode__ = __httpStatusCode__; + return this; + } + + private java.util.Map> headers; + + @Override + public Builder headers(java.util.Map> headers) { + this.headers = headers; + return this; + } + + /** + * Unique Oracle-assigned identifier for the asynchronous request. You can use this to query + * status of the asynchronous operation. + */ + private String opcWorkRequestId; + + /** + * Unique Oracle-assigned identifier for the asynchronous request. You can use this to query + * status of the asynchronous operation. + * + * @param opcWorkRequestId the value to set + * @return this builder + */ + public Builder opcWorkRequestId(String opcWorkRequestId) { + this.opcWorkRequestId = opcWorkRequestId; + return this; + } + + /** + * 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; + + /** + * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a + * particular request, please provide the request ID. + * + * @param opcRequestId the value to set + * @return this builder + */ + public Builder opcRequestId(String opcRequestId) { + this.opcRequestId = opcRequestId; + return this; + } + + /** + * Copy method to populate the builder with values from the given instance. + * + * @return this builder instance + */ + @Override + public Builder copy(ReconfigurePrivateEndpointVbInstanceResponse o) { + __httpStatusCode__(o.get__httpStatusCode__()); + headers(o.getHeaders()); + opcWorkRequestId(o.getOpcWorkRequestId()); + opcRequestId(o.getOpcRequestId()); + + return this; + } + + /** + * Build the response object. + * + * @return the response object + */ + @Override + public ReconfigurePrivateEndpointVbInstanceResponse build() { + return new ReconfigurePrivateEndpointVbInstanceResponse( + __httpStatusCode__, headers, opcWorkRequestId, opcRequestId); + } + } + + /** + * Return a new builder for this response object. + * + * @return builder for the response object + */ + public static Builder builder() { + return new Builder(); + } + + @Override + public String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder(); + sb.append("("); + sb.append("super=").append(super.toString()); + sb.append(",opcWorkRequestId=").append(String.valueOf(opcWorkRequestId)); + sb.append(",opcRequestId=").append(String.valueOf(opcRequestId)); + sb.append(")"); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof ReconfigurePrivateEndpointVbInstanceResponse)) { + return false; + } + + ReconfigurePrivateEndpointVbInstanceResponse other = + (ReconfigurePrivateEndpointVbInstanceResponse) o; + return super.equals(o) + && java.util.Objects.equals(this.opcWorkRequestId, other.opcWorkRequestId) + && java.util.Objects.equals(this.opcRequestId, other.opcRequestId); + } + + @Override + public int hashCode() { + final int PRIME = 59; + int result = super.hashCode(); + result = + (result * PRIME) + + (this.opcWorkRequestId == null ? 43 : this.opcWorkRequestId.hashCode()); + result = (result * PRIME) + (this.opcRequestId == null ? 43 : this.opcRequestId.hashCode()); + return result; + } +} diff --git a/bmc-visualbuilder/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-visualbuilder/reflect-config.json b/bmc-visualbuilder/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-visualbuilder/reflect-config.json index 4eb48096a74..7fc1e8081d0 100644 --- a/bmc-visualbuilder/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-visualbuilder/reflect-config.json +++ b/bmc-visualbuilder/src/main/resources/META-INF/native-image/com.oracle.oci.sdk/oci-java-sdk-visualbuilder/reflect-config.json @@ -33,26 +33,6 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, - { - "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, - "name": "com.oracle.bmc.visualbuilder.model.AttachmentDetails", - "allDeclaredFields": true, - "allDeclaredMethods": true, - "queryAllDeclaredConstructors": true - }, - { - "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, - "name": "com.oracle.bmc.visualbuilder.model.AttachmentDetails$Builder", - "allDeclaredFields": true, - "allDeclaredMethods": true, - "allDeclaredConstructors": true - }, - { - "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, - "name": "com.oracle.bmc.visualbuilder.model.AttachmentDetails$TargetRole", - "allDeclaredFields": true, - "allDeclaredMethods": true - }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.visualbuilder.model.ChangeVbInstanceCompartmentDetails", @@ -117,14 +97,27 @@ }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, - "name": "com.oracle.bmc.visualbuilder.model.IdcsInfoDetails", + "name": "com.oracle.bmc.visualbuilder.model.NetworkEndpointDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.visualbuilder.model.NetworkEndpointType", + "allDeclaredFields": true, + "allDeclaredMethods": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.visualbuilder.model.PrivateEndpointDetails", "allDeclaredFields": true, "allDeclaredMethods": true, "queryAllDeclaredConstructors": true }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, - "name": "com.oracle.bmc.visualbuilder.model.IdcsInfoDetails$Builder", + "name": "com.oracle.bmc.visualbuilder.model.PrivateEndpointDetails$Builder", "allDeclaredFields": true, "allDeclaredMethods": true, "allDeclaredConstructors": true @@ -157,6 +150,27 @@ "allDeclaredMethods": true, "allDeclaredConstructors": true }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.visualbuilder.model.UpdateNetworkEndpointDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.visualbuilder.model.UpdatePrivateEndpointDetails", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "queryAllDeclaredConstructors": true + }, + { + "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, + "name": "com.oracle.bmc.visualbuilder.model.UpdatePrivateEndpointDetails$Builder", + "allDeclaredFields": true, + "allDeclaredMethods": true, + "allDeclaredConstructors": true + }, { "condition" : { "typeReachable" : "com.fasterxml.jackson.databind.ObjectMapper" }, "name": "com.oracle.bmc.visualbuilder.model.UpdateVbInstanceDetails", diff --git a/bmc-visualbuilder/src/main/resources/com/oracle/bmc/visualbuilder/client.properties b/bmc-visualbuilder/src/main/resources/com/oracle/bmc/visualbuilder/client.properties index 07c40db006c..2789768f4d1 100644 --- a/bmc-visualbuilder/src/main/resources/com/oracle/bmc/visualbuilder/client.properties +++ b/bmc-visualbuilder/src/main/resources/com/oracle/bmc/visualbuilder/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210601") \ No newline at end of file diff --git a/bmc-vnmonitoring/pom.xml b/bmc-vnmonitoring/pom.xml index 36c183dae92..6de2550c5f3 100644 --- a/bmc-vnmonitoring/pom.xml +++ b/bmc-vnmonitoring/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-vnmonitoring @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-vnmonitoring/src/main/resources/com/oracle/bmc/vnmonitoring/client.properties b/bmc-vnmonitoring/src/main/resources/com/oracle/bmc/vnmonitoring/client.properties index 73df68dc2f1..0ca15ebfe64 100644 --- a/bmc-vnmonitoring/src/main/resources/com/oracle/bmc/vnmonitoring/client.properties +++ b/bmc-vnmonitoring/src/main/resources/com/oracle/bmc/vnmonitoring/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") \ No newline at end of file diff --git a/bmc-vulnerabilityscanning/pom.xml b/bmc-vulnerabilityscanning/pom.xml index dd6c6dd8154..5b8a64a94b1 100644 --- a/bmc-vulnerabilityscanning/pom.xml +++ b/bmc-vulnerabilityscanning/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-vulnerabilityscanning @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-vulnerabilityscanning/src/main/resources/com/oracle/bmc/vulnerabilityscanning/client.properties b/bmc-vulnerabilityscanning/src/main/resources/com/oracle/bmc/vulnerabilityscanning/client.properties index dd5c99a3441..7ddbdc9abf7 100644 --- a/bmc-vulnerabilityscanning/src/main/resources/com/oracle/bmc/vulnerabilityscanning/client.properties +++ b/bmc-vulnerabilityscanning/src/main/resources/com/oracle/bmc/vulnerabilityscanning/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210215") \ No newline at end of file diff --git a/bmc-waa/pom.xml b/bmc-waa/pom.xml index 99e31219d09..bf6f939ace2 100644 --- a/bmc-waa/pom.xml +++ b/bmc-waa/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-waa @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-waa/src/main/resources/com/oracle/bmc/waa/client.properties b/bmc-waa/src/main/resources/com/oracle/bmc/waa/client.properties index d09eb4e88bc..316db832c27 100644 --- a/bmc-waa/src/main/resources/com/oracle/bmc/waa/client.properties +++ b/bmc-waa/src/main/resources/com/oracle/bmc/waa/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20211230") \ No newline at end of file diff --git a/bmc-waas/pom.xml b/bmc-waas/pom.xml index 91b84656d23..160c257c5d0 100644 --- a/bmc-waas/pom.xml +++ b/bmc-waas/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-waas @@ -16,7 +16,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-waas/src/main/resources/com/oracle/bmc/waas/client.properties b/bmc-waas/src/main/resources/com/oracle/bmc/waas/client.properties index 134f23a8f62..f7677501e98 100644 --- a/bmc-waas/src/main/resources/com/oracle/bmc/waas/client.properties +++ b/bmc-waas/src/main/resources/com/oracle/bmc/waas/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20181116") \ No newline at end of file diff --git a/bmc-waf/pom.xml b/bmc-waf/pom.xml index b3e2fee4e68..057f295cbda 100644 --- a/bmc-waf/pom.xml +++ b/bmc-waf/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-waf @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-waf/src/main/resources/com/oracle/bmc/waf/client.properties b/bmc-waf/src/main/resources/com/oracle/bmc/waf/client.properties index 329bc60c5f5..30c3e90323b 100644 --- a/bmc-waf/src/main/resources/com/oracle/bmc/waf/client.properties +++ b/bmc-waf/src/main/resources/com/oracle/bmc/waf/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20210930") \ No newline at end of file diff --git a/bmc-workrequests/pom.xml b/bmc-workrequests/pom.xml index 885f62fa9cd..166453545c1 100644 --- a/bmc-workrequests/pom.xml +++ b/bmc-workrequests/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-workrequests @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 diff --git a/bmc-workrequests/src/main/resources/com/oracle/bmc/workrequests/client.properties b/bmc-workrequests/src/main/resources/com/oracle/bmc/workrequests/client.properties index 73df68dc2f1..0ca15ebfe64 100644 --- a/bmc-workrequests/src/main/resources/com/oracle/bmc/workrequests/client.properties +++ b/bmc-workrequests/src/main/resources/com/oracle/bmc/workrequests/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918") \ No newline at end of file diff --git a/bmc-zpr/pom.xml b/bmc-zpr/pom.xml index 2951966868a..5e38ef27321 100644 --- a/bmc-zpr/pom.xml +++ b/bmc-zpr/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 ../pom.xml oci-java-sdk-zpr @@ -15,7 +15,7 @@ com.oracle.oci.sdk oci-java-sdk-common - 3.54.0 + 3.55.0 \ No newline at end of file diff --git a/bmc-zpr/src/main/java/com/oracle/bmc/zpr/ZprAsyncClient.java b/bmc-zpr/src/main/java/com/oracle/bmc/zpr/ZprAsyncClient.java index d0a484cbc44..fa1f3a9d4e0 100644 --- a/bmc-zpr/src/main/java/com/oracle/bmc/zpr/ZprAsyncClient.java +++ b/bmc-zpr/src/main/java/com/oracle/bmc/zpr/ZprAsyncClient.java @@ -105,7 +105,10 @@ public java.util.concurrent.Future createConfigurat return clientCall(request, CreateConfigurationResponse::builder) .logger(LOG, "createConfiguration") - .serviceDetails("Zpr", "CreateConfiguration", "") + .serviceDetails( + "Zpr", + "CreateConfiguration", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/Configuration/CreateConfiguration") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateConfigurationRequest::builder) .basePath("/20240301") @@ -134,7 +137,10 @@ public java.util.concurrent.Future createZprPolicy( return clientCall(request, CreateZprPolicyResponse::builder) .logger(LOG, "createZprPolicy") - .serviceDetails("Zpr", "CreateZprPolicy", "") + .serviceDetails( + "Zpr", + "CreateZprPolicy", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicy/CreateZprPolicy") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateZprPolicyRequest::builder) .basePath("/20240301") @@ -168,7 +174,10 @@ public java.util.concurrent.Future deleteZprPolicy( return clientCall(request, DeleteZprPolicyResponse::builder) .logger(LOG, "deleteZprPolicy") - .serviceDetails("Zpr", "DeleteZprPolicy", "") + .serviceDetails( + "Zpr", + "DeleteZprPolicy", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicy/DeleteZprPolicy") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteZprPolicyRequest::builder) .basePath("/20240301") @@ -194,7 +203,10 @@ public java.util.concurrent.Future getConfiguration( return clientCall(request, GetConfigurationResponse::builder) .logger(LOG, "getConfiguration") - .serviceDetails("Zpr", "GetConfiguration", "") + .serviceDetails( + "Zpr", + "GetConfiguration", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/Configuration/GetConfiguration") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetConfigurationRequest::builder) .basePath("/20240301") @@ -224,7 +236,10 @@ public java.util.concurrent.Future getConfiguration( return clientCall(request, GetZprConfigurationWorkRequestResponse::builder) .logger(LOG, "getZprConfigurationWorkRequest") - .serviceDetails("Zpr", "GetZprConfigurationWorkRequest", "") + .serviceDetails( + "Zpr", + "GetZprConfigurationWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequest/GetZprConfigurationWorkRequest") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetZprConfigurationWorkRequestRequest::builder) .basePath("/20240301") @@ -255,7 +270,10 @@ public java.util.concurrent.Future getZprPolicy( return clientCall(request, GetZprPolicyResponse::builder) .logger(LOG, "getZprPolicy") - .serviceDetails("Zpr", "GetZprPolicy", "") + .serviceDetails( + "Zpr", + "GetZprPolicy", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicy/GetZprPolicy") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetZprPolicyRequest::builder) .basePath("/20240301") @@ -283,7 +301,10 @@ public java.util.concurrent.Future getZprPolicy return clientCall(request, GetZprPolicyWorkRequestResponse::builder) .logger(LOG, "getZprPolicyWorkRequest") - .serviceDetails("Zpr", "GetZprPolicyWorkRequest", "") + .serviceDetails( + "Zpr", + "GetZprPolicyWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequest/GetZprPolicyWorkRequest") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetZprPolicyWorkRequestRequest::builder) .basePath("/20240301") @@ -315,7 +336,10 @@ public java.util.concurrent.Future getZprPolicy return clientCall(request, ListZprConfigurationWorkRequestErrorsResponse::builder) .logger(LOG, "listZprConfigurationWorkRequestErrors") - .serviceDetails("Zpr", "ListZprConfigurationWorkRequestErrors", "") + .serviceDetails( + "Zpr", + "ListZprConfigurationWorkRequestErrors", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequestError/ListZprConfigurationWorkRequestErrors") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprConfigurationWorkRequestErrorsRequest::builder) .basePath("/20240301") @@ -354,7 +378,10 @@ public java.util.concurrent.Future getZprPolicy return clientCall(request, ListZprConfigurationWorkRequestLogsResponse::builder) .logger(LOG, "listZprConfigurationWorkRequestLogs") - .serviceDetails("Zpr", "ListZprConfigurationWorkRequestLogs", "") + .serviceDetails( + "Zpr", + "ListZprConfigurationWorkRequestLogs", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequestLogEntry/ListZprConfigurationWorkRequestLogs") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprConfigurationWorkRequestLogsRequest::builder) .basePath("/20240301") @@ -391,7 +418,10 @@ public java.util.concurrent.Future getZprPolicy return clientCall(request, ListZprConfigurationWorkRequestsResponse::builder) .logger(LOG, "listZprConfigurationWorkRequests") - .serviceDetails("Zpr", "ListZprConfigurationWorkRequests", "") + .serviceDetails( + "Zpr", + "ListZprConfigurationWorkRequests", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequest/ListZprConfigurationWorkRequests") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprConfigurationWorkRequestsRequest::builder) .basePath("/20240301") @@ -428,7 +458,10 @@ public java.util.concurrent.Future listZprPolicies( return clientCall(request, ListZprPoliciesResponse::builder) .logger(LOG, "listZprPolicies") - .serviceDetails("Zpr", "ListZprPolicies", "") + .serviceDetails( + "Zpr", + "ListZprPolicies", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicyCollection/ListZprPolicies") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprPoliciesRequest::builder) .basePath("/20240301") @@ -466,7 +499,10 @@ public java.util.concurrent.Future listZprPolicies( return clientCall(request, ListZprPolicyWorkRequestErrorsResponse::builder) .logger(LOG, "listZprPolicyWorkRequestErrors") - .serviceDetails("Zpr", "ListZprPolicyWorkRequestErrors", "") + .serviceDetails( + "Zpr", + "ListZprPolicyWorkRequestErrors", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequestError/ListZprPolicyWorkRequestErrors") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprPolicyWorkRequestErrorsRequest::builder) .basePath("/20240301") @@ -504,7 +540,10 @@ public java.util.concurrent.Future listZprPolicies( return clientCall(request, ListZprPolicyWorkRequestLogsResponse::builder) .logger(LOG, "listZprPolicyWorkRequestLogs") - .serviceDetails("Zpr", "ListZprPolicyWorkRequestLogs", "") + .serviceDetails( + "Zpr", + "ListZprPolicyWorkRequestLogs", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequestLogEntry/ListZprPolicyWorkRequestLogs") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprPolicyWorkRequestLogsRequest::builder) .basePath("/20240301") @@ -537,7 +576,10 @@ public java.util.concurrent.Future listZprPol return clientCall(request, ListZprPolicyWorkRequestsResponse::builder) .logger(LOG, "listZprPolicyWorkRequests") - .serviceDetails("Zpr", "ListZprPolicyWorkRequests", "") + .serviceDetails( + "Zpr", + "ListZprPolicyWorkRequests", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequest/ListZprPolicyWorkRequests") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprPolicyWorkRequestsRequest::builder) .basePath("/20240301") @@ -575,7 +617,10 @@ public java.util.concurrent.Future updateZprPolicy( return clientCall(request, UpdateZprPolicyResponse::builder) .logger(LOG, "updateZprPolicy") - .serviceDetails("Zpr", "UpdateZprPolicy", "") + .serviceDetails( + "Zpr", + "UpdateZprPolicy", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicy/UpdateZprPolicy") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateZprPolicyRequest::builder) .basePath("/20240301") diff --git a/bmc-zpr/src/main/java/com/oracle/bmc/zpr/ZprClient.java b/bmc-zpr/src/main/java/com/oracle/bmc/zpr/ZprClient.java index 2dc7f23e56d..9e38c1cef40 100644 --- a/bmc-zpr/src/main/java/com/oracle/bmc/zpr/ZprClient.java +++ b/bmc-zpr/src/main/java/com/oracle/bmc/zpr/ZprClient.java @@ -127,7 +127,10 @@ public CreateConfigurationResponse createConfiguration(CreateConfigurationReques return clientCall(request, CreateConfigurationResponse::builder) .logger(LOG, "createConfiguration") - .serviceDetails("Zpr", "CreateConfiguration", "") + .serviceDetails( + "Zpr", + "CreateConfiguration", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/Configuration/CreateConfiguration") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateConfigurationRequest::builder) .basePath("/20240301") @@ -153,7 +156,10 @@ public CreateZprPolicyResponse createZprPolicy(CreateZprPolicyRequest request) { return clientCall(request, CreateZprPolicyResponse::builder) .logger(LOG, "createZprPolicy") - .serviceDetails("Zpr", "CreateZprPolicy", "") + .serviceDetails( + "Zpr", + "CreateZprPolicy", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicy/CreateZprPolicy") .method(com.oracle.bmc.http.client.Method.POST) .requestBuilder(CreateZprPolicyRequest::builder) .basePath("/20240301") @@ -184,7 +190,10 @@ public DeleteZprPolicyResponse deleteZprPolicy(DeleteZprPolicyRequest request) { return clientCall(request, DeleteZprPolicyResponse::builder) .logger(LOG, "deleteZprPolicy") - .serviceDetails("Zpr", "DeleteZprPolicy", "") + .serviceDetails( + "Zpr", + "DeleteZprPolicy", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicy/DeleteZprPolicy") .method(com.oracle.bmc.http.client.Method.DELETE) .requestBuilder(DeleteZprPolicyRequest::builder) .basePath("/20240301") @@ -207,7 +216,10 @@ public GetConfigurationResponse getConfiguration(GetConfigurationRequest request return clientCall(request, GetConfigurationResponse::builder) .logger(LOG, "getConfiguration") - .serviceDetails("Zpr", "GetConfiguration", "") + .serviceDetails( + "Zpr", + "GetConfiguration", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/Configuration/GetConfiguration") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetConfigurationRequest::builder) .basePath("/20240301") @@ -233,7 +245,10 @@ public GetZprConfigurationWorkRequestResponse getZprConfigurationWorkRequest( return clientCall(request, GetZprConfigurationWorkRequestResponse::builder) .logger(LOG, "getZprConfigurationWorkRequest") - .serviceDetails("Zpr", "GetZprConfigurationWorkRequest", "") + .serviceDetails( + "Zpr", + "GetZprConfigurationWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequest/GetZprConfigurationWorkRequest") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetZprConfigurationWorkRequestRequest::builder) .basePath("/20240301") @@ -262,7 +277,10 @@ public GetZprPolicyResponse getZprPolicy(GetZprPolicyRequest request) { return clientCall(request, GetZprPolicyResponse::builder) .logger(LOG, "getZprPolicy") - .serviceDetails("Zpr", "GetZprPolicy", "") + .serviceDetails( + "Zpr", + "GetZprPolicy", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicy/GetZprPolicy") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetZprPolicyRequest::builder) .basePath("/20240301") @@ -288,7 +306,10 @@ public GetZprPolicyWorkRequestResponse getZprPolicyWorkRequest( return clientCall(request, GetZprPolicyWorkRequestResponse::builder) .logger(LOG, "getZprPolicyWorkRequest") - .serviceDetails("Zpr", "GetZprPolicyWorkRequest", "") + .serviceDetails( + "Zpr", + "GetZprPolicyWorkRequest", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequest/GetZprPolicyWorkRequest") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(GetZprPolicyWorkRequestRequest::builder) .basePath("/20240301") @@ -316,7 +337,10 @@ public ListZprConfigurationWorkRequestErrorsResponse listZprConfigurationWorkReq return clientCall(request, ListZprConfigurationWorkRequestErrorsResponse::builder) .logger(LOG, "listZprConfigurationWorkRequestErrors") - .serviceDetails("Zpr", "ListZprConfigurationWorkRequestErrors", "") + .serviceDetails( + "Zpr", + "ListZprConfigurationWorkRequestErrors", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequestError/ListZprConfigurationWorkRequestErrors") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprConfigurationWorkRequestErrorsRequest::builder) .basePath("/20240301") @@ -351,7 +375,10 @@ public ListZprConfigurationWorkRequestLogsResponse listZprConfigurationWorkReque return clientCall(request, ListZprConfigurationWorkRequestLogsResponse::builder) .logger(LOG, "listZprConfigurationWorkRequestLogs") - .serviceDetails("Zpr", "ListZprConfigurationWorkRequestLogs", "") + .serviceDetails( + "Zpr", + "ListZprConfigurationWorkRequestLogs", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequestLogEntry/ListZprConfigurationWorkRequestLogs") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprConfigurationWorkRequestLogsRequest::builder) .basePath("/20240301") @@ -384,7 +411,10 @@ public ListZprConfigurationWorkRequestsResponse listZprConfigurationWorkRequests return clientCall(request, ListZprConfigurationWorkRequestsResponse::builder) .logger(LOG, "listZprConfigurationWorkRequests") - .serviceDetails("Zpr", "ListZprConfigurationWorkRequests", "") + .serviceDetails( + "Zpr", + "ListZprConfigurationWorkRequests", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequest/ListZprConfigurationWorkRequests") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprConfigurationWorkRequestsRequest::builder) .basePath("/20240301") @@ -418,7 +448,10 @@ public ListZprPoliciesResponse listZprPolicies(ListZprPoliciesRequest request) { return clientCall(request, ListZprPoliciesResponse::builder) .logger(LOG, "listZprPolicies") - .serviceDetails("Zpr", "ListZprPolicies", "") + .serviceDetails( + "Zpr", + "ListZprPolicies", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicyCollection/ListZprPolicies") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprPoliciesRequest::builder) .basePath("/20240301") @@ -452,7 +485,10 @@ public ListZprPolicyWorkRequestErrorsResponse listZprPolicyWorkRequestErrors( return clientCall(request, ListZprPolicyWorkRequestErrorsResponse::builder) .logger(LOG, "listZprPolicyWorkRequestErrors") - .serviceDetails("Zpr", "ListZprPolicyWorkRequestErrors", "") + .serviceDetails( + "Zpr", + "ListZprPolicyWorkRequestErrors", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequestError/ListZprPolicyWorkRequestErrors") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprPolicyWorkRequestErrorsRequest::builder) .basePath("/20240301") @@ -486,7 +522,10 @@ public ListZprPolicyWorkRequestLogsResponse listZprPolicyWorkRequestLogs( return clientCall(request, ListZprPolicyWorkRequestLogsResponse::builder) .logger(LOG, "listZprPolicyWorkRequestLogs") - .serviceDetails("Zpr", "ListZprPolicyWorkRequestLogs", "") + .serviceDetails( + "Zpr", + "ListZprPolicyWorkRequestLogs", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequestLogEntry/ListZprPolicyWorkRequestLogs") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprPolicyWorkRequestLogsRequest::builder) .basePath("/20240301") @@ -517,7 +556,10 @@ public ListZprPolicyWorkRequestsResponse listZprPolicyWorkRequests( return clientCall(request, ListZprPolicyWorkRequestsResponse::builder) .logger(LOG, "listZprPolicyWorkRequests") - .serviceDetails("Zpr", "ListZprPolicyWorkRequests", "") + .serviceDetails( + "Zpr", + "ListZprPolicyWorkRequests", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/WorkRequest/ListZprPolicyWorkRequests") .method(com.oracle.bmc.http.client.Method.GET) .requestBuilder(ListZprPolicyWorkRequestsRequest::builder) .basePath("/20240301") @@ -552,7 +594,10 @@ public UpdateZprPolicyResponse updateZprPolicy(UpdateZprPolicyRequest request) { return clientCall(request, UpdateZprPolicyResponse::builder) .logger(LOG, "updateZprPolicy") - .serviceDetails("Zpr", "UpdateZprPolicy", "") + .serviceDetails( + "Zpr", + "UpdateZprPolicy", + "https://docs.oracle.com/iaas/api/#/en/zero-trust-packet-routing/20240301/ZprPolicy/UpdateZprPolicy") .method(com.oracle.bmc.http.client.Method.PUT) .requestBuilder(UpdateZprPolicyRequest::builder) .basePath("/20240301") diff --git a/bmc-zpr/src/main/resources/com/oracle/bmc/zpr/client.properties b/bmc-zpr/src/main/resources/com/oracle/bmc/zpr/client.properties index f0a68e64d4c..067e430e315 100644 --- a/bmc-zpr/src/main/resources/com/oracle/bmc/zpr/client.properties +++ b/bmc-zpr/src/main/resources/com/oracle/bmc/zpr/client.properties @@ -3,7 +3,7 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. # -java.client.codegen.version = 2.104 +java.client.codegen.version = 2.113 java.minimum.client.codegen.version.from.client = 2.100 # @jakarta.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20240301") \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4c2de278a6c..2ae798fe522 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.oracle.oci.sdk oci-java-sdk - 3.54.0 + 3.55.0 pom Oracle Cloud Infrastructure SDK This project contains the SDK used for Oracle Cloud Infrastructure @@ -60,7 +60,7 @@ true true com.acme.Undefined - 2.104 + 2.113 @@ -791,4 +791,4 @@ bmc-securityattribute bmc-zpr - \ No newline at end of file +