diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java index fddcbde0c4..85b66ca05e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java @@ -92,41 +92,45 @@ public ProtocolTestWriter(TestContext testContext) { } methodBlock.line(".%1$s(%2$s)", serviceClientProperty.getAccessorMethodSuffix(), expr); }); - methodBlock.line(".httpClient(HttpClient.createDefault())"); + methodBlock.line(".httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null)))"); methodBlock.line(".httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC));"); methodBlock.decreaseIndent(); - JavaIfBlock codeBlock = methodBlock.ifBlock("getTestMode() == TestMode.PLAYBACK", ifBlock -> { - if (isTokenCredential) { - ifBlock.line( - String.format("%1$s.httpClient(interceptorManager.getPlaybackClient())", builderVarName)); - ifBlock.line(".credential(new MockTokenCredential());"); - } else { - ifBlock.line( - String.format("%1$s.httpClient(interceptorManager.getPlaybackClient());", builderVarName)); - } - }).elseIfBlock("getTestMode() == TestMode.RECORD", ifBlock -> { - if (isTokenCredential) { - ifBlock.line( - String.format("%1$s.addPolicy(interceptorManager.getRecordPolicy())", builderVarName)); - ifBlock.line(".credential(new DefaultAzureCredentialBuilder().build());"); - } else { - ifBlock.line( - String.format("%1$s.addPolicy(interceptorManager.getRecordPolicy());", builderVarName)); - } - }); + JavaIfBlock codeBlock = null; + if (isTokenCredential) { + codeBlock = methodBlock.ifBlock("getTestMode() == TestMode.PLAYBACK", + ifBlock -> ifBlock.line(builderVarName + ".credential(new MockTokenCredential());")); + } + + if (codeBlock != null) { + codeBlock = codeBlock.elseIfBlock("getTestMode() == TestMode.RECORD", + recordModeBlock(isTokenCredential, builderVarName)); + } else { + codeBlock = methodBlock.ifBlock("getTestMode() == TestMode.RECORD", + recordModeBlock(isTokenCredential, builderVarName)); + } if (isTokenCredential) { codeBlock.elseIfBlock("getTestMode() == TestMode.LIVE", ifBlock -> { - ifBlock.line(String.format("%1$s.credential(new DefaultAzureCredentialBuilder().build());", - builderVarName)); + ifBlock.line(builderVarName + ".credential(new DefaultAzureCredentialBuilder().build());"); }); } methodBlock.line(String.format("%1$s = %2$s.%3$s();", clientVarName, builderVarName, syncClient.getClientBuilder().getBuilderMethodNameForSyncClient(syncClient))); methodBlock.line(); - } ; + } + }; + } + + private static Consumer recordModeBlock(boolean isTokenCredential, String builderVarName) { + return ifBlock -> { + if (isTokenCredential) { + ifBlock.line(builderVarName + ".addPolicy(interceptorManager.getRecordPolicy())"); + ifBlock.line(".credential(new DefaultAzureCredentialBuilder().build());"); + } else { + ifBlock.line(builderVarName + ".addPolicy(interceptorManager.getRecordPolicy());"); + } }; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/access/generated/AccessClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/access/generated/AccessClientTestBase.java index 6d967d662e..8459cf96b6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/access/generated/AccessClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/access/generated/AccessClientTestBase.java @@ -13,7 +13,6 @@ import com._specs_.azure.clientgenerator.core.access.PublicOperationClient; import com._specs_.azure.clientgenerator.core.access.RelativeModelInOperationClient; import com._specs_.azure.clientgenerator.core.access.SharedModelInOperationClient; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -33,44 +32,36 @@ class AccessClientTestBase extends TestProxyTestBase { protected void beforeTest() { AccessClientBuilder publicOperationClientbuilder = new AccessClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - publicOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { publicOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } publicOperationClient = publicOperationClientbuilder.buildPublicOperationClient(); AccessClientBuilder internalOperationClientbuilder = new AccessClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - internalOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { internalOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } internalOperationClient = internalOperationClientbuilder.buildInternalOperationClient(); AccessClientBuilder sharedModelInOperationClientbuilder = new AccessClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - sharedModelInOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { sharedModelInOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } sharedModelInOperationClient = sharedModelInOperationClientbuilder.buildSharedModelInOperationClient(); AccessClientBuilder relativeModelInOperationClientbuilder = new AccessClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - relativeModelInOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { relativeModelInOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } relativeModelInOperationClient = relativeModelInOperationClientbuilder.buildRelativeModelInOperationClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/flattenproperty/generated/FlattenPropertyClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/flattenproperty/generated/FlattenPropertyClientTestBase.java index 7a3daa5e96..153b1d4f83 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/flattenproperty/generated/FlattenPropertyClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/flattenproperty/generated/FlattenPropertyClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.clientgenerator.core.flattenproperty.FlattenPropertyClient; import com._specs_.azure.clientgenerator.core.flattenproperty.FlattenPropertyClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class FlattenPropertyClientTestBase extends TestProxyTestBase { protected void beforeTest() { FlattenPropertyClientBuilder flattenPropertyClientbuilder = new FlattenPropertyClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - flattenPropertyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { flattenPropertyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } flattenPropertyClient = flattenPropertyClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/usage/generated/UsageClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/usage/generated/UsageClientTestBase.java index 4e2c739eb3..8652ad40b4 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/usage/generated/UsageClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/clientgenerator/core/usage/generated/UsageClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.clientgenerator.core.usage.UsageClient; import com._specs_.azure.clientgenerator.core.usage.UsageClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class UsageClientTestBase extends TestProxyTestBase { protected void beforeTest() { UsageClientBuilder usageClientbuilder = new UsageClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - usageClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { usageClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } usageClient = usageClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/basic/generated/BasicClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/basic/generated/BasicClientTestBase.java index 6451d16c18..e043de8a8d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/basic/generated/BasicClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/basic/generated/BasicClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.core.basic.BasicClient; import com._specs_.azure.core.basic.BasicClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class BasicClientTestBase extends TestProxyTestBase { protected void beforeTest() { BasicClientBuilder basicClientbuilder = new BasicClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - basicClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { basicClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } basicClient = basicClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/lro/rpc/generated/RpcClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/lro/rpc/generated/RpcClientTestBase.java index 7c4090b05d..9afbb6ff31 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/lro/rpc/generated/RpcClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/lro/rpc/generated/RpcClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.core.lro.rpc.RpcClient; import com._specs_.azure.core.lro.rpc.RpcClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class RpcClientTestBase extends TestProxyTestBase { protected void beforeTest() { RpcClientBuilder rpcClientbuilder = new RpcClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - rpcClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { rpcClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } rpcClient = rpcClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/lro/standard/generated/StandardClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/lro/standard/generated/StandardClientTestBase.java index ac96f13085..6d28e723a8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/lro/standard/generated/StandardClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/lro/standard/generated/StandardClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.core.lro.standard.StandardClient; import com._specs_.azure.core.lro.standard.StandardClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class StandardClientTestBase extends TestProxyTestBase { protected void beforeTest() { StandardClientBuilder standardClientbuilder = new StandardClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - standardClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { standardClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } standardClient = standardClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/model/generated/ModelClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/model/generated/ModelClientTestBase.java index 5c65b8a132..d5546d1f7d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/model/generated/ModelClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/model/generated/ModelClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.core.model.ModelClient; import com._specs_.azure.core.model.ModelClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ModelClientTestBase extends TestProxyTestBase { protected void beforeTest() { ModelClientBuilder modelClientbuilder = new ModelClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelClient = modelClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/page/generated/PageClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/page/generated/PageClientTestBase.java index b5d61efe3d..1da8ace22f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/page/generated/PageClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/page/generated/PageClientTestBase.java @@ -11,7 +11,6 @@ import com._specs_.azure.core.page.PageClient; import com._specs_.azure.core.page.PageClientBuilder; import com._specs_.azure.core.page.TwoModelsAsPageItemClient; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,22 +26,18 @@ class PageClientTestBase extends TestProxyTestBase { protected void beforeTest() { PageClientBuilder pageClientbuilder = new PageClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pageClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pageClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pageClient = pageClientbuilder.buildClient(); PageClientBuilder twoModelsAsPageItemClientbuilder = new PageClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - twoModelsAsPageItemClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { twoModelsAsPageItemClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } twoModelsAsPageItemClient = twoModelsAsPageItemClientbuilder.buildTwoModelsAsPageItemClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/scalar/generated/ScalarClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/scalar/generated/ScalarClientTestBase.java index 426bd1baed..87183096cd 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/scalar/generated/ScalarClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/scalar/generated/ScalarClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.core.scalar.ScalarClient; import com._specs_.azure.core.scalar.ScalarClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ScalarClientTestBase extends TestProxyTestBase { protected void beforeTest() { ScalarClientBuilder scalarClientbuilder = new ScalarClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - scalarClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { scalarClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } scalarClient = scalarClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/traits/generated/TraitsClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/traits/generated/TraitsClientTestBase.java index cc582cb39c..da1852204c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/traits/generated/TraitsClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/core/traits/generated/TraitsClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.core.traits.TraitsClient; import com._specs_.azure.core.traits.TraitsClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class TraitsClientTestBase extends TestProxyTestBase { protected void beforeTest() { TraitsClientBuilder traitsClientbuilder = new TraitsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - traitsClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { traitsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } traitsClient = traitsClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/example/basic/generated/AzureExampleClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/example/basic/generated/AzureExampleClientTestBase.java index df2da2a545..90eb913c82 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/example/basic/generated/AzureExampleClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/_specs_/azure/example/basic/generated/AzureExampleClientTestBase.java @@ -10,7 +10,6 @@ import com._specs_.azure.example.basic.AzureExampleClient; import com._specs_.azure.example.basic.AzureExampleClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class AzureExampleClientTestBase extends TestProxyTestBase { protected void beforeTest() { AzureExampleClientBuilder azureExampleClientbuilder = new AzureExampleClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - azureExampleClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { azureExampleClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } azureExampleClient = azureExampleClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/apikey/generated/ApiKeyClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/apikey/generated/ApiKeyClientTestBase.java index a4a047af29..8fdfb48aab 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/apikey/generated/ApiKeyClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/apikey/generated/ApiKeyClientTestBase.java @@ -10,7 +10,6 @@ import com.authentication.apikey.ApiKeyClient; import com.authentication.apikey.ApiKeyClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ApiKeyClientTestBase extends TestProxyTestBase { protected void beforeTest() { ApiKeyClientBuilder apiKeyClientbuilder = new ApiKeyClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - apiKeyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { apiKeyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } apiKeyClient = apiKeyClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/http/custom/generated/CustomClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/http/custom/generated/CustomClientTestBase.java index 898fe6fd8b..e2f38ca6f8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/http/custom/generated/CustomClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/http/custom/generated/CustomClientTestBase.java @@ -10,7 +10,6 @@ import com.authentication.http.custom.CustomClient; import com.authentication.http.custom.CustomClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class CustomClientTestBase extends TestProxyTestBase { protected void beforeTest() { CustomClientBuilder customClientbuilder = new CustomClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - customClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { customClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } customClient = customClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/oauth2/generated/OAuth2ClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/oauth2/generated/OAuth2ClientTestBase.java index f4beb748f1..93471b6f72 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/oauth2/generated/OAuth2ClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/oauth2/generated/OAuth2ClientTestBase.java @@ -10,7 +10,6 @@ import com.authentication.oauth2.OAuth2Client; import com.authentication.oauth2.OAuth2ClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -26,11 +25,10 @@ class OAuth2ClientTestBase extends TestProxyTestBase { protected void beforeTest() { OAuth2ClientBuilder oAuth2Clientbuilder = new OAuth2ClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.PLAYBACK) { - oAuth2Clientbuilder.httpClient(interceptorManager.getPlaybackClient()) - .credential(new MockTokenCredential()); + oAuth2Clientbuilder.credential(new MockTokenCredential()); } else if (getTestMode() == TestMode.RECORD) { oAuth2Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()) .credential(new DefaultAzureCredentialBuilder().build()); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/union/generated/UnionClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/union/generated/UnionClientTestBase.java index f2282b1581..8f6f0ac2f1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/union/generated/UnionClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/authentication/union/generated/UnionClientTestBase.java @@ -10,7 +10,6 @@ import com.authentication.union.UnionClient; import com.authentication.union.UnionClientBuilder; -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -26,10 +25,10 @@ class UnionClientTestBase extends TestProxyTestBase { protected void beforeTest() { UnionClientBuilder unionClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.PLAYBACK) { - unionClientbuilder.httpClient(interceptorManager.getPlaybackClient()).credential(new MockTokenCredential()); + unionClientbuilder.credential(new MockTokenCredential()); } else if (getTestMode() == TestMode.RECORD) { unionClientbuilder.addPolicy(interceptorManager.getRecordPolicy()) .credential(new DefaultAzureCredentialBuilder().build()); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/specialheaders/xmsclientrequestid/generated/XmsClientRequestIdClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/specialheaders/xmsclientrequestid/generated/XmsClientRequestIdClientTestBase.java index 0a4be4cc4e..817900f5a3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/specialheaders/xmsclientrequestid/generated/XmsClientRequestIdClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/azure/specialheaders/xmsclientrequestid/generated/XmsClientRequestIdClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class XmsClientRequestIdClientTestBase extends TestProxyTestBase { protected void beforeTest() { XmsClientRequestIdClientBuilder xmsClientRequestIdClientbuilder = new XmsClientRequestIdClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - xmsClientRequestIdClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { xmsClientRequestIdClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } xmsClientRequestIdClient = xmsClientRequestIdClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/builtin/generated/BuiltinClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/builtin/generated/BuiltinClientTestBase.java index a4dae20355..5eefd8e771 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/builtin/generated/BuiltinClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/builtin/generated/BuiltinClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class BuiltinClientTestBase extends TestProxyTestBase { protected void beforeTest() { BuiltinClientBuilder builtinClientbuilder = new BuiltinClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - builtinClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { builtinClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } builtinClient = builtinClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/discriminatoredgecases/generated/DiscriminatorEdgeCasesClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/discriminatoredgecases/generated/DiscriminatorEdgeCasesClientTestBase.java index 440b20306e..65d2af1b7c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/discriminatoredgecases/generated/DiscriminatorEdgeCasesClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/discriminatoredgecases/generated/DiscriminatorEdgeCasesClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -25,11 +24,9 @@ protected void beforeTest() { DiscriminatorEdgeCasesClientBuilder discriminatorEdgeCasesClientbuilder = new DiscriminatorEdgeCasesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - discriminatorEdgeCasesClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { discriminatorEdgeCasesClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } discriminatorEdgeCasesClient = discriminatorEdgeCasesClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/enumservice/generated/EnumServiceClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/enumservice/generated/EnumServiceClientTestBase.java index cb8cf1cf14..4ccfdf71cb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/enumservice/generated/EnumServiceClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/enumservice/generated/EnumServiceClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class EnumServiceClientTestBase extends TestProxyTestBase { protected void beforeTest() { EnumServiceClientBuilder enumServiceClientbuilder = new EnumServiceClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - enumServiceClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { enumServiceClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } enumServiceClient = enumServiceClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/errormodel/generated/ErrorModelClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/errormodel/generated/ErrorModelClientTestBase.java index c4a2b394f1..61b02490a2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/errormodel/generated/ErrorModelClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/errormodel/generated/ErrorModelClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ErrorModelClientTestBase extends TestProxyTestBase { protected void beforeTest() { ErrorModelClientBuilder errorModelClientbuilder = new ErrorModelClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - errorModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { errorModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } errorModelClient = errorModelClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/flatten/generated/FlattenClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/flatten/generated/FlattenClientTestBase.java index 3dae50b547..f0f266c446 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/flatten/generated/FlattenClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/flatten/generated/FlattenClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class FlattenClientTestBase extends TestProxyTestBase { protected void beforeTest() { FlattenClientBuilder flattenClientbuilder = new FlattenClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - flattenClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { flattenClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } flattenClient = flattenClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/internal/generated/InternalClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/internal/generated/InternalClientTestBase.java index 0603f3efb8..b0ea1926fb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/internal/generated/InternalClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/internal/generated/InternalClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class InternalClientTestBase extends TestProxyTestBase { protected void beforeTest() { InternalClientBuilder internalClientbuilder = new InternalClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - internalClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { internalClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } internalClient = internalClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/literalservice/generated/LiteralServiceClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/literalservice/generated/LiteralServiceClientTestBase.java index 729b11f6c9..65ad042113 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/literalservice/generated/LiteralServiceClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/literalservice/generated/LiteralServiceClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class LiteralServiceClientTestBase extends TestProxyTestBase { protected void beforeTest() { LiteralServiceClientBuilder literalServiceClientbuilder = new LiteralServiceClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - literalServiceClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { literalServiceClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } literalServiceClient = literalServiceClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/longrunning/generated/LongRunningClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/longrunning/generated/LongRunningClientTestBase.java index e877ce43b8..88b90a7a09 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/longrunning/generated/LongRunningClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/longrunning/generated/LongRunningClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class LongRunningClientTestBase extends TestProxyTestBase { protected void beforeTest() { LongRunningClientBuilder longRunningClientbuilder = new LongRunningClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - longRunningClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { longRunningClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } longRunningClient = longRunningClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/model/generated/ModelClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/model/generated/ModelClientTestBase.java index db7a1378a3..e12721c6ef 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/model/generated/ModelClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/model/generated/ModelClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ModelClientTestBase extends TestProxyTestBase { protected void beforeTest() { ModelClientBuilder modelClientbuilder = new ModelClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelClient = modelClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multicontenttypes/generated/MultiContentTypesClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multicontenttypes/generated/MultiContentTypesClientTestBase.java index 8f0be62a2f..6a34814873 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multicontenttypes/generated/MultiContentTypesClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multicontenttypes/generated/MultiContentTypesClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -30,33 +29,27 @@ class MultiContentTypesClientTestBase extends TestProxyTestBase { protected void beforeTest() { MultiContentTypesClientBuilder multiContentTypesClientbuilder = new MultiContentTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - multiContentTypesClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { multiContentTypesClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } multiContentTypesClient = multiContentTypesClientbuilder.buildClient(); MultiContentTypesClientBuilder singleContentTypeClientbuilder = new MultiContentTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - singleContentTypeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { singleContentTypeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } singleContentTypeClient = singleContentTypeClientbuilder.buildSingleContentTypeClient(); MultiContentTypesClientBuilder multipleContentTypesOnRequestClientbuilder = new MultiContentTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - multipleContentTypesOnRequestClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { multipleContentTypesOnRequestClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } multipleContentTypesOnRequestClient diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multipart/generated/MultipartClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multipart/generated/MultipartClientTestBase.java index caa85e2bf8..d4d2d952f9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multipart/generated/MultipartClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multipart/generated/MultipartClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class MultipartClientTestBase extends TestProxyTestBase { protected void beforeTest() { MultipartClientBuilder multipartClientbuilder = new MultipartClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - multipartClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { multipartClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } multipartClient = multipartClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multipleapiversion/generated/FirstClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multipleapiversion/generated/FirstClientTestBase.java index 37a482c802..c9b287679a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multipleapiversion/generated/FirstClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/multipleapiversion/generated/FirstClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -32,33 +31,27 @@ class FirstClientTestBase extends TestProxyTestBase { protected void beforeTest() { FirstClientBuilder firstClientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - firstClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { firstClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } firstClient = firstClientbuilder.buildClient(); SecondClientBuilder secondClientbuilder = new SecondClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - secondClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { secondClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } secondClient = secondClientbuilder.buildClient(); NoApiVersionClientBuilder noApiVersionClientbuilder = new NoApiVersionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - noApiVersionClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { noApiVersionClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } noApiVersionClient = noApiVersionClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/naming/generated/NamingClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/naming/generated/NamingClientTestBase.java index c1ea158a0f..7dc9553e5e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/naming/generated/NamingClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/naming/generated/NamingClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class NamingClientTestBase extends TestProxyTestBase { protected void beforeTest() { NamingClientBuilder namingClientbuilder = new NamingClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - namingClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { namingClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } namingClient = namingClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/optional/generated/OptionalClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/optional/generated/OptionalClientTestBase.java index 0faffff942..218401ecd9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/optional/generated/OptionalClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/optional/generated/OptionalClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class OptionalClientTestBase extends TestProxyTestBase { protected void beforeTest() { OptionalClientBuilder optionalClientbuilder = new OptionalClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - optionalClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { optionalClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } optionalClient = optionalClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/patch/generated/PatchClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/patch/generated/PatchClientTestBase.java index 56416bbd6f..ca294dd3fb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/patch/generated/PatchClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/patch/generated/PatchClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class PatchClientTestBase extends TestProxyTestBase { protected void beforeTest() { PatchClientBuilder patchClientbuilder = new PatchClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - patchClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { patchClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } patchClient = patchClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/protocolandconvenient/generated/ProtocolAndConvenientClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/protocolandconvenient/generated/ProtocolAndConvenientClientTestBase.java index d9696540f0..8dfb6e0383 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/protocolandconvenient/generated/ProtocolAndConvenientClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/protocolandconvenient/generated/ProtocolAndConvenientClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ProtocolAndConvenientClientTestBase extends TestProxyTestBase { protected void beforeTest() { ProtocolAndConvenientClientBuilder protocolAndConvenientClientbuilder = new ProtocolAndConvenientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - protocolAndConvenientClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { protocolAndConvenientClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } protocolAndConvenientClient = protocolAndConvenientClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/response/generated/ResponseClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/response/generated/ResponseClientTestBase.java index 2ec6ed4bb5..d3e0bcf88a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/response/generated/ResponseClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/response/generated/ResponseClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ResponseClientTestBase extends TestProxyTestBase { protected void beforeTest() { ResponseClientBuilder responseClientbuilder = new ResponseClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - responseClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { responseClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } responseClient = responseClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/server/generated/HttpbinClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/server/generated/HttpbinClientTestBase.java index 2a9a04579b..8b7bdf6e85 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/server/generated/HttpbinClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/server/generated/HttpbinClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -30,22 +29,18 @@ protected void beforeTest() { = new HttpbinClientBuilder().domain(Configuration.getGlobalConfiguration().get("DOMAIN", "httpbin")) .tld(Configuration.getGlobalConfiguration().get("TLD", "org")) .relativePath(Configuration.getGlobalConfiguration().get("RELATIVEPATH", "relativepath")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - httpbinClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { httpbinClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } httpbinClient = httpbinClientbuilder.buildClient(); ContosoClientBuilder contosoClientbuilder = new ContosoClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - contosoClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { contosoClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } contosoClient = contosoClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/specialchars/generated/SpecialCharsClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/specialchars/generated/SpecialCharsClientTestBase.java index 305bcc3024..8cd32fbbdb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/specialchars/generated/SpecialCharsClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/specialchars/generated/SpecialCharsClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class SpecialCharsClientTestBase extends TestProxyTestBase { protected void beforeTest() { SpecialCharsClientBuilder specialCharsClientbuilder = new SpecialCharsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - specialCharsClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { specialCharsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } specialCharsClient = specialCharsClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/specialheaders/generated/SpecialHeadersClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/specialheaders/generated/SpecialHeadersClientTestBase.java index b601dfae37..875a4bf23a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/specialheaders/generated/SpecialHeadersClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/specialheaders/generated/SpecialHeadersClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -33,44 +32,36 @@ class SpecialHeadersClientTestBase extends TestProxyTestBase { protected void beforeTest() { SpecialHeadersClientBuilder repeatabilityHeadersClientbuilder = new SpecialHeadersClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - repeatabilityHeadersClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { repeatabilityHeadersClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } repeatabilityHeadersClient = repeatabilityHeadersClientbuilder.buildRepeatabilityHeadersClient(); SpecialHeadersClientBuilder etagHeadersClientbuilder = new SpecialHeadersClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - etagHeadersClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { etagHeadersClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } etagHeadersClient = etagHeadersClientbuilder.buildEtagHeadersClient(); SpecialHeadersClientBuilder etagHeadersOptionalBodyClientbuilder = new SpecialHeadersClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - etagHeadersOptionalBodyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { etagHeadersOptionalBodyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } etagHeadersOptionalBodyClient = etagHeadersOptionalBodyClientbuilder.buildEtagHeadersOptionalBodyClient(); SpecialHeadersClientBuilder skipSpecialHeadersClientbuilder = new SpecialHeadersClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - skipSpecialHeadersClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { skipSpecialHeadersClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } skipSpecialHeadersClient = skipSpecialHeadersClientbuilder.buildSkipSpecialHeadersClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/union/generated/UnionClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/union/generated/UnionClientTestBase.java index 729d93b39a..d7e3cffe9a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/union/generated/UnionClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/union/generated/UnionClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class UnionClientTestBase extends TestProxyTestBase { protected void beforeTest() { UnionClientBuilder unionClientbuilder = new UnionClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionClient = unionClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/versioning/generated/VersioningClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/versioning/generated/VersioningClientTestBase.java index 75c34b610b..0ad162d007 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/versioning/generated/VersioningClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/versioning/generated/VersioningClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class VersioningClientTestBase extends TestProxyTestBase { protected void beforeTest() { VersioningClientBuilder versioningClientbuilder = new VersioningClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - versioningClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { versioningClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } versioningClient = versioningClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/visibility/generated/VisibilityClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/visibility/generated/VisibilityClientTestBase.java index 313bbde5c7..4d92d95930 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/visibility/generated/VisibilityClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/visibility/generated/VisibilityClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -30,33 +29,27 @@ class VisibilityClientTestBase extends TestProxyTestBase { protected void beforeTest() { VisibilityClientBuilder visibilityClientbuilder = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - visibilityClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { visibilityClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } visibilityClient = visibilityClientbuilder.buildClient(); VisibilityClientBuilder visibilityReadClientbuilder = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - visibilityReadClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { visibilityReadClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } visibilityReadClient = visibilityReadClientbuilder.buildVisibilityReadClient(); VisibilityClientBuilder visibilityWriteClientbuilder = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - visibilityWriteClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { visibilityWriteClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } visibilityWriteClient = visibilityWriteClientbuilder.buildVisibilityWriteClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/wiretype/generated/WireTypeClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/wiretype/generated/WireTypeClientTestBase.java index c461f76749..2ed3aa5176 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/wiretype/generated/WireTypeClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/cadl/wiretype/generated/WireTypeClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class WireTypeClientTestBase extends TestProxyTestBase { protected void beforeTest() { WireTypeClientBuilder wireTypeClientbuilder = new WireTypeClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - wireTypeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { wireTypeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } wireTypeClient = wireTypeClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/naming/generated/NamingClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/naming/generated/NamingClientTestBase.java index 27c50ae9de..028f0c66ee 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/naming/generated/NamingClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/naming/generated/NamingClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -30,33 +29,27 @@ class NamingClientTestBase extends TestProxyTestBase { protected void beforeTest() { NamingClientBuilder namingClientbuilder = new NamingClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - namingClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { namingClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } namingClient = namingClientbuilder.buildClient(); NamingClientBuilder clientModelClientbuilder = new NamingClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - clientModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { clientModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } clientModelClient = clientModelClientbuilder.buildClientModelClient(); NamingClientBuilder unionEnumClientbuilder = new NamingClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionEnumClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionEnumClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionEnumClient = unionEnumClientbuilder.buildUnionEnumClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/ClientAClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/ClientAClientTestBase.java index 741f1c43b7..14d0813811 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/ClientAClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/ClientAClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -29,11 +28,9 @@ protected void beforeTest() { ClientAClientBuilder clientAClientbuilder = new ClientAClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - clientAClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { clientAClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } clientAClient = clientAClientbuilder.buildClient(); @@ -41,11 +38,9 @@ protected void beforeTest() { ClientBClientBuilder clientBClientbuilder = new ClientBClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - clientBClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { clientBClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } clientBClient = clientBClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/FirstClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/FirstClientTestBase.java index 7bb8c49532..1a41669e41 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/FirstClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/FirstClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -38,11 +37,9 @@ protected void beforeTest() { FirstClientBuilder firstClientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - firstClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { firstClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } firstClient = firstClientbuilder.buildClient(); @@ -50,11 +47,9 @@ protected void beforeTest() { FirstClientBuilder group3Clientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - group3Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { group3Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } group3Client = group3Clientbuilder.buildGroup3Client(); @@ -62,11 +57,9 @@ protected void beforeTest() { FirstClientBuilder group4Clientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - group4Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { group4Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } group4Client = group4Clientbuilder.buildGroup4Client(); @@ -74,11 +67,9 @@ protected void beforeTest() { SecondClientBuilder secondClientbuilder = new SecondClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - secondClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { secondClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } secondClient = secondClientbuilder.buildClient(); @@ -86,11 +77,9 @@ protected void beforeTest() { SecondClientBuilder group5Clientbuilder = new SecondClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - group5Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { group5Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } group5Client = group5Clientbuilder.buildGroup5Client(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/RenamedOperationClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/RenamedOperationClientTestBase.java index 1fa00c4945..ef0633249e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/RenamedOperationClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/RenamedOperationClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -28,11 +27,9 @@ protected void beforeTest() { RenamedOperationClientBuilder renamedOperationClientbuilder = new RenamedOperationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - renamedOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { renamedOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } renamedOperationClient = renamedOperationClientbuilder.buildClient(); @@ -40,11 +37,9 @@ protected void beforeTest() { RenamedOperationClientBuilder groupClientbuilder = new RenamedOperationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - groupClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { groupClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } groupClient = groupClientbuilder.buildGroupClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/ServiceClientClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/ServiceClientClientTestBase.java index bd22590dab..1da6ba76a4 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/ServiceClientClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/ServiceClientClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -40,11 +39,9 @@ protected void beforeTest() { ServiceClientClientBuilder serviceClientClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - serviceClientClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { serviceClientClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } serviceClientClient = serviceClientClientbuilder.buildClient(); @@ -52,11 +49,9 @@ protected void beforeTest() { ServiceClientClientBuilder bazFooClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - bazFooClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { bazFooClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } bazFooClient = bazFooClientbuilder.buildBazFooClient(); @@ -64,11 +59,9 @@ protected void beforeTest() { ServiceClientClientBuilder quxClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - quxClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { quxClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } quxClient = quxClientbuilder.buildQuxClient(); @@ -76,11 +69,9 @@ protected void beforeTest() { ServiceClientClientBuilder quxBarClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - quxBarClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { quxBarClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } quxBarClient = quxBarClientbuilder.buildQuxBarClient(); @@ -88,11 +79,9 @@ protected void beforeTest() { ServiceClientClientBuilder fooClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - fooClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { fooClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } fooClient = fooClientbuilder.buildFooClient(); @@ -100,11 +89,9 @@ protected void beforeTest() { ServiceClientClientBuilder barClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - barClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { barClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } barClient = barClientbuilder.buildBarClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/TwoOperationGroupClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/TwoOperationGroupClientTestBase.java index 1b28bd50a6..8f4431ad0f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/TwoOperationGroupClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/service/generated/TwoOperationGroupClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -28,11 +27,9 @@ protected void beforeTest() { TwoOperationGroupClientBuilder group1Clientbuilder = new TwoOperationGroupClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - group1Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { group1Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } group1Client = group1Clientbuilder.buildGroup1Client(); @@ -40,11 +37,9 @@ protected void beforeTest() { TwoOperationGroupClientBuilder group2Clientbuilder = new TwoOperationGroupClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - group2Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { group2Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } group2Client = group2Clientbuilder.buildGroup2Client(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/bytes/generated/BytesClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/bytes/generated/BytesClientTestBase.java index 4cab5d91d9..93516d55b2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/bytes/generated/BytesClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/bytes/generated/BytesClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -36,55 +35,45 @@ class BytesClientTestBase extends TestProxyTestBase { protected void beforeTest() { BytesClientBuilder queryClientbuilder = new BytesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryClient = queryClientbuilder.buildQueryClient(); BytesClientBuilder propertyClientbuilder = new BytesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - propertyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { propertyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } propertyClient = propertyClientbuilder.buildPropertyClient(); BytesClientBuilder headerClientbuilder = new BytesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - headerClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { headerClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } headerClient = headerClientbuilder.buildHeaderClient(); BytesClientBuilder requestBodyClientbuilder = new BytesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - requestBodyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { requestBodyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } requestBodyClient = requestBodyClientbuilder.buildRequestBodyClient(); BytesClientBuilder responseBodyClientbuilder = new BytesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - responseBodyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { responseBodyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } responseBodyClient = responseBodyClientbuilder.buildResponseBodyClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/datetime/generated/DatetimeClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/datetime/generated/DatetimeClientTestBase.java index 05d83226c6..905fb4ee7d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/datetime/generated/DatetimeClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/datetime/generated/DatetimeClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -33,44 +32,36 @@ class DatetimeClientTestBase extends TestProxyTestBase { protected void beforeTest() { DatetimeClientBuilder queryClientbuilder = new DatetimeClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryClient = queryClientbuilder.buildQueryClient(); DatetimeClientBuilder propertyClientbuilder = new DatetimeClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - propertyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { propertyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } propertyClient = propertyClientbuilder.buildPropertyClient(); DatetimeClientBuilder headerClientbuilder = new DatetimeClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - headerClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { headerClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } headerClient = headerClientbuilder.buildHeaderClient(); DatetimeClientBuilder responseHeaderClientbuilder = new DatetimeClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - responseHeaderClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { responseHeaderClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } responseHeaderClient = responseHeaderClientbuilder.buildResponseHeaderClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/duration/generated/DurationClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/duration/generated/DurationClientTestBase.java index ff419aed9b..7cc50aa25b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/duration/generated/DurationClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/duration/generated/DurationClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -30,33 +29,27 @@ class DurationClientTestBase extends TestProxyTestBase { protected void beforeTest() { DurationClientBuilder queryClientbuilder = new DurationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryClient = queryClientbuilder.buildQueryClient(); DurationClientBuilder propertyClientbuilder = new DurationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - propertyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { propertyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } propertyClient = propertyClientbuilder.buildPropertyClient(); DurationClientBuilder headerClientbuilder = new DurationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - headerClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { headerClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } headerClient = headerClientbuilder.buildHeaderClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/numeric/generated/NumericClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/numeric/generated/NumericClientTestBase.java index 8b865bf807..40ff6ae337 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/numeric/generated/NumericClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/encode/numeric/generated/NumericClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class NumericClientTestBase extends TestProxyTestBase { protected void beforeTest() { NumericClientBuilder numericClientbuilder = new NumericClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - numericClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { numericClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } numericClient = numericClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/basic/generated/BasicClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/basic/generated/BasicClientTestBase.java index 7196d63b31..193b05ed00 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/basic/generated/BasicClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/basic/generated/BasicClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,22 +26,18 @@ class BasicClientTestBase extends TestProxyTestBase { protected void beforeTest() { BasicClientBuilder explicitBodyClientbuilder = new BasicClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - explicitBodyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { explicitBodyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } explicitBodyClient = explicitBodyClientbuilder.buildExplicitBodyClient(); BasicClientBuilder implicitBodyClientbuilder = new BasicClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - implicitBodyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { implicitBodyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } implicitBodyClient = implicitBodyClientbuilder.buildImplicitBodyClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/bodyoptionality/generated/BodyOptionalityClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/bodyoptionality/generated/BodyOptionalityClientTestBase.java index 1c0c67e14b..511cdb1d47 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/bodyoptionality/generated/BodyOptionalityClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/bodyoptionality/generated/BodyOptionalityClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,22 +26,18 @@ class BodyOptionalityClientTestBase extends TestProxyTestBase { protected void beforeTest() { BodyOptionalityClientBuilder bodyOptionalityClientbuilder = new BodyOptionalityClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - bodyOptionalityClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { bodyOptionalityClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } bodyOptionalityClient = bodyOptionalityClientbuilder.buildClient(); BodyOptionalityClientBuilder optionalExplicitClientbuilder = new BodyOptionalityClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - optionalExplicitClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { optionalExplicitClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } optionalExplicitClient = optionalExplicitClientbuilder.buildOptionalExplicitClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/collectionformat/generated/CollectionFormatClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/collectionformat/generated/CollectionFormatClientTestBase.java index 52bded4726..dd6342a707 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/collectionformat/generated/CollectionFormatClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/collectionformat/generated/CollectionFormatClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,22 +26,18 @@ class CollectionFormatClientTestBase extends TestProxyTestBase { protected void beforeTest() { CollectionFormatClientBuilder queryClientbuilder = new CollectionFormatClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryClient = queryClientbuilder.buildQueryClient(); CollectionFormatClientBuilder headerClientbuilder = new CollectionFormatClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - headerClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { headerClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } headerClient = headerClientbuilder.buildHeaderClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/spread/generated/SpreadClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/spread/generated/SpreadClientTestBase.java index eb5434fc39..877c99133c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/spread/generated/SpreadClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/parameters/spread/generated/SpreadClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,22 +26,18 @@ class SpreadClientTestBase extends TestProxyTestBase { protected void beforeTest() { SpreadClientBuilder modelClientbuilder = new SpreadClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelClient = modelClientbuilder.buildModelClient(); SpreadClientBuilder aliasClientbuilder = new SpreadClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - aliasClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { aliasClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } aliasClient = aliasClientbuilder.buildAliasClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/contentnegotiation/generated/ContentNegotiationClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/contentnegotiation/generated/ContentNegotiationClientTestBase.java index fe4c66c652..9dc7cd916f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/contentnegotiation/generated/ContentNegotiationClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/contentnegotiation/generated/ContentNegotiationClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,22 +26,18 @@ class ContentNegotiationClientTestBase extends TestProxyTestBase { protected void beforeTest() { ContentNegotiationClientBuilder sameBodyClientbuilder = new ContentNegotiationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - sameBodyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { sameBodyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } sameBodyClient = sameBodyClientbuilder.buildSameBodyClient(); ContentNegotiationClientBuilder differentBodyClientbuilder = new ContentNegotiationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - differentBodyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { differentBodyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } differentBodyClient = differentBodyClientbuilder.buildDifferentBodyClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/jsonmergepatch/generated/JsonMergePatchClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/jsonmergepatch/generated/JsonMergePatchClientTestBase.java index bb9a6ab6df..fa17e14fd3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/jsonmergepatch/generated/JsonMergePatchClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/jsonmergepatch/generated/JsonMergePatchClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class JsonMergePatchClientTestBase extends TestProxyTestBase { protected void beforeTest() { JsonMergePatchClientBuilder jsonMergePatchClientbuilder = new JsonMergePatchClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - jsonMergePatchClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { jsonMergePatchClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } jsonMergePatchClient = jsonMergePatchClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/mediatype/generated/MediaTypeClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/mediatype/generated/MediaTypeClientTestBase.java index 8a5752d00a..0cfc731448 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/mediatype/generated/MediaTypeClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/mediatype/generated/MediaTypeClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class MediaTypeClientTestBase extends TestProxyTestBase { protected void beforeTest() { MediaTypeClientBuilder mediaTypeClientbuilder = new MediaTypeClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - mediaTypeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { mediaTypeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } mediaTypeClient = mediaTypeClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/multipart/generated/MultiPartClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/multipart/generated/MultiPartClientTestBase.java index de53dd77c5..670f0ca624 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/multipart/generated/MultiPartClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/multipart/generated/MultiPartClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -33,33 +32,27 @@ class MultiPartClientTestBase extends TestProxyTestBase { protected void beforeTest() { MultiPartClientBuilder formDataClientbuilder = new MultiPartClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - formDataClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { formDataClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } formDataClient = formDataClientbuilder.buildFormDataClient(); MultiPartClientBuilder formDataHttpPartsClientbuilder = new MultiPartClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - formDataHttpPartsClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { formDataHttpPartsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } formDataHttpPartsClient = formDataHttpPartsClientbuilder.buildFormDataHttpPartsClient(); MultiPartClientBuilder formDataHttpPartsContentTypeClientbuilder = new MultiPartClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - formDataHttpPartsContentTypeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { formDataHttpPartsContentTypeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } formDataHttpPartsContentTypeClient @@ -67,11 +60,9 @@ protected void beforeTest() { MultiPartClientBuilder formDataHttpPartsNonStringClientbuilder = new MultiPartClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - formDataHttpPartsNonStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { formDataHttpPartsNonStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } formDataHttpPartsNonStringClient diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/pageable/generated/PageableClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/pageable/generated/PageableClientTestBase.java index 457250402c..f91dd970db 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/pageable/generated/PageableClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/payload/pageable/generated/PageableClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class PageableClientTestBase extends TestProxyTestBase { protected void beforeTest() { PageableClientBuilder pageableClientbuilder = new PageableClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pageableClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pageableClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pageableClient = pageableClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/resiliency/servicedriven/generated/ResiliencyServiceDrivenClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/resiliency/servicedriven/generated/ResiliencyServiceDrivenClientTestBase.java index b42cd18d88..471cfd6e46 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/resiliency/servicedriven/generated/ResiliencyServiceDrivenClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/resiliency/servicedriven/generated/ResiliencyServiceDrivenClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,11 +26,9 @@ protected void beforeTest() { .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .serviceDeploymentVersion( Configuration.getGlobalConfiguration().get("SERVICEDEPLOYMENTVERSION", "servicedeploymentversion")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - resiliencyServiceDrivenClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { resiliencyServiceDrivenClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } resiliencyServiceDrivenClient = resiliencyServiceDrivenClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/resiliency/servicedriven/v1/generated/ResiliencyServiceDrivenClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/resiliency/servicedriven/v1/generated/ResiliencyServiceDrivenClientTestBase.java index eec959eb94..570d103079 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/resiliency/servicedriven/v1/generated/ResiliencyServiceDrivenClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/resiliency/servicedriven/v1/generated/ResiliencyServiceDrivenClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,11 +26,9 @@ protected void beforeTest() { .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .serviceDeploymentVersion( Configuration.getGlobalConfiguration().get("SERVICEDEPLOYMENTVERSION", "servicedeploymentversion")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - resiliencyServiceDrivenClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { resiliencyServiceDrivenClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } resiliencyServiceDrivenClient = resiliencyServiceDrivenClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/routes/generated/RoutesClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/routes/generated/RoutesClientTestBase.java index 5c09af6d15..56208e7f99 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/routes/generated/RoutesClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/routes/generated/RoutesClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -72,33 +71,27 @@ class RoutesClientTestBase extends TestProxyTestBase { protected void beforeTest() { RoutesClientBuilder routesClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - routesClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { routesClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } routesClient = routesClientbuilder.buildClient(); RoutesClientBuilder pathParametersClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersClient = pathParametersClientbuilder.buildPathParametersClient(); RoutesClientBuilder pathParametersReservedExpansionClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersReservedExpansionClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersReservedExpansionClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersReservedExpansionClient @@ -106,11 +99,9 @@ protected void beforeTest() { RoutesClientBuilder pathParametersSimpleExpansionStandardClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersSimpleExpansionStandardClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersSimpleExpansionStandardClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersSimpleExpansionStandardClient @@ -118,11 +109,9 @@ protected void beforeTest() { RoutesClientBuilder pathParametersSimpleExpansionExplodeClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersSimpleExpansionExplodeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersSimpleExpansionExplodeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersSimpleExpansionExplodeClient @@ -130,11 +119,9 @@ protected void beforeTest() { RoutesClientBuilder pathParametersPathExpansionStandardClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersPathExpansionStandardClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersPathExpansionStandardClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersPathExpansionStandardClient @@ -142,11 +129,9 @@ protected void beforeTest() { RoutesClientBuilder pathParametersPathExpansionExplodeClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersPathExpansionExplodeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersPathExpansionExplodeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersPathExpansionExplodeClient @@ -154,11 +139,9 @@ protected void beforeTest() { RoutesClientBuilder pathParametersLabelExpansionStandardClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersLabelExpansionStandardClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersLabelExpansionStandardClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersLabelExpansionStandardClient @@ -166,11 +149,9 @@ protected void beforeTest() { RoutesClientBuilder pathParametersLabelExpansionExplodeClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersLabelExpansionExplodeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersLabelExpansionExplodeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersLabelExpansionExplodeClient @@ -178,11 +159,9 @@ protected void beforeTest() { RoutesClientBuilder pathParametersMatrixExpansionStandardClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersMatrixExpansionStandardClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersMatrixExpansionStandardClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersMatrixExpansionStandardClient @@ -190,11 +169,9 @@ protected void beforeTest() { RoutesClientBuilder pathParametersMatrixExpansionExplodeClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - pathParametersMatrixExpansionExplodeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { pathParametersMatrixExpansionExplodeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } pathParametersMatrixExpansionExplodeClient @@ -202,22 +179,18 @@ protected void beforeTest() { RoutesClientBuilder queryParametersClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryParametersClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryParametersClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryParametersClient = queryParametersClientbuilder.buildQueryParametersClient(); RoutesClientBuilder queryParametersQueryExpansionStandardClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryParametersQueryExpansionStandardClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryParametersQueryExpansionStandardClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryParametersQueryExpansionStandardClient @@ -225,11 +198,9 @@ protected void beforeTest() { RoutesClientBuilder queryParametersQueryExpansionExplodeClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryParametersQueryExpansionExplodeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryParametersQueryExpansionExplodeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryParametersQueryExpansionExplodeClient @@ -237,11 +208,9 @@ protected void beforeTest() { RoutesClientBuilder queryParametersQueryContinuationStandardClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryParametersQueryContinuationStandardClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryParametersQueryContinuationStandardClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryParametersQueryContinuationStandardClient = queryParametersQueryContinuationStandardClientbuilder @@ -249,11 +218,9 @@ protected void beforeTest() { RoutesClientBuilder queryParametersQueryContinuationExplodeClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - queryParametersQueryContinuationExplodeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { queryParametersQueryContinuationExplodeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } queryParametersQueryContinuationExplodeClient @@ -261,11 +228,9 @@ protected void beforeTest() { RoutesClientBuilder inInterfaceClientbuilder = new RoutesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - inInterfaceClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { inInterfaceClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } inInterfaceClient = inInterfaceClientbuilder.buildInInterfaceClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/serialization/encodedname/json/generated/JsonClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/serialization/encodedname/json/generated/JsonClientTestBase.java index 48e63770d1..b86f4d448b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/serialization/encodedname/json/generated/JsonClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/serialization/encodedname/json/generated/JsonClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class JsonClientTestBase extends TestProxyTestBase { protected void beforeTest() { JsonClientBuilder jsonClientbuilder = new JsonClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - jsonClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { jsonClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } jsonClient = jsonClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/endpoint/notdefined/generated/NotDefinedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/endpoint/notdefined/generated/NotDefinedClientTestBase.java index 89ab5999d8..4e3553b76d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/endpoint/notdefined/generated/NotDefinedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/endpoint/notdefined/generated/NotDefinedClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class NotDefinedClientTestBase extends TestProxyTestBase { protected void beforeTest() { NotDefinedClientBuilder notDefinedClientbuilder = new NotDefinedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - notDefinedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { notDefinedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } notDefinedClient = notDefinedClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/path/multiple/generated/MultipleClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/path/multiple/generated/MultipleClientTestBase.java index a1e5597656..1ac09d84aa 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/path/multiple/generated/MultipleClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/path/multiple/generated/MultipleClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class MultipleClientTestBase extends TestProxyTestBase { protected void beforeTest() { MultipleClientBuilder multipleClientbuilder = new MultipleClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - multipleClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { multipleClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } multipleClient = multipleClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/path/single/generated/SingleClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/path/single/generated/SingleClientTestBase.java index d85d57d879..e519870285 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/path/single/generated/SingleClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/path/single/generated/SingleClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class SingleClientTestBase extends TestProxyTestBase { protected void beforeTest() { SingleClientBuilder singleClientbuilder = new SingleClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - singleClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { singleClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } singleClient = singleClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/versions/notversioned/generated/NotVersionedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/versions/notversioned/generated/NotVersionedClientTestBase.java index 5aa4f10da4..032032a6de 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/versions/notversioned/generated/NotVersionedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/versions/notversioned/generated/NotVersionedClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class NotVersionedClientTestBase extends TestProxyTestBase { protected void beforeTest() { NotVersionedClientBuilder notVersionedClientbuilder = new NotVersionedClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - notVersionedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { notVersionedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } notVersionedClient = notVersionedClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/versions/versioned/generated/VersionedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/versions/versioned/generated/VersionedClientTestBase.java index bd28be9ac9..ac2154d5ce 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/versions/versioned/generated/VersionedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/server/versions/versioned/generated/VersionedClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class VersionedClientTestBase extends TestProxyTestBase { protected void beforeTest() { VersionedClientBuilder versionedClientbuilder = new VersionedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - versionedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { versionedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } versionedClient = versionedClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialheaders/conditionalrequest/generated/ConditionalRequestClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialheaders/conditionalrequest/generated/ConditionalRequestClientTestBase.java index 6f58744175..fcfc145470 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialheaders/conditionalrequest/generated/ConditionalRequestClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialheaders/conditionalrequest/generated/ConditionalRequestClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ConditionalRequestClientTestBase extends TestProxyTestBase { protected void beforeTest() { ConditionalRequestClientBuilder conditionalRequestClientbuilder = new ConditionalRequestClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - conditionalRequestClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { conditionalRequestClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } conditionalRequestClient = conditionalRequestClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialheaders/repeatability/generated/RepeatabilityClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialheaders/repeatability/generated/RepeatabilityClientTestBase.java index 9dd8381c25..d3116534a5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialheaders/repeatability/generated/RepeatabilityClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialheaders/repeatability/generated/RepeatabilityClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class RepeatabilityClientTestBase extends TestProxyTestBase { protected void beforeTest() { RepeatabilityClientBuilder repeatabilityClientbuilder = new RepeatabilityClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - repeatabilityClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { repeatabilityClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } repeatabilityClient = repeatabilityClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialwords/generated/SpecialWordsClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialwords/generated/SpecialWordsClientTestBase.java index a9f0e5e147..e6f5146fe9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialwords/generated/SpecialWordsClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/specialwords/generated/SpecialWordsClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -33,44 +32,36 @@ class SpecialWordsClientTestBase extends TestProxyTestBase { protected void beforeTest() { SpecialWordsClientBuilder modelsClientbuilder = new SpecialWordsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelsClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelsClient = modelsClientbuilder.buildModelsClient(); SpecialWordsClientBuilder modelPropertiesClientbuilder = new SpecialWordsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelPropertiesClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelPropertiesClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelPropertiesClient = modelPropertiesClientbuilder.buildModelPropertiesClient(); SpecialWordsClientBuilder operationsClientbuilder = new SpecialWordsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - operationsClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { operationsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } operationsClient = operationsClientbuilder.buildOperationsClient(); SpecialWordsClientBuilder parametersClientbuilder = new SpecialWordsClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - parametersClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { parametersClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } parametersClient = parametersClientbuilder.buildParametersClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/array/generated/ArrayClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/array/generated/ArrayClientTestBase.java index dff94f0fac..5c429dd768 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/array/generated/ArrayClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/array/generated/ArrayClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -63,154 +62,126 @@ class ArrayClientTestBase extends TestProxyTestBase { protected void beforeTest() { ArrayClientBuilder int32ValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - int32ValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { int32ValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } int32ValueClient = int32ValueClientbuilder.buildInt32ValueClient(); ArrayClientBuilder int64ValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - int64ValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { int64ValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } int64ValueClient = int64ValueClientbuilder.buildInt64ValueClient(); ArrayClientBuilder booleanValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - booleanValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { booleanValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } booleanValueClient = booleanValueClientbuilder.buildBooleanValueClient(); ArrayClientBuilder stringValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringValueClient = stringValueClientbuilder.buildStringValueClient(); ArrayClientBuilder float32ValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - float32ValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { float32ValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } float32ValueClient = float32ValueClientbuilder.buildFloat32ValueClient(); ArrayClientBuilder datetimeValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - datetimeValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { datetimeValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } datetimeValueClient = datetimeValueClientbuilder.buildDatetimeValueClient(); ArrayClientBuilder durationValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - durationValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { durationValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } durationValueClient = durationValueClientbuilder.buildDurationValueClient(); ArrayClientBuilder unknownValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unknownValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unknownValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unknownValueClient = unknownValueClientbuilder.buildUnknownValueClient(); ArrayClientBuilder modelValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelValueClient = modelValueClientbuilder.buildModelValueClient(); ArrayClientBuilder nullableFloatValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - nullableFloatValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { nullableFloatValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } nullableFloatValueClient = nullableFloatValueClientbuilder.buildNullableFloatValueClient(); ArrayClientBuilder nullableInt32ValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - nullableInt32ValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { nullableInt32ValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } nullableInt32ValueClient = nullableInt32ValueClientbuilder.buildNullableInt32ValueClient(); ArrayClientBuilder nullableBooleanValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - nullableBooleanValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { nullableBooleanValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } nullableBooleanValueClient = nullableBooleanValueClientbuilder.buildNullableBooleanValueClient(); ArrayClientBuilder nullableStringValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - nullableStringValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { nullableStringValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } nullableStringValueClient = nullableStringValueClientbuilder.buildNullableStringValueClient(); ArrayClientBuilder nullableModelValueClientbuilder = new ArrayClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - nullableModelValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { nullableModelValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } nullableModelValueClient = nullableModelValueClientbuilder.buildNullableModelValueClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/dictionary/generated/DictionaryClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/dictionary/generated/DictionaryClientTestBase.java index eb6b0bd8ad..fa8562b0fa 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/dictionary/generated/DictionaryClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/dictionary/generated/DictionaryClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -54,121 +53,99 @@ class DictionaryClientTestBase extends TestProxyTestBase { protected void beforeTest() { DictionaryClientBuilder int32ValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - int32ValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { int32ValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } int32ValueClient = int32ValueClientbuilder.buildInt32ValueClient(); DictionaryClientBuilder int64ValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - int64ValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { int64ValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } int64ValueClient = int64ValueClientbuilder.buildInt64ValueClient(); DictionaryClientBuilder booleanValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - booleanValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { booleanValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } booleanValueClient = booleanValueClientbuilder.buildBooleanValueClient(); DictionaryClientBuilder stringValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringValueClient = stringValueClientbuilder.buildStringValueClient(); DictionaryClientBuilder float32ValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - float32ValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { float32ValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } float32ValueClient = float32ValueClientbuilder.buildFloat32ValueClient(); DictionaryClientBuilder datetimeValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - datetimeValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { datetimeValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } datetimeValueClient = datetimeValueClientbuilder.buildDatetimeValueClient(); DictionaryClientBuilder durationValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - durationValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { durationValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } durationValueClient = durationValueClientbuilder.buildDurationValueClient(); DictionaryClientBuilder unknownValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unknownValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unknownValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unknownValueClient = unknownValueClientbuilder.buildUnknownValueClient(); DictionaryClientBuilder modelValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelValueClient = modelValueClientbuilder.buildModelValueClient(); DictionaryClientBuilder recursiveModelValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - recursiveModelValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { recursiveModelValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } recursiveModelValueClient = recursiveModelValueClientbuilder.buildRecursiveModelValueClient(); DictionaryClientBuilder nullableFloatValueClientbuilder = new DictionaryClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - nullableFloatValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { nullableFloatValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } nullableFloatValueClient = nullableFloatValueClientbuilder.buildNullableFloatValueClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/enums/extensible/generated/ExtensibleClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/enums/extensible/generated/ExtensibleClientTestBase.java index c69dc45559..eaa5cd5604 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/enums/extensible/generated/ExtensibleClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/enums/extensible/generated/ExtensibleClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class ExtensibleClientTestBase extends TestProxyTestBase { protected void beforeTest() { ExtensibleClientBuilder extensibleClientbuilder = new ExtensibleClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extensibleClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extensibleClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extensibleClient = extensibleClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/enums/fixed/generated/FixedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/enums/fixed/generated/FixedClientTestBase.java index 42c3443dba..33b3803b97 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/enums/fixed/generated/FixedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/enums/fixed/generated/FixedClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class FixedClientTestBase extends TestProxyTestBase { protected void beforeTest() { FixedClientBuilder fixedClientbuilder = new FixedClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - fixedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { fixedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } fixedClient = fixedClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/empty/generated/EmptyClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/empty/generated/EmptyClientTestBase.java index b79668911d..e6d3cfa48f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/empty/generated/EmptyClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/empty/generated/EmptyClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class EmptyClientTestBase extends TestProxyTestBase { protected void beforeTest() { EmptyClientBuilder emptyClientbuilder = new EmptyClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - emptyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { emptyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } emptyClient = emptyClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/enumdiscriminator/generated/EnumDiscriminatorClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/enumdiscriminator/generated/EnumDiscriminatorClientTestBase.java index 3dfa60ccab..bbf0ecdc79 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/enumdiscriminator/generated/EnumDiscriminatorClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/enumdiscriminator/generated/EnumDiscriminatorClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class EnumDiscriminatorClientTestBase extends TestProxyTestBase { protected void beforeTest() { EnumDiscriminatorClientBuilder enumDiscriminatorClientbuilder = new EnumDiscriminatorClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - enumDiscriminatorClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { enumDiscriminatorClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } enumDiscriminatorClient = enumDiscriminatorClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/enumnesteddiscriminator/generated/EnumNestedDiscriminatorClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/enumnesteddiscriminator/generated/EnumNestedDiscriminatorClientTestBase.java index ccc4713985..9e9e0aa1df 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/enumnesteddiscriminator/generated/EnumNestedDiscriminatorClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/enumnesteddiscriminator/generated/EnumNestedDiscriminatorClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -25,11 +24,9 @@ protected void beforeTest() { EnumNestedDiscriminatorClientBuilder enumNestedDiscriminatorClientbuilder = new EnumNestedDiscriminatorClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - enumNestedDiscriminatorClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { enumNestedDiscriminatorClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } enumNestedDiscriminatorClient = enumNestedDiscriminatorClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/nesteddiscriminator/generated/NestedDiscriminatorClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/nesteddiscriminator/generated/NestedDiscriminatorClientTestBase.java index f22e376b2c..81e85a6f6f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/nesteddiscriminator/generated/NestedDiscriminatorClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/nesteddiscriminator/generated/NestedDiscriminatorClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class NestedDiscriminatorClientTestBase extends TestProxyTestBase { protected void beforeTest() { NestedDiscriminatorClientBuilder nestedDiscriminatorClientbuilder = new NestedDiscriminatorClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - nestedDiscriminatorClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { nestedDiscriminatorClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } nestedDiscriminatorClient = nestedDiscriminatorClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/notdiscriminated/generated/NotDiscriminatedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/notdiscriminated/generated/NotDiscriminatedClientTestBase.java index 980407e0d3..3f2bd606cb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/notdiscriminated/generated/NotDiscriminatedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/notdiscriminated/generated/NotDiscriminatedClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class NotDiscriminatedClientTestBase extends TestProxyTestBase { protected void beforeTest() { NotDiscriminatedClientBuilder notDiscriminatedClientbuilder = new NotDiscriminatedClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - notDiscriminatedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { notDiscriminatedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } notDiscriminatedClient = notDiscriminatedClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/recursive/generated/RecursiveClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/recursive/generated/RecursiveClientTestBase.java index 15cc609f64..757e2ee99d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/recursive/generated/RecursiveClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/recursive/generated/RecursiveClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class RecursiveClientTestBase extends TestProxyTestBase { protected void beforeTest() { RecursiveClientBuilder recursiveClientbuilder = new RecursiveClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - recursiveClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { recursiveClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } recursiveClient = recursiveClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/singlediscriminator/generated/SingleDiscriminatorClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/singlediscriminator/generated/SingleDiscriminatorClientTestBase.java index a871b2e7ac..0be06cfb19 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/singlediscriminator/generated/SingleDiscriminatorClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/inheritance/singlediscriminator/generated/SingleDiscriminatorClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class SingleDiscriminatorClientTestBase extends TestProxyTestBase { protected void beforeTest() { SingleDiscriminatorClientBuilder singleDiscriminatorClientbuilder = new SingleDiscriminatorClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - singleDiscriminatorClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { singleDiscriminatorClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } singleDiscriminatorClient = singleDiscriminatorClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/usage/generated/UsageClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/usage/generated/UsageClientTestBase.java index e135b9c68c..868587e9b6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/usage/generated/UsageClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/usage/generated/UsageClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class UsageClientTestBase extends TestProxyTestBase { protected void beforeTest() { UsageClientBuilder usageClientbuilder = new UsageClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - usageClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { usageClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } usageClient = usageClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/visibility/generated/VisibilityClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/visibility/generated/VisibilityClientTestBase.java index b610274bf6..44ce57fe27 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/visibility/generated/VisibilityClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/visibility/generated/VisibilityClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -24,11 +23,9 @@ class VisibilityClientTestBase extends TestProxyTestBase { protected void beforeTest() { VisibilityClientBuilder visibilityClientbuilder = new VisibilityClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - visibilityClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { visibilityClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } visibilityClient = visibilityClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/additionalproperties/generated/AdditionalPropertiesClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/additionalproperties/generated/AdditionalPropertiesClientTestBase.java index 2b3a3758dc..69939b9ac0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/additionalproperties/generated/AdditionalPropertiesClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/additionalproperties/generated/AdditionalPropertiesClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -117,22 +116,18 @@ class AdditionalPropertiesClientTestBase extends TestProxyTestBase { protected void beforeTest() { AdditionalPropertiesClientBuilder extendsUnknownClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsUnknownClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsUnknownClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsUnknownClient = extendsUnknownClientbuilder.buildExtendsUnknownClient(); AdditionalPropertiesClientBuilder extendsUnknownDerivedClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsUnknownDerivedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsUnknownDerivedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsUnknownDerivedClient = extendsUnknownDerivedClientbuilder.buildExtendsUnknownDerivedClient(); @@ -140,11 +135,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder extendsUnknownDiscriminatedClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsUnknownDiscriminatedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsUnknownDiscriminatedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsUnknownDiscriminatedClient @@ -152,198 +145,162 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder isUnknownClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - isUnknownClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { isUnknownClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } isUnknownClient = isUnknownClientbuilder.buildIsUnknownClient(); AdditionalPropertiesClientBuilder isUnknownDerivedClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - isUnknownDerivedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { isUnknownDerivedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } isUnknownDerivedClient = isUnknownDerivedClientbuilder.buildIsUnknownDerivedClient(); AdditionalPropertiesClientBuilder isUnknownDiscriminatedClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - isUnknownDiscriminatedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { isUnknownDiscriminatedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } isUnknownDiscriminatedClient = isUnknownDiscriminatedClientbuilder.buildIsUnknownDiscriminatedClient(); AdditionalPropertiesClientBuilder extendsStringClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsStringClient = extendsStringClientbuilder.buildExtendsStringClient(); AdditionalPropertiesClientBuilder isStringClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - isStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { isStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } isStringClient = isStringClientbuilder.buildIsStringClient(); AdditionalPropertiesClientBuilder spreadStringClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadStringClient = spreadStringClientbuilder.buildSpreadStringClient(); AdditionalPropertiesClientBuilder extendsFloatClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsFloatClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsFloatClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsFloatClient = extendsFloatClientbuilder.buildExtendsFloatClient(); AdditionalPropertiesClientBuilder isFloatClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - isFloatClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { isFloatClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } isFloatClient = isFloatClientbuilder.buildIsFloatClient(); AdditionalPropertiesClientBuilder spreadFloatClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadFloatClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadFloatClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadFloatClient = spreadFloatClientbuilder.buildSpreadFloatClient(); AdditionalPropertiesClientBuilder extendsModelClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsModelClient = extendsModelClientbuilder.buildExtendsModelClient(); AdditionalPropertiesClientBuilder isModelClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - isModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { isModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } isModelClient = isModelClientbuilder.buildIsModelClient(); AdditionalPropertiesClientBuilder spreadModelClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadModelClient = spreadModelClientbuilder.buildSpreadModelClient(); AdditionalPropertiesClientBuilder extendsModelArrayClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsModelArrayClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsModelArrayClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsModelArrayClient = extendsModelArrayClientbuilder.buildExtendsModelArrayClient(); AdditionalPropertiesClientBuilder isModelArrayClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - isModelArrayClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { isModelArrayClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } isModelArrayClient = isModelArrayClientbuilder.buildIsModelArrayClient(); AdditionalPropertiesClientBuilder spreadModelArrayClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadModelArrayClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadModelArrayClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadModelArrayClient = spreadModelArrayClientbuilder.buildSpreadModelArrayClient(); AdditionalPropertiesClientBuilder spreadDifferentStringClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadDifferentStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadDifferentStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadDifferentStringClient = spreadDifferentStringClientbuilder.buildSpreadDifferentStringClient(); AdditionalPropertiesClientBuilder spreadDifferentFloatClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadDifferentFloatClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadDifferentFloatClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadDifferentFloatClient = spreadDifferentFloatClientbuilder.buildSpreadDifferentFloatClient(); AdditionalPropertiesClientBuilder spreadDifferentModelClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadDifferentModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadDifferentModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadDifferentModelClient = spreadDifferentModelClientbuilder.buildSpreadDifferentModelClient(); @@ -351,11 +308,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder spreadDifferentModelArrayClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadDifferentModelArrayClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadDifferentModelArrayClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadDifferentModelArrayClient = spreadDifferentModelArrayClientbuilder.buildSpreadDifferentModelArrayClient(); @@ -363,11 +318,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder extendsDifferentSpreadStringClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsDifferentSpreadStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsDifferentSpreadStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsDifferentSpreadStringClient @@ -376,11 +329,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder extendsDifferentSpreadFloatClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsDifferentSpreadFloatClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsDifferentSpreadFloatClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsDifferentSpreadFloatClient @@ -389,11 +340,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder extendsDifferentSpreadModelClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsDifferentSpreadModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsDifferentSpreadModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsDifferentSpreadModelClient @@ -402,11 +351,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder extendsDifferentSpreadModelArrayClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extendsDifferentSpreadModelArrayClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extendsDifferentSpreadModelArrayClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extendsDifferentSpreadModelArrayClient @@ -414,22 +361,18 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder multipleSpreadClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - multipleSpreadClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { multipleSpreadClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } multipleSpreadClient = multipleSpreadClientbuilder.buildMultipleSpreadClient(); AdditionalPropertiesClientBuilder spreadRecordUnionClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadRecordUnionClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadRecordUnionClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadRecordUnionClient = spreadRecordUnionClientbuilder.buildSpreadRecordUnionClient(); @@ -437,11 +380,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder spreadRecordDiscriminatedUnionClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadRecordDiscriminatedUnionClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadRecordDiscriminatedUnionClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadRecordDiscriminatedUnionClient @@ -450,11 +391,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder spreadRecordNonDiscriminatedUnionClientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadRecordNonDiscriminatedUnionClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadRecordNonDiscriminatedUnionClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadRecordNonDiscriminatedUnionClient @@ -463,11 +402,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder spreadRecordNonDiscriminatedUnion2Clientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadRecordNonDiscriminatedUnion2Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadRecordNonDiscriminatedUnion2Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadRecordNonDiscriminatedUnion2Client @@ -476,11 +413,9 @@ protected void beforeTest() { AdditionalPropertiesClientBuilder spreadRecordNonDiscriminatedUnion3Clientbuilder = new AdditionalPropertiesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - spreadRecordNonDiscriminatedUnion3Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { spreadRecordNonDiscriminatedUnion3Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } spreadRecordNonDiscriminatedUnion3Client diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/nullable/generated/NullableClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/nullable/generated/NullableClientTestBase.java index cc371f12ce..9feb48d381 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/nullable/generated/NullableClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/nullable/generated/NullableClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -42,77 +41,63 @@ class NullableClientTestBase extends TestProxyTestBase { protected void beforeTest() { NullableClientBuilder stringOperationClientbuilder = new NullableClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringOperationClient = stringOperationClientbuilder.buildStringOperationClient(); NullableClientBuilder bytesClientbuilder = new NullableClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - bytesClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { bytesClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } bytesClient = bytesClientbuilder.buildBytesClient(); NullableClientBuilder datetimeOperationClientbuilder = new NullableClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - datetimeOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { datetimeOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } datetimeOperationClient = datetimeOperationClientbuilder.buildDatetimeOperationClient(); NullableClientBuilder durationOperationClientbuilder = new NullableClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - durationOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { durationOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } durationOperationClient = durationOperationClientbuilder.buildDurationOperationClient(); NullableClientBuilder collectionsByteClientbuilder = new NullableClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - collectionsByteClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { collectionsByteClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } collectionsByteClient = collectionsByteClientbuilder.buildCollectionsByteClient(); NullableClientBuilder collectionsModelClientbuilder = new NullableClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - collectionsModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { collectionsModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } collectionsModelClient = collectionsModelClientbuilder.buildCollectionsModelClient(); NullableClientBuilder collectionsStringClientbuilder = new NullableClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - collectionsStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { collectionsStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } collectionsStringClient = collectionsStringClientbuilder.buildCollectionsStringClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/optional/generated/OptionalClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/optional/generated/OptionalClientTestBase.java index f376090519..725b9fac90 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/optional/generated/OptionalClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/optional/generated/OptionalClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -69,176 +68,144 @@ class OptionalClientTestBase extends TestProxyTestBase { protected void beforeTest() { OptionalClientBuilder stringOperationClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringOperationClient = stringOperationClientbuilder.buildStringOperationClient(); OptionalClientBuilder bytesClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - bytesClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { bytesClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } bytesClient = bytesClientbuilder.buildBytesClient(); OptionalClientBuilder datetimeOperationClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - datetimeOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { datetimeOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } datetimeOperationClient = datetimeOperationClientbuilder.buildDatetimeOperationClient(); OptionalClientBuilder durationOperationClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - durationOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { durationOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } durationOperationClient = durationOperationClientbuilder.buildDurationOperationClient(); OptionalClientBuilder plainDateClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - plainDateClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { plainDateClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } plainDateClient = plainDateClientbuilder.buildPlainDateClient(); OptionalClientBuilder plainTimeClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - plainTimeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { plainTimeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } plainTimeClient = plainTimeClientbuilder.buildPlainTimeClient(); OptionalClientBuilder collectionsByteClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - collectionsByteClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { collectionsByteClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } collectionsByteClient = collectionsByteClientbuilder.buildCollectionsByteClient(); OptionalClientBuilder collectionsModelClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - collectionsModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { collectionsModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } collectionsModelClient = collectionsModelClientbuilder.buildCollectionsModelClient(); OptionalClientBuilder stringLiteralClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringLiteralClient = stringLiteralClientbuilder.buildStringLiteralClient(); OptionalClientBuilder intLiteralClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - intLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { intLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } intLiteralClient = intLiteralClientbuilder.buildIntLiteralClient(); OptionalClientBuilder floatLiteralClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - floatLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { floatLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } floatLiteralClient = floatLiteralClientbuilder.buildFloatLiteralClient(); OptionalClientBuilder booleanLiteralClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - booleanLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { booleanLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } booleanLiteralClient = booleanLiteralClientbuilder.buildBooleanLiteralClient(); OptionalClientBuilder unionStringLiteralClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionStringLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionStringLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionStringLiteralClient = unionStringLiteralClientbuilder.buildUnionStringLiteralClient(); OptionalClientBuilder unionIntLiteralClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionIntLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionIntLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionIntLiteralClient = unionIntLiteralClientbuilder.buildUnionIntLiteralClient(); OptionalClientBuilder unionFloatLiteralClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionFloatLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionFloatLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionFloatLiteralClient = unionFloatLiteralClientbuilder.buildUnionFloatLiteralClient(); OptionalClientBuilder requiredAndOptionalClientbuilder = new OptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - requiredAndOptionalClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { requiredAndOptionalClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } requiredAndOptionalClient = requiredAndOptionalClientbuilder.buildRequiredAndOptionalClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/valuetypes/generated/ValueTypesClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/valuetypes/generated/ValueTypesClientTestBase.java index 6a9e20c137..c901c47ef5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/valuetypes/generated/ValueTypesClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/property/valuetypes/generated/ValueTypesClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -108,319 +107,261 @@ class ValueTypesClientTestBase extends TestProxyTestBase { protected void beforeTest() { ValueTypesClientBuilder booleanOperationClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - booleanOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { booleanOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } booleanOperationClient = booleanOperationClientbuilder.buildBooleanOperationClient(); ValueTypesClientBuilder stringOperationClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringOperationClient = stringOperationClientbuilder.buildStringOperationClient(); ValueTypesClientBuilder bytesClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - bytesClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { bytesClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } bytesClient = bytesClientbuilder.buildBytesClient(); ValueTypesClientBuilder intClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - intClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { intClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } intClient = intClientbuilder.buildIntClient(); ValueTypesClientBuilder floatOperationClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - floatOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { floatOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } floatOperationClient = floatOperationClientbuilder.buildFloatOperationClient(); ValueTypesClientBuilder decimalClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - decimalClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { decimalClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } decimalClient = decimalClientbuilder.buildDecimalClient(); ValueTypesClientBuilder decimal128Clientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - decimal128Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { decimal128Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } decimal128Client = decimal128Clientbuilder.buildDecimal128Client(); ValueTypesClientBuilder datetimeOperationClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - datetimeOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { datetimeOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } datetimeOperationClient = datetimeOperationClientbuilder.buildDatetimeOperationClient(); ValueTypesClientBuilder durationOperationClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - durationOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { durationOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } durationOperationClient = durationOperationClientbuilder.buildDurationOperationClient(); ValueTypesClientBuilder enumClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - enumClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { enumClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } enumClient = enumClientbuilder.buildEnumClient(); ValueTypesClientBuilder extensibleEnumClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - extensibleEnumClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { extensibleEnumClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } extensibleEnumClient = extensibleEnumClientbuilder.buildExtensibleEnumClient(); ValueTypesClientBuilder modelClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelClient = modelClientbuilder.buildModelClient(); ValueTypesClientBuilder collectionsStringClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - collectionsStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { collectionsStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } collectionsStringClient = collectionsStringClientbuilder.buildCollectionsStringClient(); ValueTypesClientBuilder collectionsIntClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - collectionsIntClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { collectionsIntClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } collectionsIntClient = collectionsIntClientbuilder.buildCollectionsIntClient(); ValueTypesClientBuilder collectionsModelClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - collectionsModelClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { collectionsModelClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } collectionsModelClient = collectionsModelClientbuilder.buildCollectionsModelClient(); ValueTypesClientBuilder dictionaryStringClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - dictionaryStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { dictionaryStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } dictionaryStringClient = dictionaryStringClientbuilder.buildDictionaryStringClient(); ValueTypesClientBuilder neverClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - neverClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { neverClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } neverClient = neverClientbuilder.buildNeverClient(); ValueTypesClientBuilder unknownStringClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unknownStringClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unknownStringClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unknownStringClient = unknownStringClientbuilder.buildUnknownStringClient(); ValueTypesClientBuilder unknownIntClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unknownIntClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unknownIntClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unknownIntClient = unknownIntClientbuilder.buildUnknownIntClient(); ValueTypesClientBuilder unknownDictClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unknownDictClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unknownDictClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unknownDictClient = unknownDictClientbuilder.buildUnknownDictClient(); ValueTypesClientBuilder unknownArrayClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unknownArrayClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unknownArrayClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unknownArrayClient = unknownArrayClientbuilder.buildUnknownArrayClient(); ValueTypesClientBuilder stringLiteralClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringLiteralClient = stringLiteralClientbuilder.buildStringLiteralClient(); ValueTypesClientBuilder intLiteralClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - intLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { intLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } intLiteralClient = intLiteralClientbuilder.buildIntLiteralClient(); ValueTypesClientBuilder floatLiteralClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - floatLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { floatLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } floatLiteralClient = floatLiteralClientbuilder.buildFloatLiteralClient(); ValueTypesClientBuilder booleanLiteralClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - booleanLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { booleanLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } booleanLiteralClient = booleanLiteralClientbuilder.buildBooleanLiteralClient(); ValueTypesClientBuilder unionStringLiteralClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionStringLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionStringLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionStringLiteralClient = unionStringLiteralClientbuilder.buildUnionStringLiteralClient(); ValueTypesClientBuilder unionIntLiteralClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionIntLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionIntLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionIntLiteralClient = unionIntLiteralClientbuilder.buildUnionIntLiteralClient(); ValueTypesClientBuilder unionFloatLiteralClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionFloatLiteralClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionFloatLiteralClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionFloatLiteralClient = unionFloatLiteralClientbuilder.buildUnionFloatLiteralClient(); ValueTypesClientBuilder unionEnumValueClientbuilder = new ValueTypesClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unionEnumValueClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unionEnumValueClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unionEnumValueClient = unionEnumValueClientbuilder.buildUnionEnumValueClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/scalar/generated/ScalarClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/scalar/generated/ScalarClientTestBase.java index 63b9007c62..6763f75774 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/scalar/generated/ScalarClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/scalar/generated/ScalarClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -42,77 +41,63 @@ class ScalarClientTestBase extends TestProxyTestBase { protected void beforeTest() { ScalarClientBuilder stringOperationClientbuilder = new ScalarClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringOperationClient = stringOperationClientbuilder.buildStringOperationClient(); ScalarClientBuilder booleanOperationClientbuilder = new ScalarClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - booleanOperationClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { booleanOperationClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } booleanOperationClient = booleanOperationClientbuilder.buildBooleanOperationClient(); ScalarClientBuilder unknownClientbuilder = new ScalarClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - unknownClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { unknownClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } unknownClient = unknownClientbuilder.buildUnknownClient(); ScalarClientBuilder decimalTypeClientbuilder = new ScalarClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - decimalTypeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { decimalTypeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } decimalTypeClient = decimalTypeClientbuilder.buildDecimalTypeClient(); ScalarClientBuilder decimal128TypeClientbuilder = new ScalarClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - decimal128TypeClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { decimal128TypeClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } decimal128TypeClient = decimal128TypeClientbuilder.buildDecimal128TypeClient(); ScalarClientBuilder decimalVerifyClientbuilder = new ScalarClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - decimalVerifyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { decimalVerifyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } decimalVerifyClient = decimalVerifyClientbuilder.buildDecimalVerifyClient(); ScalarClientBuilder decimal128VerifyClientbuilder = new ScalarClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - decimal128VerifyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { decimal128VerifyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } decimal128VerifyClient = decimal128VerifyClientbuilder.buildDecimal128VerifyClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/union/generated/UnionClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/union/generated/UnionClientTestBase.java index 4c8e1671b5..711fab983b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/union/generated/UnionClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/union/generated/UnionClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -51,110 +50,90 @@ class UnionClientTestBase extends TestProxyTestBase { protected void beforeTest() { UnionClientBuilder stringsOnlyClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringsOnlyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringsOnlyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringsOnlyClient = stringsOnlyClientbuilder.buildStringsOnlyClient(); UnionClientBuilder stringExtensibleClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringExtensibleClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringExtensibleClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringExtensibleClient = stringExtensibleClientbuilder.buildStringExtensibleClient(); UnionClientBuilder stringExtensibleNamedClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringExtensibleNamedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringExtensibleNamedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringExtensibleNamedClient = stringExtensibleNamedClientbuilder.buildStringExtensibleNamedClient(); UnionClientBuilder intsOnlyClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - intsOnlyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { intsOnlyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } intsOnlyClient = intsOnlyClientbuilder.buildIntsOnlyClient(); UnionClientBuilder floatsOnlyClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - floatsOnlyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { floatsOnlyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } floatsOnlyClient = floatsOnlyClientbuilder.buildFloatsOnlyClient(); UnionClientBuilder modelsOnlyClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - modelsOnlyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { modelsOnlyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } modelsOnlyClient = modelsOnlyClientbuilder.buildModelsOnlyClient(); UnionClientBuilder enumsOnlyClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - enumsOnlyClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { enumsOnlyClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } enumsOnlyClient = enumsOnlyClientbuilder.buildEnumsOnlyClient(); UnionClientBuilder stringAndArrayClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - stringAndArrayClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { stringAndArrayClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } stringAndArrayClient = stringAndArrayClientbuilder.buildStringAndArrayClient(); UnionClientBuilder mixedLiteralsClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - mixedLiteralsClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { mixedLiteralsClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } mixedLiteralsClient = mixedLiteralsClientbuilder.buildMixedLiteralsClient(); UnionClientBuilder mixedTypesClientbuilder = new UnionClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - mixedTypesClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { mixedTypesClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } mixedTypesClient = mixedTypesClientbuilder.buildMixedTypesClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/added/generated/AddedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/added/generated/AddedClientTestBase.java index 3ebd31ed02..915d810634 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/added/generated/AddedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/added/generated/AddedClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -28,11 +27,9 @@ protected void beforeTest() { AddedClientBuilder addedClientbuilder = new AddedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - addedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { addedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } addedClient = addedClientbuilder.buildClient(); @@ -40,11 +37,9 @@ protected void beforeTest() { AddedClientBuilder interfaceV2Clientbuilder = new AddedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - interfaceV2Clientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { interfaceV2Clientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } interfaceV2Client = interfaceV2Clientbuilder.buildInterfaceV2Client(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/madeoptional/generated/MadeOptionalClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/madeoptional/generated/MadeOptionalClientTestBase.java index e479cd025b..a135a1a6d7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/madeoptional/generated/MadeOptionalClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/madeoptional/generated/MadeOptionalClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -25,11 +24,9 @@ protected void beforeTest() { MadeOptionalClientBuilder madeOptionalClientbuilder = new MadeOptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - madeOptionalClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { madeOptionalClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } madeOptionalClient = madeOptionalClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/generated/RemovedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/generated/RemovedClientTestBase.java index efea19002e..8d7b0e8f33 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/generated/RemovedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/generated/RemovedClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -25,11 +24,9 @@ protected void beforeTest() { RemovedClientBuilder removedClientbuilder = new RemovedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - removedClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { removedClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } removedClient = removedClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/renamedfrom/generated/RenamedFromClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/renamedfrom/generated/RenamedFromClientTestBase.java index 0f609c09a3..4b17e6afb9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/renamedfrom/generated/RenamedFromClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/renamedfrom/generated/RenamedFromClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -28,11 +27,9 @@ protected void beforeTest() { RenamedFromClientBuilder renamedFromClientbuilder = new RenamedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - renamedFromClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { renamedFromClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } renamedFromClient = renamedFromClientbuilder.buildClient(); @@ -40,11 +37,9 @@ protected void beforeTest() { RenamedFromClientBuilder newInterfaceClientbuilder = new RenamedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - newInterfaceClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { newInterfaceClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } newInterfaceClient = newInterfaceClientbuilder.buildNewInterfaceClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java index 9b7dab9282..70b59f7d08 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -25,11 +24,9 @@ protected void beforeTest() { ReturnTypeChangedFromClientBuilder returnTypeChangedFromClientbuilder = new ReturnTypeChangedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - returnTypeChangedFromClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { returnTypeChangedFromClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } returnTypeChangedFromClient = returnTypeChangedFromClientbuilder.buildClient(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java index 1336f58697..848a381a49 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java @@ -8,7 +8,6 @@ // If you wish to modify these files, please copy them out of the 'generated' package, and modify there. // See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test. -import com.azure.core.http.HttpClient; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -25,11 +24,9 @@ protected void beforeTest() { TypeChangedFromClientBuilder typeChangedFromClientbuilder = new TypeChangedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) - .httpClient(HttpClient.createDefault()) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.PLAYBACK) { - typeChangedFromClientbuilder.httpClient(interceptorManager.getPlaybackClient()); - } else if (getTestMode() == TestMode.RECORD) { + if (getTestMode() == TestMode.RECORD) { typeChangedFromClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); } typeChangedFromClient = typeChangedFromClientbuilder.buildClient();