scopes = new ArrayList<>();
private RetryPolicy retryPolicy;
+ private RetryOptions retryOptions;
private Duration defaultPollInterval;
private Configurable() {
@@ -163,6 +179,19 @@ public Configurable withRetryPolicy(RetryPolicy retryPolicy) {
return this;
}
+ /**
+ * Sets the retry options for the HTTP pipeline retry policy.
+ *
+ * This setting has no effect, if retry policy is set via {@link #withRetryPolicy(RetryPolicy)}.
+ *
+ * @param retryOptions the retry options for the HTTP pipeline retry policy.
+ * @return the configurable object itself.
+ */
+ public Configurable withRetryOptions(RetryOptions retryOptions) {
+ this.retryOptions = Objects.requireNonNull(retryOptions, "'retryOptions' cannot be null.");
+ return this;
+ }
+
/**
* Sets the default poll interval, used when service does not provide "Retry-After" header.
*
@@ -196,7 +225,7 @@ public SourceControlConfigurationManager authenticate(TokenCredential credential
.append("-")
.append("com.azure.resourcemanager.kubernetesconfiguration")
.append("/")
- .append("1.0.0-beta.3");
+ .append("1.0.0-beta.1");
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
userAgentBuilder
.append(" (")
@@ -214,10 +243,15 @@ public SourceControlConfigurationManager authenticate(TokenCredential credential
scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
}
if (retryPolicy == null) {
- retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
+ if (retryOptions != null) {
+ retryPolicy = new RetryPolicy(retryOptions);
+ } else {
+ retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
+ }
}
List policies = new ArrayList<>();
policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
+ policies.add(new AddHeadersFromContextPolicy());
policies.add(new RequestIdPolicy());
policies
.addAll(
@@ -248,7 +282,11 @@ public SourceControlConfigurationManager authenticate(TokenCredential credential
}
}
- /** @return Resource collection API of Extensions. */
+ /**
+ * Gets the resource collection API of Extensions.
+ *
+ * @return Resource collection API of Extensions.
+ */
public Extensions extensions() {
if (this.extensions == null) {
this.extensions = new ExtensionsImpl(clientObject.getExtensions(), this);
@@ -256,7 +294,11 @@ public Extensions extensions() {
return extensions;
}
- /** @return Resource collection API of OperationStatus. */
+ /**
+ * Gets the resource collection API of OperationStatus.
+ *
+ * @return Resource collection API of OperationStatus.
+ */
public OperationStatus operationStatus() {
if (this.operationStatus == null) {
this.operationStatus = new OperationStatusImpl(clientObject.getOperationStatus(), this);
@@ -264,7 +306,11 @@ public OperationStatus operationStatus() {
return operationStatus;
}
- /** @return Resource collection API of FluxConfigurations. */
+ /**
+ * Gets the resource collection API of FluxConfigurations.
+ *
+ * @return Resource collection API of FluxConfigurations.
+ */
public FluxConfigurations fluxConfigurations() {
if (this.fluxConfigurations == null) {
this.fluxConfigurations = new FluxConfigurationsImpl(clientObject.getFluxConfigurations(), this);
@@ -272,7 +318,11 @@ public FluxConfigurations fluxConfigurations() {
return fluxConfigurations;
}
- /** @return Resource collection API of FluxConfigOperationStatus. */
+ /**
+ * Gets the resource collection API of FluxConfigOperationStatus.
+ *
+ * @return Resource collection API of FluxConfigOperationStatus.
+ */
public FluxConfigOperationStatus fluxConfigOperationStatus() {
if (this.fluxConfigOperationStatus == null) {
this.fluxConfigOperationStatus =
@@ -281,7 +331,11 @@ public FluxConfigOperationStatus fluxConfigOperationStatus() {
return fluxConfigOperationStatus;
}
- /** @return Resource collection API of SourceControlConfigurations. */
+ /**
+ * Gets the resource collection API of SourceControlConfigurations.
+ *
+ * @return Resource collection API of SourceControlConfigurations.
+ */
public SourceControlConfigurations sourceControlConfigurations() {
if (this.sourceControlConfigurations == null) {
this.sourceControlConfigurations =
@@ -290,7 +344,11 @@ public SourceControlConfigurations sourceControlConfigurations() {
return sourceControlConfigurations;
}
- /** @return Resource collection API of Operations. */
+ /**
+ * Gets the resource collection API of Operations.
+ *
+ * @return Resource collection API of Operations.
+ */
public Operations operations() {
if (this.operations == null) {
this.operations = new OperationsImpl(clientObject.getOperations(), this);
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationInner.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationInner.java
index b3b652c0a87d..c9fc2fa3fe24 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationInner.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationInner.java
@@ -7,6 +7,7 @@
import com.azure.core.annotation.Fluent;
import com.azure.core.management.ProxyResource;
import com.azure.core.management.SystemData;
+import com.azure.resourcemanager.kubernetesconfiguration.models.AzureBlobDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.BucketDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.FluxComplianceState;
import com.azure.resourcemanager.kubernetesconfiguration.models.GitRepositoryDefinition;
@@ -197,6 +198,29 @@ public FluxConfigurationInner withBucket(BucketDefinition bucket) {
return this;
}
+ /**
+ * Get the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @return the azureBlob value.
+ */
+ public AzureBlobDefinition azureBlob() {
+ return this.innerProperties() == null ? null : this.innerProperties().azureBlob();
+ }
+
+ /**
+ * Set the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @param azureBlob the azureBlob value to set.
+ * @return the FluxConfigurationInner object itself.
+ */
+ public FluxConfigurationInner withAzureBlob(AzureBlobDefinition azureBlob) {
+ if (this.innerProperties() == null) {
+ this.innerProperties = new FluxConfigurationProperties();
+ }
+ this.innerProperties().withAzureBlob(azureBlob);
+ return this;
+ }
+
/**
* Get the kustomizations property: Array of kustomizations used to reconcile the artifact pulled by the source type
* on the cluster.
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationPatchProperties.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationPatchProperties.java
index 11753307766a..e587e57e32a2 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationPatchProperties.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationPatchProperties.java
@@ -5,6 +5,7 @@
package com.azure.resourcemanager.kubernetesconfiguration.fluent.models;
import com.azure.core.annotation.Fluent;
+import com.azure.resourcemanager.kubernetesconfiguration.models.AzureBlobPatchDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.BucketPatchDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.GitRepositoryPatchDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.KustomizationPatchDefinition;
@@ -41,6 +42,12 @@ public final class FluxConfigurationPatchProperties {
@JsonProperty(value = "bucket")
private BucketPatchDefinition bucket;
+ /*
+ * Parameters to reconcile to the AzureBlob source kind type.
+ */
+ @JsonProperty(value = "azureBlob")
+ private AzureBlobPatchDefinition azureBlob;
+
/*
* Array of kustomizations used to reconcile the artifact pulled by the
* source type on the cluster.
@@ -139,6 +146,26 @@ public FluxConfigurationPatchProperties withBucket(BucketPatchDefinition bucket)
return this;
}
+ /**
+ * Get the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @return the azureBlob value.
+ */
+ public AzureBlobPatchDefinition azureBlob() {
+ return this.azureBlob;
+ }
+
+ /**
+ * Set the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @param azureBlob the azureBlob value to set.
+ * @return the FluxConfigurationPatchProperties object itself.
+ */
+ public FluxConfigurationPatchProperties withAzureBlob(AzureBlobPatchDefinition azureBlob) {
+ this.azureBlob = azureBlob;
+ return this;
+ }
+
/**
* Get the kustomizations property: Array of kustomizations used to reconcile the artifact pulled by the source type
* on the cluster.
@@ -197,6 +224,9 @@ public void validate() {
if (bucket() != null) {
bucket().validate();
}
+ if (azureBlob() != null) {
+ azureBlob().validate();
+ }
if (kustomizations() != null) {
kustomizations()
.values()
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationProperties.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationProperties.java
index 4b0c1fbfaf12..6d2414dc8c30 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationProperties.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/fluent/models/FluxConfigurationProperties.java
@@ -5,6 +5,7 @@
package com.azure.resourcemanager.kubernetesconfiguration.fluent.models;
import com.azure.core.annotation.Fluent;
+import com.azure.resourcemanager.kubernetesconfiguration.models.AzureBlobDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.BucketDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.FluxComplianceState;
import com.azure.resourcemanager.kubernetesconfiguration.models.GitRepositoryDefinition;
@@ -60,6 +61,12 @@ public final class FluxConfigurationProperties {
@JsonProperty(value = "bucket")
private BucketDefinition bucket;
+ /*
+ * Parameters to reconcile to the AzureBlob source kind type.
+ */
+ @JsonProperty(value = "azureBlob")
+ private AzureBlobDefinition azureBlob;
+
/*
* Array of kustomizations used to reconcile the artifact pulled by the
* source type on the cluster.
@@ -253,6 +260,26 @@ public FluxConfigurationProperties withBucket(BucketDefinition bucket) {
return this;
}
+ /**
+ * Get the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @return the azureBlob value.
+ */
+ public AzureBlobDefinition azureBlob() {
+ return this.azureBlob;
+ }
+
+ /**
+ * Set the azureBlob property: Parameters to reconcile to the AzureBlob source kind type.
+ *
+ * @param azureBlob the azureBlob value to set.
+ * @return the FluxConfigurationProperties object itself.
+ */
+ public FluxConfigurationProperties withAzureBlob(AzureBlobDefinition azureBlob) {
+ this.azureBlob = azureBlob;
+ return this;
+ }
+
/**
* Get the kustomizations property: Array of kustomizations used to reconcile the artifact pulled by the source type
* on the cluster.
@@ -385,6 +412,9 @@ public void validate() {
if (bucket() != null) {
bucket().validate();
}
+ if (azureBlob() != null) {
+ azureBlob().validate();
+ }
if (kustomizations() != null) {
kustomizations()
.values()
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsClientImpl.java
index f60b928014c0..137978b4583f 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/ExtensionsClientImpl.java
@@ -130,7 +130,7 @@ Mono>> delete(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}"
+ "/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/extensions"
+ "/{extensionName}")
- @ExpectedResponses({202})
+ @ExpectedResponses({200, 202})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono>> update(
@HostParam("$host") String endpoint,
@@ -744,14 +744,7 @@ private Mono getAsync(
String clusterName,
String extensionName) {
return getWithResponseAsync(resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusClientImpl.java
index 7dee5d2f41c6..1bbf99792078 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigOperationStatusClientImpl.java
@@ -253,14 +253,7 @@ private Mono getAsync(
String operationId) {
return getWithResponseAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName, operationId)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationImpl.java
index 3a489ff31668..f3d5621de245 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationImpl.java
@@ -6,6 +6,7 @@
import com.azure.core.management.SystemData;
import com.azure.resourcemanager.kubernetesconfiguration.fluent.models.FluxConfigurationInner;
+import com.azure.resourcemanager.kubernetesconfiguration.models.AzureBlobDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.BucketDefinition;
import com.azure.resourcemanager.kubernetesconfiguration.models.FluxComplianceState;
import com.azure.resourcemanager.kubernetesconfiguration.models.FluxConfiguration;
@@ -72,6 +73,10 @@ public BucketDefinition bucket() {
return this.innerModel().bucket();
}
+ public AzureBlobDefinition azureBlob() {
+ return this.innerModel().azureBlob();
+ }
+
public Map kustomizations() {
Map inner = this.innerModel().kustomizations();
if (inner != null) {
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsClientImpl.java
index 231fdeabd1bc..3321679d94b7 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/FluxConfigurationsClientImpl.java
@@ -110,7 +110,7 @@ Mono>> createOrUpdate(
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{clusterRp}"
+ "/{clusterResourceName}/{clusterName}/providers/Microsoft.KubernetesConfiguration/fluxConfigurations"
+ "/{fluxConfigurationName}")
- @ExpectedResponses({202})
+ @ExpectedResponses({200, 202})
@UnexpectedResponseExceptionType(ManagementException.class)
Mono>> update(
@HostParam("$host") String endpoint,
@@ -338,14 +338,7 @@ private Mono getAsync(
String fluxConfigurationName) {
return getWithResponseAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, fluxConfigurationName)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusClientImpl.java
index 21c3c3f1a5f1..7dd3865655e4 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/OperationStatusClientImpl.java
@@ -281,14 +281,7 @@ private Mono getAsync(
String operationId) {
return getWithResponseAsync(
resourceGroupName, clusterRp, clusterResourceName, clusterName, extensionName, operationId)
- .flatMap(
- (Response res) -> {
- if (res.getValue() != null) {
- return Mono.just(res.getValue());
- } else {
- return Mono.empty();
- }
- });
+ .flatMap(res -> Mono.justOrEmpty(res.getValue()));
}
/**
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientBuilder.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientBuilder.java
index 752d006aea87..77fe8878508e 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientBuilder.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientBuilder.java
@@ -7,7 +7,6 @@
import com.azure.core.annotation.ServiceClientBuilder;
import com.azure.core.http.HttpPipeline;
import com.azure.core.http.HttpPipelineBuilder;
-import com.azure.core.http.policy.CookiePolicy;
import com.azure.core.http.policy.RetryPolicy;
import com.azure.core.http.policy.UserAgentPolicy;
import com.azure.core.management.AzureEnvironment;
@@ -67,34 +66,34 @@ public SourceControlConfigurationClientBuilder environment(AzureEnvironment envi
}
/*
- * The default poll interval for long-running operation
+ * The HTTP pipeline to send requests through
*/
- private Duration defaultPollInterval;
+ private HttpPipeline pipeline;
/**
- * Sets The default poll interval for long-running operation.
+ * Sets The HTTP pipeline to send requests through.
*
- * @param defaultPollInterval the defaultPollInterval value.
+ * @param pipeline the pipeline value.
* @return the SourceControlConfigurationClientBuilder.
*/
- public SourceControlConfigurationClientBuilder defaultPollInterval(Duration defaultPollInterval) {
- this.defaultPollInterval = defaultPollInterval;
+ public SourceControlConfigurationClientBuilder pipeline(HttpPipeline pipeline) {
+ this.pipeline = pipeline;
return this;
}
/*
- * The HTTP pipeline to send requests through
+ * The default poll interval for long-running operation
*/
- private HttpPipeline pipeline;
+ private Duration defaultPollInterval;
/**
- * Sets The HTTP pipeline to send requests through.
+ * Sets The default poll interval for long-running operation.
*
- * @param pipeline the pipeline value.
+ * @param defaultPollInterval the defaultPollInterval value.
* @return the SourceControlConfigurationClientBuilder.
*/
- public SourceControlConfigurationClientBuilder pipeline(HttpPipeline pipeline) {
- this.pipeline = pipeline;
+ public SourceControlConfigurationClientBuilder defaultPollInterval(Duration defaultPollInterval) {
+ this.defaultPollInterval = defaultPollInterval;
return this;
}
@@ -126,15 +125,12 @@ public SourceControlConfigurationClientImpl buildClient() {
if (environment == null) {
this.environment = AzureEnvironment.AZURE;
}
+ if (pipeline == null) {
+ this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build();
+ }
if (defaultPollInterval == null) {
this.defaultPollInterval = Duration.ofSeconds(30);
}
- if (pipeline == null) {
- this.pipeline =
- new HttpPipelineBuilder()
- .policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy())
- .build();
- }
if (serializerAdapter == null) {
this.serializerAdapter = SerializerFactory.createDefaultManagementSerializerAdapter();
}
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientImpl.java b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientImpl.java
index 92ed100101ea..07f30b940814 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientImpl.java
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/src/main/java/com/azure/resourcemanager/kubernetesconfiguration/implementation/SourceControlConfigurationClientImpl.java
@@ -15,6 +15,7 @@
import com.azure.core.management.polling.PollResult;
import com.azure.core.management.polling.PollerFactory;
import com.azure.core.util.Context;
+import com.azure.core.util.CoreUtils;
import com.azure.core.util.logging.ClientLogger;
import com.azure.core.util.polling.AsyncPollResponse;
import com.azure.core.util.polling.LongRunningOperationStatus;
@@ -34,7 +35,6 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
-import java.util.Map;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -207,7 +207,7 @@ public OperationsClient getOperations() {
this.defaultPollInterval = defaultPollInterval;
this.subscriptionId = subscriptionId;
this.endpoint = endpoint;
- this.apiVersion = "2022-03-01";
+ this.apiVersion = "2022-07-01";
this.extensions = new ExtensionsClientImpl(this);
this.operationStatus = new OperationStatusClientImpl(this);
this.fluxConfigurations = new FluxConfigurationsClientImpl(this);
@@ -232,10 +232,7 @@ public Context getContext() {
* @return the merged context.
*/
public Context mergeContext(Context context) {
- for (Map.Entry