From 27d1069c252eda4988d221c0a04ca839e4fe1a20 Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:12:40 +0800 Subject: [PATCH 01/11] logic to not change enum to string type for data-plane path/url parameter --- .../http-client-java/emitter/src/code-model-builder.ts | 2 +- .../http/client/generator/core/util/SchemaUtil.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts index f94904a16c..b561aaa263 100644 --- a/packages/http-client-java/emitter/src/code-model-builder.ts +++ b/packages/http-client-java/emitter/src/code-model-builder.ts @@ -281,7 +281,7 @@ export class CodeModelBuilder { } else { const schema = this.processSchema(arg.type, arg.name); this.trackSchemaUsage(schema, { - usage: [SchemaContext.Input, SchemaContext.Output /*SchemaContext.Public*/], + usage: [SchemaContext.Input, SchemaContext.Output, SchemaContext.Public], }); parameter = new Parameter(arg.name, arg.doc ?? "", schema, { implementation: ImplementationLocation.Client, diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java index 0056348fb8..f862385bdf 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java @@ -25,6 +25,8 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IterableType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ListType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.PrimitiveType; +import org.apache.tools.ant.taskdefs.Java; + import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; @@ -223,7 +225,12 @@ public static IType removeModelFromParameter(RequestParameterLocation parameterR returnType = ClassType.BINARY_DATA; } else if (!(returnType instanceof PrimitiveType)) { if (type instanceof EnumType) { - returnType = ClassType.STRING; + boolean isPathOrURIParameter = RequestParameterLocation.PATH == parameterRequestLocation + || RequestParameterLocation.URI == parameterRequestLocation; + boolean isEnumAsString = !(JavaSettings.getInstance().isDataPlaneClient() && isPathOrURIParameter); + if (isEnumAsString) { // do not change enum to string type for data-plane path/url parameter + returnType = ClassType.STRING; + } } if (type instanceof IterableType && ((IterableType) type).getElementType() instanceof EnumType) { returnType = new IterableType(ClassType.STRING); From 74b3f842af5629474d33c4a55125eb7f9db6b585 Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:13:01 +0800 Subject: [PATCH 02/11] test template change --- .../template/example/ProtocolTestWriter.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) 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 1e1cfd757c..719d119c64 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 @@ -8,11 +8,7 @@ import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.util.Configuration; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Scheme; -import com.microsoft.typespec.http.client.generator.core.model.clientmodel.AsyncSyncClient; -import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClassType; -import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ServiceClient; -import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ServiceClientProperty; -import com.microsoft.typespec.http.client.generator.core.model.clientmodel.TestContext; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.*; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaBlock; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaClass; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaIfBlock; @@ -83,9 +79,20 @@ public ProtocolTestWriter(TestContext testContext) { String defaultValueExpression = serviceClientProperty.getDefaultValueExpression(); String expr; if (defaultValueExpression == null) { - expr = String.format("Configuration.getGlobalConfiguration().get(\"%1$s\", %2$s)", - serviceClientProperty.getName().toUpperCase(Locale.ROOT), ClassType.STRING - .defaultValueExpression(serviceClientProperty.getName().toLowerCase(Locale.ROOT))); + if (serviceClientProperty.getType() instanceof EnumType) { + expr = String.format( + "%1$s.fromString(Configuration.getGlobalConfiguration().get(\"%2$s\", %3$s))", + serviceClientProperty.getType(), + serviceClientProperty.getName().toUpperCase(Locale.ROOT), + ClassType.STRING.defaultValueExpression( + serviceClientProperty.getName().toLowerCase(Locale.ROOT))); + + } else { + expr = String.format("Configuration.getGlobalConfiguration().get(\"%1$s\", %2$s)", + serviceClientProperty.getName().toUpperCase(Locale.ROOT), + ClassType.STRING.defaultValueExpression( + serviceClientProperty.getName().toLowerCase(Locale.ROOT))); + } } else { expr = String.format("Configuration.getGlobalConfiguration().get(\"%1$s\", %2$s)", serviceClientProperty.getName().toUpperCase(Locale.ROOT), defaultValueExpression); From ee68228b27c7614e1e1340d6303ce93522c02ba5 Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:13:17 +0800 Subject: [PATCH 03/11] regen --- .../service/ClientAClientBuilder.java | 5 +- .../service/ClientBClientBuilder.java | 5 +- .../structure/service/FirstClientBuilder.java | 5 +- .../RenamedOperationClientBuilder.java | 5 +- .../service/ServiceClientClientBuilder.java | 5 +- .../TwoOperationGroupClientBuilder.java | 5 +- .../service/implementation/BarsImpl.java | 9 +-- .../service/implementation/BazFoosImpl.java | 5 +- .../implementation/ClientAClientImpl.java | 25 +++---- .../implementation/ClientBClientImpl.java | 23 +++--- .../implementation/FirstClientImpl.java | 15 ++-- .../service/implementation/FoosImpl.java | 9 +-- .../service/implementation/Group1sImpl.java | 13 ++-- .../service/implementation/Group2sImpl.java | 13 ++-- .../service/implementation/Group3sImpl.java | 9 +-- .../service/implementation/Group4sImpl.java | 5 +- .../service/implementation/Group5sImpl.java | 5 +- .../service/implementation/GroupsImpl.java | 13 ++-- .../service/implementation/QuxBarsImpl.java | 5 +- .../service/implementation/QuxesImpl.java | 5 +- .../RenamedOperationClientImpl.java | 25 +++---- .../implementation/SecondClientImpl.java | 15 ++-- .../ServiceClientClientImpl.java | 19 ++--- .../TwoOperationGroupClientImpl.java | 11 +-- .../structure/service/models/ClientType.java | 71 +++++++++++++++++++ .../service/models/package-info.java | 18 +++++ .../subnamespace/SecondClientBuilder.java | 5 +- .../versioning/added/AddedClientBuilder.java | 5 +- .../added/implementation/AddedClientImpl.java | 19 ++--- .../implementation/InterfaceV2sImpl.java | 5 +- .../com/versioning/added/models/Versions.java | 56 +++++++++++++++ .../MadeOptionalClientBuilder.java | 5 +- .../MadeOptionalClientImpl.java | 15 ++-- .../madeoptional/models/Versions.java | 56 +++++++++++++++ .../removed/RemovedClientBuilder.java | 5 +- .../implementation/RemovedClientImpl.java | 15 ++-- .../versioning/removed/models/Versions.java | 56 +++++++++++++++ .../renamedfrom/RenamedFromClientBuilder.java | 5 +- .../implementation/NewInterfacesImpl.java | 5 +- .../implementation/RenamedFromClientImpl.java | 15 ++-- .../renamedfrom/models/Versions.java | 56 +++++++++++++++ .../ReturnTypeChangedFromClientBuilder.java | 5 +- .../ReturnTypeChangedFromClientImpl.java | 15 ++-- .../models/Versions.java | 56 +++++++++++++++ .../models/package-info.java | 11 +++ .../TypeChangedFromClientBuilder.java | 5 +- .../TypeChangedFromClientImpl.java | 15 ++-- .../typechangedfrom/models/Versions.java | 56 +++++++++++++++ .../versioning-added_apiview_properties.json | 3 +- ...oning-madeoptional_apiview_properties.json | 3 +- ...versioning-removed_apiview_properties.json | 3 +- ...ioning-renamedfrom_apiview_properties.json | 3 +- ...urntypechangedfrom_apiview_properties.json | 3 +- ...ng-typechangedfrom_apiview_properties.json | 3 +- .../structure/ClientOperationGroupTests.java | 5 +- .../client/structure/DefaultClientTests.java | 13 ++-- .../client/structure/MultiClientTests.java | 5 +- .../structure/OperationGroupClientTests.java | 5 +- .../structure/RenameOperationTests.java | 5 +- .../generated/ClientAClientTestBase.java | 5 +- .../generated/FirstClientTestBase.java | 11 +-- .../RenamedOperationClientTestBase.java | 5 +- .../ServiceClientClientTestBase.java | 13 ++-- .../TwoOperationGroupClientTestBase.java | 5 +- .../type/array/UnknownValueClientTest.java | 3 - .../dictionary/UnknownValueClientTest.java | 2 - .../java/com/type/scalar/ScalarTests.java | 3 +- .../versioning/added/AddedClientTests.java | 9 +-- .../added/generated/AddedClientTestBase.java | 5 +- .../madeoptional/MadeOptionalClienTests.java | 3 +- .../generated/MadeOptionalClientTestBase.java | 3 +- .../removed/RemovedClientTests.java | 5 +- .../generated/RemovedClientTestBase.java | 3 +- .../renamedfrom/RenamedFromClientTests.java | 5 +- .../generated/RenamedFromClientTestBase.java | 5 +- .../ReturnTypeChangedFromClientTests.java | 3 +- .../ReturnTypeChangedFromClientTestBase.java | 3 +- .../TypeChangedFromClientTests.java | 3 +- .../TypeChangedFromClientTestBase.java | 3 +- 79 files changed, 735 insertions(+), 242 deletions(-) create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/ClientType.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/package-info.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/models/Versions.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/models/Versions.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/Versions.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/models/Versions.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/Versions.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/package-info.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/models/Versions.java diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ClientAClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ClientAClientBuilder.java index 39ad0ac944..0016c76900 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ClientAClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ClientAClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.client.structure.service.implementation.ClientAClientImpl; +import com.client.structure.service.models.ClientType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -194,7 +195,7 @@ public ClientAClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -203,7 +204,7 @@ public ClientAClientBuilder endpoint(String endpoint) { * @return the ClientAClientBuilder. */ @Generated - public ClientAClientBuilder client(String client) { + public ClientAClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ClientBClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ClientBClientBuilder.java index 2e151df9e5..05043adb98 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ClientBClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ClientBClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.client.structure.service.implementation.ClientBClientImpl; +import com.client.structure.service.models.ClientType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -194,7 +195,7 @@ public ClientBClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -203,7 +204,7 @@ public ClientBClientBuilder endpoint(String endpoint) { * @return the ClientBClientBuilder. */ @Generated - public ClientBClientBuilder client(String client) { + public ClientBClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/FirstClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/FirstClientBuilder.java index 4e07b3fc24..49429c63a5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/FirstClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/FirstClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.client.structure.service.implementation.FirstClientImpl; +import com.client.structure.service.models.ClientType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -201,7 +202,7 @@ public FirstClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -210,7 +211,7 @@ public FirstClientBuilder endpoint(String endpoint) { * @return the FirstClientBuilder. */ @Generated - public FirstClientBuilder client(String client) { + public FirstClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/RenamedOperationClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/RenamedOperationClientBuilder.java index 7cbba3c1c7..22c9309531 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/RenamedOperationClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/RenamedOperationClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.client.structure.service.implementation.RenamedOperationClientImpl; +import com.client.structure.service.models.ClientType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -199,7 +200,7 @@ public RenamedOperationClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -208,7 +209,7 @@ public RenamedOperationClientBuilder endpoint(String endpoint) { * @return the RenamedOperationClientBuilder. */ @Generated - public RenamedOperationClientBuilder client(String client) { + public RenamedOperationClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ServiceClientClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ServiceClientClientBuilder.java index f28cabb3c8..b2345b73e2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ServiceClientClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/ServiceClientClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.client.structure.service.implementation.ServiceClientClientImpl; +import com.client.structure.service.models.ClientType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -207,7 +208,7 @@ public ServiceClientClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -216,7 +217,7 @@ public ServiceClientClientBuilder endpoint(String endpoint) { * @return the ServiceClientClientBuilder. */ @Generated - public ServiceClientClientBuilder client(String client) { + public ServiceClientClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/TwoOperationGroupClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/TwoOperationGroupClientBuilder.java index 04c566409c..3a750eade9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/TwoOperationGroupClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/TwoOperationGroupClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.client.structure.service.implementation.TwoOperationGroupClientImpl; +import com.client.structure.service.models.ClientType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -195,7 +196,7 @@ public TwoOperationGroupClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -204,7 +205,7 @@ public TwoOperationGroupClientBuilder endpoint(String endpoint) { * @return the TwoOperationGroupClientBuilder. */ @Generated - public TwoOperationGroupClientBuilder client(String client) { + public TwoOperationGroupClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/BarsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/BarsImpl.java index cbaaebe088..68d109d13d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/BarsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/BarsImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface BarsService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> five(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> five(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/five") @@ -69,7 +70,7 @@ Mono> five(@HostParam("endpoint") String endpoint, @HostParam("cl @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response fiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response fiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -78,7 +79,7 @@ Response fiveSync(@HostParam("endpoint") String endpoint, @HostParam("clie @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> six(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> six(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -87,7 +88,7 @@ Mono> six(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sixSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response sixSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/BazFoosImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/BazFoosImpl.java index 4fec7b0a1c..da32a647d2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/BazFoosImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/BazFoosImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface BazFoosService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> seven(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> seven(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/seven") @@ -69,7 +70,7 @@ Mono> seven(@HostParam("endpoint") String endpoint, @HostParam("c @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sevenSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response sevenSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ClientAClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ClientAClientImpl.java index 0522be5c4f..0a6c48b53e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ClientAClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ClientAClientImpl.java @@ -27,6 +27,7 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -55,14 +56,14 @@ public String getEndpoint() { /** * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - private final String client; + private final ClientType client; /** * Gets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. * * @return the client value. */ - public String getClient() { + public ClientType getClient() { return this.client; } @@ -100,7 +101,7 @@ public SerializerAdapter getSerializerAdapter() { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public ClientAClientImpl(String endpoint, String client) { + public ClientAClientImpl(String endpoint, ClientType client) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -112,7 +113,7 @@ public ClientAClientImpl(String endpoint, String client) { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public ClientAClientImpl(HttpPipeline httpPipeline, String endpoint, String client) { + public ClientAClientImpl(HttpPipeline httpPipeline, String endpoint, ClientType client) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -125,7 +126,7 @@ public ClientAClientImpl(HttpPipeline httpPipeline, String endpoint, String clie * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ public ClientAClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String client) { + ClientType client) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -145,7 +146,7 @@ public interface ClientAClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedOne(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedOne(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/one") @@ -154,7 +155,7 @@ Mono> renamedOne(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedOneSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedOneSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @@ -163,8 +164,8 @@ Response renamedOneSync(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedThree(@HostParam("endpoint") String endpoint, @HostParam("client") String client, - RequestOptions requestOptions, Context context); + Mono> renamedThree(@HostParam("endpoint") String endpoint, + @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @ExpectedResponses({ 204 }) @@ -172,7 +173,7 @@ Mono> renamedThree(@HostParam("endpoint") String endpoint, @HostP @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedThreeSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedThreeSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/five") @@ -181,7 +182,7 @@ Response renamedThreeSync(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedFive(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedFive(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/five") @@ -190,7 +191,7 @@ Mono> renamedFive(@HostParam("endpoint") String endpoint, @HostPa @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedFiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedFiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ClientBClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ClientBClientImpl.java index e52b68219d..e8ea990449 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ClientBClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ClientBClientImpl.java @@ -27,6 +27,7 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -55,14 +56,14 @@ public String getEndpoint() { /** * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - private final String client; + private final ClientType client; /** * Gets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. * * @return the client value. */ - public String getClient() { + public ClientType getClient() { return this.client; } @@ -100,7 +101,7 @@ public SerializerAdapter getSerializerAdapter() { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public ClientBClientImpl(String endpoint, String client) { + public ClientBClientImpl(String endpoint, ClientType client) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -112,7 +113,7 @@ public ClientBClientImpl(String endpoint, String client) { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public ClientBClientImpl(HttpPipeline httpPipeline, String endpoint, String client) { + public ClientBClientImpl(HttpPipeline httpPipeline, String endpoint, ClientType client) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -125,7 +126,7 @@ public ClientBClientImpl(HttpPipeline httpPipeline, String endpoint, String clie * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ public ClientBClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String client) { + ClientType client) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -145,7 +146,7 @@ public interface ClientBClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedTwo(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedTwo(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/two") @@ -154,7 +155,7 @@ Mono> renamedTwo(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedTwoSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedTwoSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -163,7 +164,7 @@ Response renamedTwoSync(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedFour(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedFour(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -172,7 +173,7 @@ Mono> renamedFour(@HostParam("endpoint") String endpoint, @HostPa @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedFourSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedFourSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -181,7 +182,7 @@ Response renamedFourSync(@HostParam("endpoint") String endpoint, @HostPara @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedSix(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedSix(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -190,7 +191,7 @@ Mono> renamedSix(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedSixSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedSixSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/FirstClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/FirstClientImpl.java index eb816c9671..a0bb09aaf8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/FirstClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/FirstClientImpl.java @@ -27,6 +27,7 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -55,14 +56,14 @@ public String getEndpoint() { /** * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - private final String client; + private final ClientType client; /** * Gets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. * * @return the client value. */ - public String getClient() { + public ClientType getClient() { return this.client; } @@ -128,7 +129,7 @@ public Group4sImpl getGroup4s() { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public FirstClientImpl(String endpoint, String client) { + public FirstClientImpl(String endpoint, ClientType client) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -140,7 +141,7 @@ public FirstClientImpl(String endpoint, String client) { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public FirstClientImpl(HttpPipeline httpPipeline, String endpoint, String client) { + public FirstClientImpl(HttpPipeline httpPipeline, String endpoint, ClientType client) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -153,7 +154,7 @@ public FirstClientImpl(HttpPipeline httpPipeline, String endpoint, String client * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ public FirstClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String client) { + ClientType client) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -175,7 +176,7 @@ public interface FirstClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> one(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> one(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/one") @@ -184,7 +185,7 @@ Mono> one(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response oneSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response oneSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/FoosImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/FoosImpl.java index e83cf6bf78..421cda7703 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/FoosImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/FoosImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface FoosService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> three(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> three(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @@ -69,7 +70,7 @@ Mono> three(@HostParam("endpoint") String endpoint, @HostParam("c @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response threeSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response threeSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -78,7 +79,7 @@ Response threeSync(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> four(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> four(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -87,7 +88,7 @@ Mono> four(@HostParam("endpoint") String endpoint, @HostParam("cl @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response fourSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response fourSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group1sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group1sImpl.java index bdd1938e5b..eb6cc6dcab 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group1sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group1sImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface Group1sService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> one(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> one(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/one") @@ -69,7 +70,7 @@ Mono> one(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response oneSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response oneSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @@ -78,7 +79,7 @@ Response oneSync(@HostParam("endpoint") String endpoint, @HostParam("clien @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> three(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> three(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @@ -87,7 +88,7 @@ Mono> three(@HostParam("endpoint") String endpoint, @HostParam("c @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response threeSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response threeSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -96,7 +97,7 @@ Response threeSync(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> four(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> four(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -105,7 +106,7 @@ Mono> four(@HostParam("endpoint") String endpoint, @HostParam("cl @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response fourSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response fourSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group2sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group2sImpl.java index 01e5b55919..0161e33737 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group2sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group2sImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface Group2sService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> two(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> two(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/two") @@ -69,7 +70,7 @@ Mono> two(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response twoSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response twoSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/five") @@ -78,7 +79,7 @@ Response twoSync(@HostParam("endpoint") String endpoint, @HostParam("clien @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> five(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> five(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/five") @@ -87,7 +88,7 @@ Mono> five(@HostParam("endpoint") String endpoint, @HostParam("cl @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response fiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response fiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -96,7 +97,7 @@ Response fiveSync(@HostParam("endpoint") String endpoint, @HostParam("clie @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> six(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> six(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -105,7 +106,7 @@ Mono> six(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sixSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response sixSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group3sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group3sImpl.java index f24593118f..6b4fcfd98a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group3sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group3sImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface Group3sService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> two(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> two(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/two") @@ -69,7 +70,7 @@ Mono> two(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response twoSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response twoSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @@ -78,7 +79,7 @@ Response twoSync(@HostParam("endpoint") String endpoint, @HostParam("clien @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> three(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> three(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @@ -87,7 +88,7 @@ Mono> three(@HostParam("endpoint") String endpoint, @HostParam("c @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response threeSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response threeSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group4sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group4sImpl.java index e7c54920b9..1958ad964d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group4sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group4sImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface Group4sService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> four(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> four(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -69,7 +70,7 @@ Mono> four(@HostParam("endpoint") String endpoint, @HostParam("cl @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response fourSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response fourSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group5sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group5sImpl.java index 30f45f556a..6811a2a9bc 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group5sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/Group5sImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface Group5sService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> six(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> six(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -69,7 +70,7 @@ Mono> six(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response sixSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response sixSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/GroupsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/GroupsImpl.java index 3d53989732..a717f5373b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/GroupsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/GroupsImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface GroupsService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedTwo(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedTwo(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/two") @@ -69,7 +70,7 @@ Mono> renamedTwo(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedTwoSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedTwoSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -78,7 +79,7 @@ Response renamedTwoSync(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedFour(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedFour(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/four") @@ -87,7 +88,7 @@ Mono> renamedFour(@HostParam("endpoint") String endpoint, @HostPa @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedFourSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedFourSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -96,7 +97,7 @@ Response renamedFourSync(@HostParam("endpoint") String endpoint, @HostPara @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedSix(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedSix(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/six") @@ -105,7 +106,7 @@ Mono> renamedSix(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedSixSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedSixSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/QuxBarsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/QuxBarsImpl.java index c1fd91c812..f58d48217d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/QuxBarsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/QuxBarsImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface QuxBarsService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> nine(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> nine(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/nine") @@ -69,7 +70,7 @@ Mono> nine(@HostParam("endpoint") String endpoint, @HostParam("cl @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response nineSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response nineSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/QuxesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/QuxesImpl.java index 7ef995cdaf..390dbb31c5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/QuxesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/QuxesImpl.java @@ -21,6 +21,7 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -60,7 +61,7 @@ public interface QuxesService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> eight(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> eight(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/eight") @@ -69,7 +70,7 @@ Mono> eight(@HostParam("endpoint") String endpoint, @HostParam("c @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response eightSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response eightSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/RenamedOperationClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/RenamedOperationClientImpl.java index a0727fb3f3..0f72e2b873 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/RenamedOperationClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/RenamedOperationClientImpl.java @@ -27,6 +27,7 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -55,14 +56,14 @@ public String getEndpoint() { /** * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - private final String client; + private final ClientType client; /** * Gets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. * * @return the client value. */ - public String getClient() { + public ClientType getClient() { return this.client; } @@ -114,7 +115,7 @@ public GroupsImpl getGroups() { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public RenamedOperationClientImpl(String endpoint, String client) { + public RenamedOperationClientImpl(String endpoint, ClientType client) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -126,7 +127,7 @@ public RenamedOperationClientImpl(String endpoint, String client) { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public RenamedOperationClientImpl(HttpPipeline httpPipeline, String endpoint, String client) { + public RenamedOperationClientImpl(HttpPipeline httpPipeline, String endpoint, ClientType client) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -139,7 +140,7 @@ public RenamedOperationClientImpl(HttpPipeline httpPipeline, String endpoint, St * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ public RenamedOperationClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String client) { + ClientType client) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -162,7 +163,7 @@ public interface RenamedOperationClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedOne(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedOne(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/one") @@ -171,7 +172,7 @@ Mono> renamedOne(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedOneSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedOneSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @@ -180,8 +181,8 @@ Response renamedOneSync(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedThree(@HostParam("endpoint") String endpoint, @HostParam("client") String client, - RequestOptions requestOptions, Context context); + Mono> renamedThree(@HostParam("endpoint") String endpoint, + @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/three") @ExpectedResponses({ 204 }) @@ -189,7 +190,7 @@ Mono> renamedThree(@HostParam("endpoint") String endpoint, @HostP @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedThreeSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedThreeSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/five") @@ -198,7 +199,7 @@ Response renamedThreeSync(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> renamedFive(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> renamedFive(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/five") @@ -207,7 +208,7 @@ Mono> renamedFive(@HostParam("endpoint") String endpoint, @HostPa @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response renamedFiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response renamedFiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/SecondClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/SecondClientImpl.java index 89bb2a6ada..c2cc6561fe 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/SecondClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/SecondClientImpl.java @@ -27,6 +27,7 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -55,14 +56,14 @@ public String getEndpoint() { /** * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - private final String client; + private final ClientType client; /** * Gets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. * * @return the client value. */ - public String getClient() { + public ClientType getClient() { return this.client; } @@ -114,7 +115,7 @@ public Group5sImpl getGroup5s() { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public SecondClientImpl(String endpoint, String client) { + public SecondClientImpl(String endpoint, ClientType client) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -126,7 +127,7 @@ public SecondClientImpl(String endpoint, String client) { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public SecondClientImpl(HttpPipeline httpPipeline, String endpoint, String client) { + public SecondClientImpl(HttpPipeline httpPipeline, String endpoint, ClientType client) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -139,7 +140,7 @@ public SecondClientImpl(HttpPipeline httpPipeline, String endpoint, String clien * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ public SecondClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String client) { + ClientType client) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -160,7 +161,7 @@ public interface SecondClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> five(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> five(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/five") @@ -169,7 +170,7 @@ Mono> five(@HostParam("endpoint") String endpoint, @HostParam("cl @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response fiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response fiveSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ServiceClientClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ServiceClientClientImpl.java index ffe7896433..7a2431afd3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ServiceClientClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/ServiceClientClientImpl.java @@ -27,6 +27,7 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; +import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** @@ -55,14 +56,14 @@ public String getEndpoint() { /** * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - private final String client; + private final ClientType client; /** * Gets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. * * @return the client value. */ - public String getClient() { + public ClientType getClient() { return this.client; } @@ -170,7 +171,7 @@ public BarsImpl getBars() { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public ServiceClientClientImpl(String endpoint, String client) { + public ServiceClientClientImpl(String endpoint, ClientType client) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -182,7 +183,7 @@ public ServiceClientClientImpl(String endpoint, String client) { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public ServiceClientClientImpl(HttpPipeline httpPipeline, String endpoint, String client) { + public ServiceClientClientImpl(HttpPipeline httpPipeline, String endpoint, ClientType client) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -195,7 +196,7 @@ public ServiceClientClientImpl(HttpPipeline httpPipeline, String endpoint, Strin * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ public ServiceClientClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String client) { + ClientType client) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -222,7 +223,7 @@ public interface ServiceClientClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> one(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> one(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/one") @@ -231,7 +232,7 @@ Mono> one(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response oneSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response oneSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/two") @@ -240,7 +241,7 @@ Response oneSync(@HostParam("endpoint") String endpoint, @HostParam("clien @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> two(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Mono> two(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); @Post("/two") @@ -249,7 +250,7 @@ Mono> two(@HostParam("endpoint") String endpoint, @HostParam("cli @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response twoSync(@HostParam("endpoint") String endpoint, @HostParam("client") String client, + Response twoSync(@HostParam("endpoint") String endpoint, @HostParam("client") ClientType client, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/TwoOperationGroupClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/TwoOperationGroupClientImpl.java index 3f7d5359e4..1778e8b992 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/TwoOperationGroupClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/implementation/TwoOperationGroupClientImpl.java @@ -10,6 +10,7 @@ import com.azure.core.http.policy.UserAgentPolicy; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; +import com.client.structure.service.models.ClientType; /** * Initializes a new instance of the TwoOperationGroupClient type. @@ -32,14 +33,14 @@ public String getEndpoint() { /** * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - private final String client; + private final ClientType client; /** * Gets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. * * @return the client value. */ - public String getClient() { + public ClientType getClient() { return this.client; } @@ -105,7 +106,7 @@ public Group2sImpl getGroup2s() { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public TwoOperationGroupClientImpl(String endpoint, String client) { + public TwoOperationGroupClientImpl(String endpoint, ClientType client) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -117,7 +118,7 @@ public TwoOperationGroupClientImpl(String endpoint, String client) { * @param endpoint Need to be set as 'http://localhost:3000' in client. * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ - public TwoOperationGroupClientImpl(HttpPipeline httpPipeline, String endpoint, String client) { + public TwoOperationGroupClientImpl(HttpPipeline httpPipeline, String endpoint, ClientType client) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, client); } @@ -130,7 +131,7 @@ public TwoOperationGroupClientImpl(HttpPipeline httpPipeline, String endpoint, S * @param client Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ public TwoOperationGroupClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String client) { + ClientType client) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/ClientType.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/ClientType.java new file mode 100644 index 0000000000..d77c15cdd1 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/ClientType.java @@ -0,0 +1,71 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.client.structure.service.models; + +/** + * Defines values for ClientType. + */ +public enum ClientType { + /** + * Enum value default. + */ + DEFAULT("default"), + + /** + * Enum value multi-client. + */ + MULTI_CLIENT("multi-client"), + + /** + * Enum value renamed-operation. + */ + RENAMED_OPERATION("renamed-operation"), + + /** + * Enum value two-operation-group. + */ + TWO_OPERATION_GROUP("two-operation-group"), + + /** + * Enum value client-operation-group. + */ + CLIENT_OPERATION_GROUP("client-operation-group"); + + /** + * The actual serialized value for a ClientType instance. + */ + private final String value; + + ClientType(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a ClientType instance. + * + * @param value the serialized value to parse. + * @return the parsed ClientType object, or null if unable to parse. + */ + public static ClientType fromString(String value) { + if (value == null) { + return null; + } + ClientType[] items = ClientType.values(); + for (ClientType item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/package-info.java new file mode 100644 index 0000000000..d9a21e6dad --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/package-info.java @@ -0,0 +1,18 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for Service. + * Test that we can use @client and @operationGroup decorators to customize client side code structure, such + * as: + * 1. have everything as default. + * 2. to rename client or operation group + * 3. one client can have more than one operations groups + * 4. split one interface into two clients + * 5. have two clients with operations come from different interfaces + * 6. have two clients with a hierarchy relation. + * + */ +package com.client.structure.service.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/subnamespace/SecondClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/subnamespace/SecondClientBuilder.java index 1d48e1b40f..a79a65878c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/subnamespace/SecondClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/subnamespace/SecondClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.client.structure.service.implementation.SecondClientImpl; +import com.client.structure.service.models.ClientType; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -195,7 +196,7 @@ public SecondClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -204,7 +205,7 @@ public SecondClientBuilder endpoint(String endpoint) { * @return the SecondClientBuilder. */ @Generated - public SecondClientBuilder client(String client) { + public SecondClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/AddedClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/AddedClientBuilder.java index 45ff3770eb..1157448f04 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/AddedClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/AddedClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.versioning.added.implementation.AddedClientImpl; +import com.versioning.added.models.Versions; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -198,7 +199,7 @@ public AddedClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -207,7 +208,7 @@ public AddedClientBuilder endpoint(String endpoint) { * @return the AddedClientBuilder. */ @Generated - public AddedClientBuilder version(String version) { + public AddedClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/implementation/AddedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/implementation/AddedClientImpl.java index 83ba3ac0ee..a9bcb7855a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/implementation/AddedClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/implementation/AddedClientImpl.java @@ -31,6 +31,7 @@ import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; import com.versioning.added.AddedServiceVersion; +import com.versioning.added.models.Versions; import reactor.core.publisher.Mono; /** @@ -59,14 +60,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -133,7 +134,7 @@ public InterfaceV2sImpl getInterfaceV2s() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public AddedClientImpl(String endpoint, String version, AddedServiceVersion serviceVersion) { + public AddedClientImpl(String endpoint, Versions version, AddedServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -146,7 +147,7 @@ public AddedClientImpl(String endpoint, String version, AddedServiceVersion serv * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public AddedClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public AddedClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, AddedServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -161,7 +162,7 @@ public AddedClientImpl(HttpPipeline httpPipeline, String endpoint, String versio * @param serviceVersion Service version. */ public AddedClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, AddedServiceVersion serviceVersion) { + Versions version, AddedServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -183,7 +184,7 @@ public interface AddedClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> v1(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> v1(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("header-v2") String headerV2, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -194,7 +195,7 @@ Mono> v1(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response v1Sync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response v1Sync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("header-v2") String headerV2, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -205,7 +206,7 @@ Response v1Sync(@HostParam("endpoint") String endpoint, @HostParam(" @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> v2(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> v2(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -215,7 +216,7 @@ Mono> v2(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/implementation/InterfaceV2sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/implementation/InterfaceV2sImpl.java index d66e70b8b7..aeb3809981 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/implementation/InterfaceV2sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/implementation/InterfaceV2sImpl.java @@ -25,6 +25,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.versioning.added.AddedServiceVersion; +import com.versioning.added.models.Versions; import reactor.core.publisher.Mono; /** @@ -75,7 +76,7 @@ public interface InterfaceV2sService { @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> v2InInterface(@HostParam("endpoint") String endpoint, - @HostParam("version") String version, @HeaderParam("Content-Type") String contentType, + @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -86,7 +87,7 @@ Mono> v2InInterface(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response v2InInterfaceSync(@HostParam("endpoint") String endpoint, - @HostParam("version") String version, @HeaderParam("Content-Type") String contentType, + @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/models/Versions.java new file mode 100644 index 0000000000..dc6789f080 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/added/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.versioning.added.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/MadeOptionalClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/MadeOptionalClientBuilder.java index da6b853ac6..f9f5e9aa29 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/MadeOptionalClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/MadeOptionalClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.versioning.madeoptional.implementation.MadeOptionalClientImpl; +import com.versioning.madeoptional.models.Versions; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -193,7 +194,7 @@ public MadeOptionalClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -202,7 +203,7 @@ public MadeOptionalClientBuilder endpoint(String endpoint) { * @return the MadeOptionalClientBuilder. */ @Generated - public MadeOptionalClientBuilder version(String version) { + public MadeOptionalClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/implementation/MadeOptionalClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/implementation/MadeOptionalClientImpl.java index d37daf24f3..0f48ff52f8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/implementation/MadeOptionalClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/implementation/MadeOptionalClientImpl.java @@ -31,6 +31,7 @@ import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; import com.versioning.madeoptional.MadeOptionalServiceVersion; +import com.versioning.madeoptional.models.Versions; import reactor.core.publisher.Mono; /** @@ -59,14 +60,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -119,7 +120,7 @@ public SerializerAdapter getSerializerAdapter() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public MadeOptionalClientImpl(String endpoint, String version, MadeOptionalServiceVersion serviceVersion) { + public MadeOptionalClientImpl(String endpoint, Versions version, MadeOptionalServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -132,7 +133,7 @@ public MadeOptionalClientImpl(String endpoint, String version, MadeOptionalServi * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public MadeOptionalClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public MadeOptionalClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, MadeOptionalServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -147,7 +148,7 @@ public MadeOptionalClientImpl(HttpPipeline httpPipeline, String endpoint, String * @param serviceVersion Service version. */ public MadeOptionalClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, MadeOptionalServiceVersion serviceVersion) { + Versions version, MadeOptionalServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -170,7 +171,7 @@ public interface MadeOptionalClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -180,7 +181,7 @@ Mono> test(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/models/Versions.java new file mode 100644 index 0000000000..c5aaf0d0bf --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/madeoptional/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.versioning.madeoptional.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClientBuilder.java index 2a4f31bbcd..aca7a36e46 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.versioning.removed.implementation.RemovedClientImpl; +import com.versioning.removed.models.Versions; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -193,7 +194,7 @@ public RemovedClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -202,7 +203,7 @@ public RemovedClientBuilder endpoint(String endpoint) { * @return the RemovedClientBuilder. */ @Generated - public RemovedClientBuilder version(String version) { + public RemovedClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/implementation/RemovedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/implementation/RemovedClientImpl.java index 98b2a519bd..f5060e94cb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/implementation/RemovedClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/implementation/RemovedClientImpl.java @@ -31,6 +31,7 @@ import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; import com.versioning.removed.RemovedServiceVersion; +import com.versioning.removed.models.Versions; import reactor.core.publisher.Mono; /** @@ -59,14 +60,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -119,7 +120,7 @@ public SerializerAdapter getSerializerAdapter() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public RemovedClientImpl(String endpoint, String version, RemovedServiceVersion serviceVersion) { + public RemovedClientImpl(String endpoint, Versions version, RemovedServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -132,7 +133,7 @@ public RemovedClientImpl(String endpoint, String version, RemovedServiceVersion * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public RemovedClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public RemovedClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, RemovedServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -147,7 +148,7 @@ public RemovedClientImpl(HttpPipeline httpPipeline, String endpoint, String vers * @param serviceVersion Service version. */ public RemovedClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, RemovedServiceVersion serviceVersion) { + Versions version, RemovedServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -168,7 +169,7 @@ public interface RemovedClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> v2(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> v2(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -178,7 +179,7 @@ Mono> v2(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/Versions.java new file mode 100644 index 0000000000..d98c547956 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.versioning.removed.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/RenamedFromClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/RenamedFromClientBuilder.java index 7bccb10f13..240a1fc452 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/RenamedFromClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/RenamedFromClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.versioning.renamedfrom.implementation.RenamedFromClientImpl; +import com.versioning.renamedfrom.models.Versions; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -198,7 +199,7 @@ public RenamedFromClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -207,7 +208,7 @@ public RenamedFromClientBuilder endpoint(String endpoint) { * @return the RenamedFromClientBuilder. */ @Generated - public RenamedFromClientBuilder version(String version) { + public RenamedFromClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/implementation/NewInterfacesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/implementation/NewInterfacesImpl.java index 3cf07d0303..84c04c3e36 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/implementation/NewInterfacesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/implementation/NewInterfacesImpl.java @@ -25,6 +25,7 @@ import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; import com.versioning.renamedfrom.RenamedFromServiceVersion; +import com.versioning.renamedfrom.models.Versions; import reactor.core.publisher.Mono; /** @@ -75,7 +76,7 @@ public interface NewInterfacesService { @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> newOpInNewInterface(@HostParam("endpoint") String endpoint, - @HostParam("version") String version, @HeaderParam("Content-Type") String contentType, + @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -86,7 +87,7 @@ Mono> newOpInNewInterface(@HostParam("endpoint") String end @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response newOpInNewInterfaceSync(@HostParam("endpoint") String endpoint, - @HostParam("version") String version, @HeaderParam("Content-Type") String contentType, + @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/implementation/RenamedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/implementation/RenamedFromClientImpl.java index 7bb4ccf57d..4771fdaf52 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/implementation/RenamedFromClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/implementation/RenamedFromClientImpl.java @@ -32,6 +32,7 @@ import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; import com.versioning.renamedfrom.RenamedFromServiceVersion; +import com.versioning.renamedfrom.models.Versions; import reactor.core.publisher.Mono; /** @@ -60,14 +61,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -134,7 +135,7 @@ public NewInterfacesImpl getNewInterfaces() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public RenamedFromClientImpl(String endpoint, String version, RenamedFromServiceVersion serviceVersion) { + public RenamedFromClientImpl(String endpoint, Versions version, RenamedFromServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -147,7 +148,7 @@ public RenamedFromClientImpl(String endpoint, String version, RenamedFromService * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public RenamedFromClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public RenamedFromClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, RenamedFromServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -162,7 +163,7 @@ public RenamedFromClientImpl(HttpPipeline httpPipeline, String endpoint, String * @param serviceVersion Service version. */ public RenamedFromClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, RenamedFromServiceVersion serviceVersion) { + Versions version, RenamedFromServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -185,7 +186,7 @@ public interface RenamedFromClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> newOp(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> newOp(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @QueryParam("newQuery") String newQuery, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -196,7 +197,7 @@ Mono> newOp(@HostParam("endpoint") String endpoint, @HostPa @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response newOpSync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response newOpSync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @QueryParam("newQuery") String newQuery, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/models/Versions.java new file mode 100644 index 0000000000..f5a752a372 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/renamedfrom/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.versioning.renamedfrom.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java index c4b7e8c726..25ef9e9530 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.versioning.returntypechangedfrom.implementation.ReturnTypeChangedFromClientImpl; +import com.versioning.returntypechangedfrom.models.Versions; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -194,7 +195,7 @@ public ReturnTypeChangedFromClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -203,7 +204,7 @@ public ReturnTypeChangedFromClientBuilder endpoint(String endpoint) { * @return the ReturnTypeChangedFromClientBuilder. */ @Generated - public ReturnTypeChangedFromClientBuilder version(String version) { + public ReturnTypeChangedFromClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java index 2f1faa429e..8f3ef16fa3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java @@ -31,6 +31,7 @@ import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; import com.versioning.returntypechangedfrom.ReturnTypeChangedFromServiceVersion; +import com.versioning.returntypechangedfrom.models.Versions; import reactor.core.publisher.Mono; /** @@ -59,14 +60,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -119,7 +120,7 @@ public SerializerAdapter getSerializerAdapter() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public ReturnTypeChangedFromClientImpl(String endpoint, String version, + public ReturnTypeChangedFromClientImpl(String endpoint, Versions version, ReturnTypeChangedFromServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); @@ -133,7 +134,7 @@ public ReturnTypeChangedFromClientImpl(String endpoint, String version, * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public ReturnTypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public ReturnTypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, ReturnTypeChangedFromServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -148,7 +149,7 @@ public ReturnTypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoin * @param serviceVersion Service version. */ public ReturnTypeChangedFromClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, - String endpoint, String version, ReturnTypeChangedFromServiceVersion serviceVersion) { + String endpoint, Versions version, ReturnTypeChangedFromServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -171,7 +172,7 @@ public interface ReturnTypeChangedFromClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -181,7 +182,7 @@ Mono> test(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/Versions.java new file mode 100644 index 0000000000..9c1cccaca1 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.versioning.returntypechangedfrom.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/package-info.java new file mode 100644 index 0000000000..1a7a505149 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/package-info.java @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +/** + * + * Package containing the data models for ReturnTypeChangedFrom. + * Test for the `@returnTypeChangedFrom` decorator. + * + */ +package com.versioning.returntypechangedfrom.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/TypeChangedFromClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/TypeChangedFromClientBuilder.java index 65ebc1468e..18f12ca6b8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/TypeChangedFromClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/TypeChangedFromClientBuilder.java @@ -32,6 +32,7 @@ import com.azure.core.util.logging.ClientLogger; import com.azure.core.util.serializer.JacksonAdapter; import com.versioning.typechangedfrom.implementation.TypeChangedFromClientImpl; +import com.versioning.typechangedfrom.models.Versions; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -194,7 +195,7 @@ public TypeChangedFromClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -203,7 +204,7 @@ public TypeChangedFromClientBuilder endpoint(String endpoint) { * @return the TypeChangedFromClientBuilder. */ @Generated - public TypeChangedFromClientBuilder version(String version) { + public TypeChangedFromClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java index 948bfc8251..c501363f3a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java @@ -32,6 +32,7 @@ import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; import com.versioning.typechangedfrom.TypeChangedFromServiceVersion; +import com.versioning.typechangedfrom.models.Versions; import reactor.core.publisher.Mono; /** @@ -60,14 +61,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -120,7 +121,7 @@ public SerializerAdapter getSerializerAdapter() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public TypeChangedFromClientImpl(String endpoint, String version, TypeChangedFromServiceVersion serviceVersion) { + public TypeChangedFromClientImpl(String endpoint, Versions version, TypeChangedFromServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -133,7 +134,7 @@ public TypeChangedFromClientImpl(String endpoint, String version, TypeChangedFro * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public TypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public TypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, TypeChangedFromServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -148,7 +149,7 @@ public TypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, Str * @param serviceVersion Service version. */ public TypeChangedFromClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, TypeChangedFromServiceVersion serviceVersion) { + Versions version, TypeChangedFromServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -171,7 +172,7 @@ public interface TypeChangedFromClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @QueryParam("param") String param, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -182,7 +183,7 @@ Mono> test(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @QueryParam("param") String param, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/models/Versions.java new file mode 100644 index 0000000000..6fff7d3dc3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/typechangedfrom/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package com.versioning.typechangedfrom.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json index 0afb18e2d6..48ee413a96 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json @@ -21,6 +21,7 @@ "com.versioning.added.models.EnumV1": "Versioning.Added.EnumV1", "com.versioning.added.models.EnumV2": "Versioning.Added.EnumV2", "com.versioning.added.models.ModelV1": "Versioning.Added.ModelV1", - "com.versioning.added.models.ModelV2": "Versioning.Added.ModelV2" + "com.versioning.added.models.ModelV2": "Versioning.Added.ModelV2", + "com.versioning.added.models.Versions": "Versioning.Added.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json index cc95129dac..76d61e159d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json @@ -8,6 +8,7 @@ "com.versioning.madeoptional.MadeOptionalClient.test": "Versioning.MadeOptional.test", "com.versioning.madeoptional.MadeOptionalClient.testWithResponse": "Versioning.MadeOptional.test", "com.versioning.madeoptional.MadeOptionalClientBuilder": "Versioning.MadeOptional", - "com.versioning.madeoptional.models.TestModel": "Versioning.MadeOptional.TestModel" + "com.versioning.madeoptional.models.TestModel": "Versioning.MadeOptional.TestModel", + "com.versioning.madeoptional.models.Versions": "Versioning.MadeOptional.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json index c6688917d0..009118860e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json @@ -9,6 +9,7 @@ "com.versioning.removed.RemovedClient.v2WithResponse": "Versioning.Removed.v2", "com.versioning.removed.RemovedClientBuilder": "Versioning.Removed", "com.versioning.removed.models.EnumV2": "Versioning.Removed.EnumV2", - "com.versioning.removed.models.ModelV2": "Versioning.Removed.ModelV2" + "com.versioning.removed.models.ModelV2": "Versioning.Removed.ModelV2", + "com.versioning.removed.models.Versions": "Versioning.Removed.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json index 1c7f61734a..a561bed9ec 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json @@ -15,6 +15,7 @@ "com.versioning.renamedfrom.RenamedFromClient.newOpWithResponse": "Versioning.RenamedFrom.newOp", "com.versioning.renamedfrom.RenamedFromClientBuilder": "Versioning.RenamedFrom", "com.versioning.renamedfrom.models.NewEnum": "Versioning.RenamedFrom.NewEnum", - "com.versioning.renamedfrom.models.NewModel": "Versioning.RenamedFrom.NewModel" + "com.versioning.renamedfrom.models.NewModel": "Versioning.RenamedFrom.NewModel", + "com.versioning.renamedfrom.models.Versions": "Versioning.RenamedFrom.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json index 9a45354e8e..7fd2a59e43 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json @@ -7,6 +7,7 @@ "com.versioning.returntypechangedfrom.ReturnTypeChangedFromClient": "Versioning.ReturnTypeChangedFrom", "com.versioning.returntypechangedfrom.ReturnTypeChangedFromClient.test": "Versioning.ReturnTypeChangedFrom.test", "com.versioning.returntypechangedfrom.ReturnTypeChangedFromClient.testWithResponse": "Versioning.ReturnTypeChangedFrom.test", - "com.versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder": "Versioning.ReturnTypeChangedFrom" + "com.versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder": "Versioning.ReturnTypeChangedFrom", + "com.versioning.returntypechangedfrom.models.Versions": "Versioning.ReturnTypeChangedFrom.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json index 8b27e36913..9f07212c30 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json @@ -8,6 +8,7 @@ "com.versioning.typechangedfrom.TypeChangedFromClient.test": "Versioning.TypeChangedFrom.test", "com.versioning.typechangedfrom.TypeChangedFromClient.testWithResponse": "Versioning.TypeChangedFrom.test", "com.versioning.typechangedfrom.TypeChangedFromClientBuilder": "Versioning.TypeChangedFrom", - "com.versioning.typechangedfrom.models.TestModel": "Versioning.TypeChangedFrom.TestModel" + "com.versioning.typechangedfrom.models.TestModel": "Versioning.TypeChangedFrom.TestModel", + "com.versioning.typechangedfrom.models.Versions": "Versioning.TypeChangedFrom.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/ClientOperationGroupTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/ClientOperationGroupTests.java index 5903e4464e..84467cb320 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/ClientOperationGroupTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/ClientOperationGroupTests.java @@ -4,6 +4,7 @@ package com.client.structure; import com.client.structure.service.FirstClientBuilder; +import com.client.structure.service.models.ClientType; import com.client.structure.service.subnamespace.SecondClientBuilder; import org.junit.jupiter.api.Test; @@ -12,9 +13,9 @@ public class ClientOperationGroupTests { @Test public void test() { FirstClientBuilder clientBuilder1 - = new FirstClientBuilder().endpoint("http://localhost:3000").client("client-operation-group"); + = new FirstClientBuilder().endpoint("http://localhost:3000").client(ClientType.CLIENT_OPERATION_GROUP); SecondClientBuilder clientBuilder2 - = new SecondClientBuilder().endpoint("http://localhost:3000").client("client-operation-group"); + = new SecondClientBuilder().endpoint("http://localhost:3000").client(ClientType.CLIENT_OPERATION_GROUP); clientBuilder1.buildClient().one(); clientBuilder1.buildGroup3Client().two(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/DefaultClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/DefaultClientTests.java index 6d27a9bac3..a0c19a27ad 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/DefaultClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/DefaultClientTests.java @@ -10,27 +10,28 @@ import com.client.structure.service.QuxClient; import com.client.structure.service.ServiceClientClient; import com.client.structure.service.ServiceClientClientBuilder; +import com.client.structure.service.models.ClientType; import org.junit.jupiter.api.Test; public class DefaultClientTests { private final ServiceClientClient client - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildClient(); private final FooClient client2 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildFooClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildFooClient(); private final BarClient client3 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildBarClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildBarClient(); private final QuxClient client4 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildQuxClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildQuxClient(); private final QuxBarClient client5 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildQuxBarClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildQuxBarClient(); private final BazFooClient client6 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildBazFooClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildBazFooClient(); @Test public void testClient() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/MultiClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/MultiClientTests.java index 9fe2faceeb..a1da114ed0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/MultiClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/MultiClientTests.java @@ -7,14 +7,15 @@ import com.client.structure.service.ClientAClientBuilder; import com.client.structure.service.ClientBClient; import com.client.structure.service.ClientBClientBuilder; +import com.client.structure.service.models.ClientType; import org.junit.jupiter.api.Test; public class MultiClientTests { private final ClientAClient client1 - = new ClientAClientBuilder().endpoint("http://localhost:3000").client("multi-client").buildClient(); + = new ClientAClientBuilder().endpoint("http://localhost:3000").client(ClientType.MULTI_CLIENT).buildClient(); private final ClientBClient client2 - = new ClientBClientBuilder().endpoint("http://localhost:3000").client("multi-client").buildClient(); + = new ClientBClientBuilder().endpoint("http://localhost:3000").client(ClientType.MULTI_CLIENT).buildClient(); @Test public void testClient() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/OperationGroupClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/OperationGroupClientTests.java index 4c4bddc047..24648ad3f6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/OperationGroupClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/OperationGroupClientTests.java @@ -6,15 +6,16 @@ import com.client.structure.service.Group1Client; import com.client.structure.service.Group2Client; import com.client.structure.service.TwoOperationGroupClientBuilder; +import com.client.structure.service.models.ClientType; import org.junit.jupiter.api.Test; public class OperationGroupClientTests { private final Group1Client client1 = new TwoOperationGroupClientBuilder().endpoint("http://localhost:3000") - .client("two-operation-group") + .client(ClientType.TWO_OPERATION_GROUP) .buildGroup1Client(); private final Group2Client client2 = new TwoOperationGroupClientBuilder().endpoint("http://localhost:3000") - .client("two-operation-group") + .client(ClientType.TWO_OPERATION_GROUP) .buildGroup2Client(); @Test diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/RenameOperationTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/RenameOperationTests.java index 406dd743dc..cc58455a7b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/RenameOperationTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/client/structure/RenameOperationTests.java @@ -6,15 +6,16 @@ import com.client.structure.service.GroupClient; import com.client.structure.service.RenamedOperationClient; import com.client.structure.service.RenamedOperationClientBuilder; +import com.client.structure.service.models.ClientType; import org.junit.jupiter.api.Test; public class RenameOperationTests { private final RenamedOperationClient client = new RenamedOperationClientBuilder().endpoint("http://localhost:3000") - .client("renamed-operation") + .client(ClientType.RENAMED_OPERATION) .buildClient(); private final GroupClient groupClient = new RenamedOperationClientBuilder().endpoint("http://localhost:3000") - .client("renamed-operation") + .client(ClientType.RENAMED_OPERATION) .buildGroupClient(); @Test 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 14d0813811..1e378f4f1e 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 @@ -17,6 +17,7 @@ import com.client.structure.service.ClientAClientBuilder; import com.client.structure.service.ClientBClient; import com.client.structure.service.ClientBClientBuilder; +import com.client.structure.service.models.ClientType; class ClientAClientTestBase extends TestProxyTestBase { protected ClientAClient clientAClient; @@ -27,7 +28,7 @@ class ClientAClientTestBase extends TestProxyTestBase { protected void beforeTest() { ClientAClientBuilder clientAClientbuilder = new ClientAClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -37,7 +38,7 @@ protected void beforeTest() { ClientBClientBuilder clientBClientbuilder = new ClientBClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { 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 1a41669e41..99e04cdb26 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 @@ -17,6 +17,7 @@ import com.client.structure.service.FirstClientBuilder; import com.client.structure.service.Group3Client; import com.client.structure.service.Group4Client; +import com.client.structure.service.models.ClientType; import com.client.structure.service.subnamespace.Group5Client; import com.client.structure.service.subnamespace.SecondClient; import com.client.structure.service.subnamespace.SecondClientBuilder; @@ -36,7 +37,7 @@ class FirstClientTestBase extends TestProxyTestBase { protected void beforeTest() { FirstClientBuilder firstClientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -46,7 +47,7 @@ protected void beforeTest() { FirstClientBuilder group3Clientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -56,7 +57,7 @@ protected void beforeTest() { FirstClientBuilder group4Clientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -66,7 +67,7 @@ protected void beforeTest() { SecondClientBuilder secondClientbuilder = new SecondClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -76,7 +77,7 @@ protected void beforeTest() { SecondClientBuilder group5Clientbuilder = new SecondClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { 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 ef0633249e..5c85953945 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 @@ -16,6 +16,7 @@ import com.client.structure.service.GroupClient; import com.client.structure.service.RenamedOperationClient; import com.client.structure.service.RenamedOperationClientBuilder; +import com.client.structure.service.models.ClientType; class RenamedOperationClientTestBase extends TestProxyTestBase { protected RenamedOperationClient renamedOperationClient; @@ -26,7 +27,7 @@ class RenamedOperationClientTestBase extends TestProxyTestBase { protected void beforeTest() { RenamedOperationClientBuilder renamedOperationClientbuilder = new RenamedOperationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -36,7 +37,7 @@ protected void beforeTest() { RenamedOperationClientBuilder groupClientbuilder = new RenamedOperationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { 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 1da6ba76a4..2165f81f81 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 @@ -20,6 +20,7 @@ import com.client.structure.service.QuxClient; import com.client.structure.service.ServiceClientClient; import com.client.structure.service.ServiceClientClientBuilder; +import com.client.structure.service.models.ClientType; class ServiceClientClientTestBase extends TestProxyTestBase { protected ServiceClientClient serviceClientClient; @@ -38,7 +39,7 @@ class ServiceClientClientTestBase extends TestProxyTestBase { protected void beforeTest() { ServiceClientClientBuilder serviceClientClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -48,7 +49,7 @@ protected void beforeTest() { ServiceClientClientBuilder bazFooClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -58,7 +59,7 @@ protected void beforeTest() { ServiceClientClientBuilder quxClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -68,7 +69,7 @@ protected void beforeTest() { ServiceClientClientBuilder quxBarClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -78,7 +79,7 @@ protected void beforeTest() { ServiceClientClientBuilder fooClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -88,7 +89,7 @@ protected void beforeTest() { ServiceClientClientBuilder barClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { 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 8f4431ad0f..c585c5cca8 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 @@ -16,6 +16,7 @@ import com.client.structure.service.Group1Client; import com.client.structure.service.Group2Client; import com.client.structure.service.TwoOperationGroupClientBuilder; +import com.client.structure.service.models.ClientType; class TwoOperationGroupClientTestBase extends TestProxyTestBase { protected Group1Client group1Client; @@ -26,7 +27,7 @@ class TwoOperationGroupClientTestBase extends TestProxyTestBase { protected void beforeTest() { TwoOperationGroupClientBuilder group1Clientbuilder = new TwoOperationGroupClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -36,7 +37,7 @@ protected void beforeTest() { TwoOperationGroupClientBuilder group2Clientbuilder = new TwoOperationGroupClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/array/UnknownValueClientTest.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/array/UnknownValueClientTest.java index c92d6383d6..e8a28a27f2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/array/UnknownValueClientTest.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/array/UnknownValueClientTest.java @@ -5,10 +5,7 @@ import java.util.Arrays; import java.util.List; - -import com.azure.core.util.BinaryData; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class UnknownValueClientTest { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/dictionary/UnknownValueClientTest.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/dictionary/UnknownValueClientTest.java index fad81b0f52..75df004303 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/dictionary/UnknownValueClientTest.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/dictionary/UnknownValueClientTest.java @@ -7,10 +7,8 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.ObjectNode; - import java.util.Map; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; public class UnknownValueClientTest { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/scalar/ScalarTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/scalar/ScalarTests.java index 3552d57ef6..b7306c6840 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/scalar/ScalarTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/scalar/ScalarTests.java @@ -3,9 +3,8 @@ package com.type.scalar; -import java.math.BigDecimal; - import com.azure.core.util.BinaryData; +import java.math.BigDecimal; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/added/AddedClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/added/AddedClientTests.java index dc387c51bf..6cb691a847 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/added/AddedClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/added/AddedClientTests.java @@ -4,17 +4,14 @@ package com.versioning.added; import com.azure.core.util.BinaryData; -import com.versioning.added.models.EnumV1; -import com.versioning.added.models.EnumV2; -import com.versioning.added.models.ModelV1; -import com.versioning.added.models.ModelV2; +import com.versioning.added.models.*; import org.junit.jupiter.api.Test; public class AddedClientTests { private final AddedClient addedClient - = new AddedClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new AddedClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); private final InterfaceV2Client interfaceV2Client - = new AddedClientBuilder().endpoint("http://localhost:3000").version("v2").buildInterfaceV2Client(); + = new AddedClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildInterfaceV2Client(); @Test public void testAddedClient() { 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 915d810634..75c52b3ef9 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 @@ -16,6 +16,7 @@ import com.versioning.added.AddedClient; import com.versioning.added.AddedClientBuilder; import com.versioning.added.InterfaceV2Client; +import com.versioning.added.models.Versions; class AddedClientTestBase extends TestProxyTestBase { protected AddedClient addedClient; @@ -26,7 +27,7 @@ class AddedClientTestBase extends TestProxyTestBase { protected void beforeTest() { AddedClientBuilder addedClientbuilder = new AddedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -36,7 +37,7 @@ protected void beforeTest() { AddedClientBuilder interfaceV2Clientbuilder = new AddedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/madeoptional/MadeOptionalClienTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/madeoptional/MadeOptionalClienTests.java index 8286b709f8..94fcdaefd8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/madeoptional/MadeOptionalClienTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/madeoptional/MadeOptionalClienTests.java @@ -4,11 +4,12 @@ package com.versioning.madeoptional; import com.versioning.madeoptional.models.TestModel; +import com.versioning.madeoptional.models.Versions; import org.junit.jupiter.api.Test; public class MadeOptionalClienTests { private final MadeOptionalClient madeOptionalClient - = new MadeOptionalClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new MadeOptionalClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); @Test public void testMadeOptionalClient() { 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 a135a1a6d7..4517644aad 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 @@ -15,6 +15,7 @@ import com.azure.core.util.Configuration; import com.versioning.madeoptional.MadeOptionalClient; import com.versioning.madeoptional.MadeOptionalClientBuilder; +import com.versioning.madeoptional.models.Versions; class MadeOptionalClientTestBase extends TestProxyTestBase { protected MadeOptionalClient madeOptionalClient; @@ -23,7 +24,7 @@ class MadeOptionalClientTestBase extends TestProxyTestBase { protected void beforeTest() { MadeOptionalClientBuilder madeOptionalClientbuilder = new MadeOptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/RemovedClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/RemovedClientTests.java index 6c7dc98d17..671b47fc85 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/RemovedClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/RemovedClientTests.java @@ -6,15 +6,16 @@ import com.azure.core.util.BinaryData; import com.versioning.removed.models.EnumV2; import com.versioning.removed.models.ModelV2; +import com.versioning.removed.models.Versions; import org.junit.jupiter.api.Test; public class RemovedClientTests { private final RemovedClient removedClientV1 - = new RemovedClientBuilder().endpoint("http://localhost:3000").version("v1").buildClient(); + = new RemovedClientBuilder().endpoint("http://localhost:3000").version(Versions.V1).buildClient(); private final RemovedClient removedClientV2 - = new RemovedClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new RemovedClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); @Test public void tesRemovedClient() { 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 8d7b0e8f33..c812594bd2 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 @@ -15,6 +15,7 @@ import com.azure.core.util.Configuration; import com.versioning.removed.RemovedClient; import com.versioning.removed.RemovedClientBuilder; +import com.versioning.removed.models.Versions; class RemovedClientTestBase extends TestProxyTestBase { protected RemovedClient removedClient; @@ -23,7 +24,7 @@ class RemovedClientTestBase extends TestProxyTestBase { protected void beforeTest() { RemovedClientBuilder removedClientbuilder = new RemovedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/renamedfrom/RenamedFromClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/renamedfrom/RenamedFromClientTests.java index ff3ba0d465..e79ac72c69 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/renamedfrom/RenamedFromClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/renamedfrom/RenamedFromClientTests.java @@ -6,13 +6,14 @@ import com.azure.core.util.BinaryData; import com.versioning.renamedfrom.models.NewEnum; import com.versioning.renamedfrom.models.NewModel; +import com.versioning.renamedfrom.models.Versions; import org.junit.jupiter.api.Test; public class RenamedFromClientTests { private final RenamedFromClient renamedFromClient - = new RenamedFromClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new RenamedFromClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); private final NewInterfaceClient newInterfaceClient - = new RenamedFromClientBuilder().endpoint("http://localhost:3000").version("v2").buildNewInterfaceClient(); + = new RenamedFromClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildNewInterfaceClient(); @Test public void testNewOp() { 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 4b17e6afb9..fbe5f22095 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 @@ -16,6 +16,7 @@ import com.versioning.renamedfrom.NewInterfaceClient; import com.versioning.renamedfrom.RenamedFromClient; import com.versioning.renamedfrom.RenamedFromClientBuilder; +import com.versioning.renamedfrom.models.Versions; class RenamedFromClientTestBase extends TestProxyTestBase { protected RenamedFromClient renamedFromClient; @@ -26,7 +27,7 @@ class RenamedFromClientTestBase extends TestProxyTestBase { protected void beforeTest() { RenamedFromClientBuilder renamedFromClientbuilder = new RenamedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -36,7 +37,7 @@ protected void beforeTest() { RenamedFromClientBuilder newInterfaceClientbuilder = new RenamedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/returntypechangedfrom/ReturnTypeChangedFromClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/returntypechangedfrom/ReturnTypeChangedFromClientTests.java index 0f2749bd80..135bf6db97 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/returntypechangedfrom/ReturnTypeChangedFromClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/returntypechangedfrom/ReturnTypeChangedFromClientTests.java @@ -3,11 +3,12 @@ package com.versioning.returntypechangedfrom; +import com.versioning.returntypechangedfrom.models.Versions; import org.junit.jupiter.api.Test; public class ReturnTypeChangedFromClientTests { private final ReturnTypeChangedFromClient returnTypeChangedFromClient - = new ReturnTypeChangedFromClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new ReturnTypeChangedFromClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); @Test public void testReturnTypeChangedFromClient() { 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 70b59f7d08..aacc6b360e 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 @@ -15,6 +15,7 @@ import com.azure.core.util.Configuration; import com.versioning.returntypechangedfrom.ReturnTypeChangedFromClient; import com.versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder; +import com.versioning.returntypechangedfrom.models.Versions; class ReturnTypeChangedFromClientTestBase extends TestProxyTestBase { protected ReturnTypeChangedFromClient returnTypeChangedFromClient; @@ -23,7 +24,7 @@ class ReturnTypeChangedFromClientTestBase extends TestProxyTestBase { protected void beforeTest() { ReturnTypeChangedFromClientBuilder returnTypeChangedFromClientbuilder = new ReturnTypeChangedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/typechangedfrom/TypeChangedFromClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/typechangedfrom/TypeChangedFromClientTests.java index 66d5b5ce6f..f084915923 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/typechangedfrom/TypeChangedFromClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/typechangedfrom/TypeChangedFromClientTests.java @@ -4,11 +4,12 @@ package com.versioning.typechangedfrom; import com.versioning.typechangedfrom.models.TestModel; +import com.versioning.typechangedfrom.models.Versions; import org.junit.jupiter.api.Test; public class TypeChangedFromClientTests { private final TypeChangedFromClient typeChangedFromClient - = new TypeChangedFromClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new TypeChangedFromClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); @Test public void testTypeChangedFromClient() { 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 848a381a49..7c0dca438f 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 @@ -15,6 +15,7 @@ import com.azure.core.util.Configuration; import com.versioning.typechangedfrom.TypeChangedFromClient; import com.versioning.typechangedfrom.TypeChangedFromClientBuilder; +import com.versioning.typechangedfrom.models.Versions; class TypeChangedFromClientTestBase extends TestProxyTestBase { protected TypeChangedFromClient typeChangedFromClient; @@ -23,7 +24,7 @@ class TypeChangedFromClientTestBase extends TestProxyTestBase { protected void beforeTest() { TypeChangedFromClientBuilder typeChangedFromClientbuilder = new TypeChangedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { From c81d303c54cf8b180728e2e2d7417a3cc3dd72ac Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Fri, 1 Nov 2024 17:31:24 +0800 Subject: [PATCH 04/11] format --- .../typespec/http/client/generator/core/util/SchemaUtil.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java index f862385bdf..082f5c0888 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java @@ -25,8 +25,6 @@ import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IterableType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ListType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.PrimitiveType; -import org.apache.tools.ant.taskdefs.Java; - import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; @@ -226,7 +224,7 @@ public static IType removeModelFromParameter(RequestParameterLocation parameterR } else if (!(returnType instanceof PrimitiveType)) { if (type instanceof EnumType) { boolean isPathOrURIParameter = RequestParameterLocation.PATH == parameterRequestLocation - || RequestParameterLocation.URI == parameterRequestLocation; + || RequestParameterLocation.URI == parameterRequestLocation; boolean isEnumAsString = !(JavaSettings.getInstance().isDataPlaneClient() && isPathOrURIParameter); if (isEnumAsString) { // do not change enum to string type for data-plane path/url parameter returnType = ClassType.STRING; From 7ca033dd651f260a0c2d6a1aaeb846ad3855e5d4 Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:45:45 +0800 Subject: [PATCH 05/11] Refine logics to add the checks on whether to remove model from parameter in mappers --- .../core/mapper/ProxyParameterMapper.java | 14 ++++++++---- .../core/mapper/ServiceClientMapper.java | 6 ++++- .../generator/core/util/SchemaUtil.java | 7 +----- .../mapper/TypeSpecMapperFactory.java | 6 +++++ .../mapper/TypeSpecProxyParameterMapper.java | 22 +++++++++++++++++++ .../mapper/TypeSpecServiceClientMapper.java | 10 +++++++++ 6 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecProxyParameterMapper.java diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java index c6c036af78..b2fdf5039e 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java @@ -66,9 +66,11 @@ public ProxyMethodParameter map(Parameter parameter) { IType clientType = wireType.getClientType(); - if (settings.isDataPlaneClient()) { - clientType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, clientType); + + if (isRemoveModelFromParameter(parameter, clientType)) { + clientType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, clientType); } + builder.clientType(clientType); if (wireType instanceof ListType @@ -88,7 +90,7 @@ public ProxyMethodParameter map(Parameter parameter) { if (parameterRequestLocation != RequestParameterLocation.BODY /* && parameterRequestLocation != RequestParameterLocation.FormData */) { wireType = ClassType.STRING; - } else if (settings.isDataPlaneClient()) { + } else if (isRemoveModelFromParameter(parameter, wireType)) { wireType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, wireType); } } else if (wireType instanceof ListType @@ -102,7 +104,7 @@ public ProxyMethodParameter map(Parameter parameter) { } else { wireType = ClassType.STRING; } - } else if (settings.isDataPlaneClient()) { + } else if (isRemoveModelFromParameter(parameter, wireType)) { wireType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, wireType); } builder.wireType(wireType); @@ -182,6 +184,10 @@ public ProxyMethodParameter map(Parameter parameter) { return builder.build(); } + protected boolean isRemoveModelFromParameter(Parameter parameter, IType clientType) { + return JavaSettings.getInstance().isDataPlaneClient(); + } + protected ProxyMethodParameter.Builder createProxyMethodParameterBuilder() { return new ProxyMethodParameter.Builder(); } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java index 88af2e03d6..8a342f7925 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java @@ -232,7 +232,7 @@ protected List processClientProperties(Client client, Str String serviceClientPropertyName = CodeNamer.getPropertyName(p.getLanguage().getJava().getName()); IType serviceClientPropertyClientType = Mappers.getSchemaMapper().map(p.getSchema()); - if (settings.isDataPlaneClient()) { + if (isRemoveModelFromParameter(p, serviceClientPropertyClientType)) { // mostly for Enum to String serviceClientPropertyClientType = SchemaUtil.removeModelFromParameter(RequestParameterLocation.URI, serviceClientPropertyClientType); @@ -281,6 +281,10 @@ protected List processClientProperties(Client client, Str return serviceClientProperties; } + protected boolean isRemoveModelFromParameter(Parameter parameter, IType type) { + return JavaSettings.getInstance().isDataPlaneClient(); + } + protected void processParametersAndConstructors(ServiceClient.Builder builder, Client client, CodeModel codeModel, List serviceClientProperties, Proxy proxy) { JavaSettings settings = JavaSettings.getInstance(); diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java index 082f5c0888..0056348fb8 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java @@ -223,12 +223,7 @@ public static IType removeModelFromParameter(RequestParameterLocation parameterR returnType = ClassType.BINARY_DATA; } else if (!(returnType instanceof PrimitiveType)) { if (type instanceof EnumType) { - boolean isPathOrURIParameter = RequestParameterLocation.PATH == parameterRequestLocation - || RequestParameterLocation.URI == parameterRequestLocation; - boolean isEnumAsString = !(JavaSettings.getInstance().isDataPlaneClient() && isPathOrURIParameter); - if (isEnumAsString) { // do not change enum to string type for data-plane path/url parameter - returnType = ClassType.STRING; - } + returnType = ClassType.STRING; } if (type instanceof IterableType && ((IterableType) type).getElementType() instanceof EnumType) { returnType = new IterableType(ClassType.STRING); diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecMapperFactory.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecMapperFactory.java index 2552fbcba9..8e801599e1 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecMapperFactory.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecMapperFactory.java @@ -6,6 +6,7 @@ import com.microsoft.typespec.http.client.generator.core.mapper.ClientMapper; import com.microsoft.typespec.http.client.generator.core.mapper.DefaultMapperFactory; import com.microsoft.typespec.http.client.generator.core.mapper.PrimitiveMapper; +import com.microsoft.typespec.http.client.generator.core.mapper.ProxyParameterMapper; public class TypeSpecMapperFactory extends DefaultMapperFactory { @@ -18,4 +19,9 @@ public ClientMapper getClientMapper() { public PrimitiveMapper getPrimitiveMapper() { return TypeSpecPrimitiveMapper.getInstance(); } + + @Override + public ProxyParameterMapper getProxyParameterMapper() { + return TypeSpecProxyParameterMapper.getInstance(); + } } diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecProxyParameterMapper.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecProxyParameterMapper.java new file mode 100644 index 0000000000..5afd5830f5 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecProxyParameterMapper.java @@ -0,0 +1,22 @@ +package com.microsoft.typespec.http.client.generator.mapper; + +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Parameter; +import com.microsoft.typespec.http.client.generator.core.mapper.ProxyParameterMapper; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.EnumType; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; + +public class TypeSpecProxyParameterMapper extends ProxyParameterMapper { + private static final ProxyParameterMapper INSTANCE = new TypeSpecProxyParameterMapper(); + + public static ProxyParameterMapper getInstance() { + return INSTANCE; + } + + @Override + protected boolean isRemoveModelFromParameter(Parameter parameter, IType type) { + // if it is typespec and enum type client parameter, do not remove model from parameter + boolean isEnumType = type instanceof EnumType; + boolean isClientParameter = Parameter.ImplementationLocation.CLIENT.equals(parameter.getImplementation()); + return super.isRemoveModelFromParameter(parameter, type) && !(isEnumType && isClientParameter); + } +} diff --git a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecServiceClientMapper.java b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecServiceClientMapper.java index 474fb4da2a..79858100a7 100644 --- a/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecServiceClientMapper.java +++ b/packages/http-client-java/generator/http-client-generator/src/main/java/com/microsoft/typespec/http/client/generator/mapper/TypeSpecServiceClientMapper.java @@ -7,8 +7,11 @@ import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Client; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.CodeModel; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.OperationGroup; +import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Parameter; import com.microsoft.typespec.http.client.generator.core.mapper.Mappers; import com.microsoft.typespec.http.client.generator.core.mapper.ServiceClientMapper; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.EnumType; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.MethodGroupClient; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.PipelinePolicyDetails; import com.microsoft.typespec.http.client.generator.core.model.clientmodel.Proxy; @@ -87,4 +90,11 @@ private static void processPipelinePolicyDetails(ServiceClient.Builder builder, .pipelinePolicyDetails(new PipelinePolicyDetails().setRequestIdHeaderName(clientRequestIdHeaderName)); } } + + @Override + protected boolean isRemoveModelFromParameter(Parameter parameter, IType type) { + boolean isEnumType = type instanceof EnumType; + boolean isClientParameter = Parameter.ImplementationLocation.CLIENT.equals(parameter.getImplementation()); + return super.isRemoveModelFromParameter(parameter, type) && !(isEnumType && isClientParameter); + } } From 32035ebccea6511a19b3f22902a5fe9d2326e49c Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:05:10 +0800 Subject: [PATCH 06/11] format --- .../client/generator/core/mapper/ProxyParameterMapper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java index b2fdf5039e..fb5087adf1 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java @@ -66,9 +66,8 @@ public ProxyMethodParameter map(Parameter parameter) { IType clientType = wireType.getClientType(); - if (isRemoveModelFromParameter(parameter, clientType)) { - clientType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, clientType); + clientType = SchemaUtil.removeModelFromParameter(parameterRequestLocation, clientType); } builder.clientType(clientType); From 78f6a3f89047f6f146a10be41e3f8ec179417aab Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:09:45 +0800 Subject: [PATCH 07/11] regenerate --- .../service/ClientAClientBuilder.java | 5 +- .../service/ClientBClientBuilder.java | 5 +- .../structure/service/FirstClientBuilder.java | 5 +- .../RenamedOperationClientBuilder.java | 5 +- .../service/ServiceClientClientBuilder.java | 5 +- .../TwoOperationGroupClientBuilder.java | 5 +- .../service/implementation/BarsImpl.java | 2 +- .../service/implementation/BazFoosImpl.java | 2 +- .../implementation/ClientAClientImpl.java | 2 +- .../implementation/ClientBClientImpl.java | 2 +- .../implementation/FirstClientImpl.java | 2 +- .../service/implementation/FoosImpl.java | 2 +- .../service/implementation/Group1sImpl.java | 2 +- .../service/implementation/Group2sImpl.java | 2 +- .../service/implementation/Group3sImpl.java | 2 +- .../service/implementation/Group4sImpl.java | 2 +- .../service/implementation/Group5sImpl.java | 2 +- .../service/implementation/GroupsImpl.java | 2 +- .../service/implementation/QuxBarsImpl.java | 2 +- .../service/implementation/QuxesImpl.java | 2 +- .../RenamedOperationClientImpl.java | 2 +- .../implementation/SecondClientImpl.java | 2 +- .../ServiceClientClientImpl.java | 2 +- .../TwoOperationGroupClientImpl.java | 2 +- .../structure/service/models/ClientType.java | 2 +- .../service/models/package-info.java | 2 +- .../subnamespace/SecondClientBuilder.java | 5 +- .../versioning/added/AddedClientBuilder.java | 5 +- .../added/implementation/AddedClientImpl.java | 19 ++++--- .../implementation/InterfaceV2sImpl.java | 5 +- .../added}/models/Versions.java | 2 +- .../MadeOptionalClientBuilder.java | 5 +- .../MadeOptionalClientImpl.java | 15 ++--- .../madeoptional/models/Versions.java | 56 +++++++++++++++++++ .../removed/RemovedClientBuilder.java | 5 +- .../implementation/RemovedClientImpl.java | 15 ++--- .../versioning/removed/models/Versions.java | 56 +++++++++++++++++++ .../renamedfrom/RenamedFromClientBuilder.java | 5 +- .../implementation/NewInterfacesImpl.java | 5 +- .../implementation/RenamedFromClientImpl.java | 15 ++--- .../renamedfrom/models/Versions.java | 56 +++++++++++++++++++ .../ReturnTypeChangedFromClientBuilder.java | 5 +- .../ReturnTypeChangedFromClientImpl.java | 15 ++--- .../models/Versions.java | 56 +++++++++++++++++++ .../models/package-info.java | 2 +- .../TypeChangedFromClientBuilder.java | 5 +- .../TypeChangedFromClientImpl.java | 15 ++--- .../typechangedfrom/models/Versions.java | 56 +++++++++++++++++++ .../versioning-added_apiview_properties.json | 3 +- ...oning-madeoptional_apiview_properties.json | 3 +- ...versioning-removed_apiview_properties.json | 3 +- ...ioning-renamedfrom_apiview_properties.json | 3 +- ...urntypechangedfrom_apiview_properties.json | 3 +- ...ng-typechangedfrom_apiview_properties.json | 3 +- .../generated/ClientAClientTestBase.java | 5 +- .../generated/FirstClientTestBase.java | 11 ++-- .../RenamedOperationClientTestBase.java | 5 +- .../ServiceClientClientTestBase.java | 13 +++-- .../TwoOperationGroupClientTestBase.java | 5 +- .../added/generated/AddedClientTestBase.java | 5 +- .../generated/MadeOptionalClientTestBase.java | 3 +- .../generated/RemovedClientTestBase.java | 3 +- .../generated/RenamedFromClientTestBase.java | 5 +- .../ReturnTypeChangedFromClientTestBase.java | 3 +- .../TypeChangedFromClientTestBase.java | 3 +- 65 files changed, 445 insertions(+), 127 deletions(-) rename packages/http-client-java/generator/http-client-generator-test/src/main/java/{com => }/client/structure/service/models/ClientType.java (97%) rename packages/http-client-java/generator/http-client-generator-test/src/main/java/{com => }/client/structure/service/models/package-info.java (93%) rename packages/http-client-java/generator/http-client-generator-test/src/main/java/{com/versioning/returntypechangedfrom => versioning/added}/models/Versions.java (95%) create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/models/Versions.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/models/Versions.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/models/Versions.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/models/Versions.java rename packages/http-client-java/generator/http-client-generator-test/src/main/java/{com => }/versioning/returntypechangedfrom/models/package-info.java (86%) create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/models/Versions.java diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientAClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientAClientBuilder.java index e4758fda12..9a2a4c4f09 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientAClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientAClientBuilder.java @@ -5,6 +5,7 @@ package client.structure.service; import client.structure.service.implementation.ClientAClientImpl; +import client.structure.service.models.ClientType; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -194,7 +195,7 @@ public ClientAClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -203,7 +204,7 @@ public ClientAClientBuilder endpoint(String endpoint) { * @return the ClientAClientBuilder. */ @Generated - public ClientAClientBuilder client(String client) { + public ClientAClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientBClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientBClientBuilder.java index 72588141b9..e954a890be 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientBClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientBClientBuilder.java @@ -5,6 +5,7 @@ package client.structure.service; import client.structure.service.implementation.ClientBClientImpl; +import client.structure.service.models.ClientType; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -194,7 +195,7 @@ public ClientBClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -203,7 +204,7 @@ public ClientBClientBuilder endpoint(String endpoint) { * @return the ClientBClientBuilder. */ @Generated - public ClientBClientBuilder client(String client) { + public ClientBClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/FirstClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/FirstClientBuilder.java index 6d6608bcae..1a7b5c18db 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/FirstClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/FirstClientBuilder.java @@ -5,6 +5,7 @@ package client.structure.service; import client.structure.service.implementation.FirstClientImpl; +import client.structure.service.models.ClientType; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -201,7 +202,7 @@ public FirstClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -210,7 +211,7 @@ public FirstClientBuilder endpoint(String endpoint) { * @return the FirstClientBuilder. */ @Generated - public FirstClientBuilder client(String client) { + public FirstClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/RenamedOperationClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/RenamedOperationClientBuilder.java index 719a625e78..2d08059e73 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/RenamedOperationClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/RenamedOperationClientBuilder.java @@ -5,6 +5,7 @@ package client.structure.service; import client.structure.service.implementation.RenamedOperationClientImpl; +import client.structure.service.models.ClientType; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -199,7 +200,7 @@ public RenamedOperationClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -208,7 +209,7 @@ public RenamedOperationClientBuilder endpoint(String endpoint) { * @return the RenamedOperationClientBuilder. */ @Generated - public RenamedOperationClientBuilder client(String client) { + public RenamedOperationClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ServiceClientClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ServiceClientClientBuilder.java index 64594409d7..0735ea7d97 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ServiceClientClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ServiceClientClientBuilder.java @@ -5,6 +5,7 @@ package client.structure.service; import client.structure.service.implementation.ServiceClientClientImpl; +import client.structure.service.models.ClientType; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -207,7 +208,7 @@ public ServiceClientClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -216,7 +217,7 @@ public ServiceClientClientBuilder endpoint(String endpoint) { * @return the ServiceClientClientBuilder. */ @Generated - public ServiceClientClientBuilder client(String client) { + public ServiceClientClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/TwoOperationGroupClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/TwoOperationGroupClientBuilder.java index 32822cbe88..7bdf9b62b7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/TwoOperationGroupClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/TwoOperationGroupClientBuilder.java @@ -5,6 +5,7 @@ package client.structure.service; import client.structure.service.implementation.TwoOperationGroupClientImpl; +import client.structure.service.models.ClientType; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -195,7 +196,7 @@ public TwoOperationGroupClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -204,7 +205,7 @@ public TwoOperationGroupClientBuilder endpoint(String endpoint) { * @return the TwoOperationGroupClientBuilder. */ @Generated - public TwoOperationGroupClientBuilder client(String client) { + public TwoOperationGroupClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/BarsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/BarsImpl.java index 7dc82c3e32..681fd2eb1b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/BarsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/BarsImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/BazFoosImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/BazFoosImpl.java index 1c82dfc889..48b35ccc26 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/BazFoosImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/BazFoosImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ClientAClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ClientAClientImpl.java index 95b4b73c2e..db63359448 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ClientAClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ClientAClientImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -27,7 +28,6 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ClientBClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ClientBClientImpl.java index 3067494ee6..a091a08054 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ClientBClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ClientBClientImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -27,7 +28,6 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/FirstClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/FirstClientImpl.java index 71de063e4c..6ecfd2260e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/FirstClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/FirstClientImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -27,7 +28,6 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/FoosImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/FoosImpl.java index 647f65b1fb..f53f33e8f1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/FoosImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/FoosImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group1sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group1sImpl.java index 20956d87de..341f272e01 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group1sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group1sImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group2sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group2sImpl.java index 6c1851307d..49bc047cd5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group2sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group2sImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group3sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group3sImpl.java index 2b09271c1b..1a51757683 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group3sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group3sImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group4sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group4sImpl.java index b542ac40a3..09aac7517f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group4sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group4sImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group5sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group5sImpl.java index 7b36d031b7..8e16a499dc 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group5sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/Group5sImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/GroupsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/GroupsImpl.java index 6bc4e4834e..33ecef6ee3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/GroupsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/GroupsImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/QuxBarsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/QuxBarsImpl.java index dfdce49f64..59b90646b7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/QuxBarsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/QuxBarsImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/QuxesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/QuxesImpl.java index 1c948242fa..52040ae0a6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/QuxesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/QuxesImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -21,7 +22,6 @@ import com.azure.core.http.rest.RestProxy; import com.azure.core.util.Context; import com.azure.core.util.FluxUtil; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/RenamedOperationClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/RenamedOperationClientImpl.java index e92b7cef07..df8115643e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/RenamedOperationClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/RenamedOperationClientImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -27,7 +28,6 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/SecondClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/SecondClientImpl.java index dd39c0bf6a..5e56eebb9d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/SecondClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/SecondClientImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -27,7 +28,6 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ServiceClientClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ServiceClientClientImpl.java index 4cdc24de4f..9084229a96 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ServiceClientClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/ServiceClientClientImpl.java @@ -4,6 +4,7 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; @@ -27,7 +28,6 @@ import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import com.client.structure.service.models.ClientType; import reactor.core.publisher.Mono; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/TwoOperationGroupClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/TwoOperationGroupClientImpl.java index f93feac2d6..81e8217ac0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/TwoOperationGroupClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/implementation/TwoOperationGroupClientImpl.java @@ -4,13 +4,13 @@ package client.structure.service.implementation; +import client.structure.service.models.ClientType; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import com.client.structure.service.models.ClientType; /** * Initializes a new instance of the TwoOperationGroupClient type. diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/ClientType.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/ClientType.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/ClientType.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/ClientType.java index d77c15cdd1..81bc9c8ad8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/ClientType.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/ClientType.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package com.client.structure.service.models; +package client.structure.service.models; /** * Defines values for ClientType. diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/package-info.java similarity index 93% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/package-info.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/package-info.java index d9a21e6dad..39f210ff84 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/client/structure/service/models/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/models/package-info.java @@ -15,4 +15,4 @@ * 6. have two clients with a hierarchy relation. * */ -package com.client.structure.service.models; +package client.structure.service.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/subnamespace/SecondClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/subnamespace/SecondClientBuilder.java index 30704a8458..379d9d70da 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/subnamespace/SecondClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/subnamespace/SecondClientBuilder.java @@ -5,6 +5,7 @@ package client.structure.service.subnamespace; import client.structure.service.implementation.SecondClientImpl; +import client.structure.service.models.ClientType; import com.azure.core.annotation.Generated; import com.azure.core.annotation.ServiceClientBuilder; import com.azure.core.client.traits.ConfigurationTrait; @@ -195,7 +196,7 @@ public SecondClientBuilder endpoint(String endpoint) { * Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. */ @Generated - private String client; + private ClientType client; /** * Sets Need to be set as 'default', 'multi-client', 'renamed-operation', 'two-operation-group' in client. @@ -204,7 +205,7 @@ public SecondClientBuilder endpoint(String endpoint) { * @return the SecondClientBuilder. */ @Generated - public SecondClientBuilder client(String client) { + public SecondClientBuilder client(ClientType client) { this.client = client; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClientBuilder.java index 95ef48f213..625acd67ab 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClientBuilder.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Objects; import versioning.added.implementation.AddedClientImpl; +import versioning.added.models.Versions; /** * A builder for creating a new instance of the AddedClient type. @@ -198,7 +199,7 @@ public AddedClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -207,7 +208,7 @@ public AddedClientBuilder endpoint(String endpoint) { * @return the AddedClientBuilder. */ @Generated - public AddedClientBuilder version(String version) { + public AddedClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java index 6915e8bb20..00515ad90a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java @@ -32,6 +32,7 @@ import com.azure.core.util.serializer.SerializerAdapter; import reactor.core.publisher.Mono; import versioning.added.AddedServiceVersion; +import versioning.added.models.Versions; /** * Initializes a new instance of the AddedClient type. @@ -59,14 +60,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -133,7 +134,7 @@ public InterfaceV2sImpl getInterfaceV2s() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public AddedClientImpl(String endpoint, String version, AddedServiceVersion serviceVersion) { + public AddedClientImpl(String endpoint, Versions version, AddedServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -146,7 +147,7 @@ public AddedClientImpl(String endpoint, String version, AddedServiceVersion serv * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public AddedClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public AddedClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, AddedServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -161,7 +162,7 @@ public AddedClientImpl(HttpPipeline httpPipeline, String endpoint, String versio * @param serviceVersion Service version. */ public AddedClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, AddedServiceVersion serviceVersion) { + Versions version, AddedServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -183,7 +184,7 @@ public interface AddedClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> v1(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> v1(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("header-v2") String headerV2, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -194,7 +195,7 @@ Mono> v1(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response v1Sync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response v1Sync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("header-v2") String headerV2, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -205,7 +206,7 @@ Response v1Sync(@HostParam("endpoint") String endpoint, @HostParam(" @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> v2(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> v2(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -215,7 +216,7 @@ Mono> v2(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java index 77094bb81a..13688ac1de 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java @@ -26,6 +26,7 @@ import com.azure.core.util.FluxUtil; import reactor.core.publisher.Mono; import versioning.added.AddedServiceVersion; +import versioning.added.models.Versions; /** * An instance of this class provides access to all the operations defined in InterfaceV2s. @@ -75,7 +76,7 @@ public interface InterfaceV2sService { @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> v2InInterface(@HostParam("endpoint") String endpoint, - @HostParam("version") String version, @HeaderParam("Content-Type") String contentType, + @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -86,7 +87,7 @@ Mono> v2InInterface(@HostParam("endpoint") String endpoint, @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response v2InInterfaceSync(@HostParam("endpoint") String endpoint, - @HostParam("version") String version, @HeaderParam("Content-Type") String contentType, + @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/models/Versions.java similarity index 95% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/Versions.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/models/Versions.java index 9c1cccaca1..9ce2d244b0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/Versions.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/models/Versions.java @@ -2,7 +2,7 @@ // Licensed under the MIT License. // Code generated by Microsoft (R) TypeSpec Code Generator. -package com.versioning.returntypechangedfrom.models; +package versioning.added.models; /** * The version of the API. diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java index fcefc81b06..cf0383a98c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Objects; import versioning.madeoptional.implementation.MadeOptionalClientImpl; +import versioning.madeoptional.models.Versions; /** * A builder for creating a new instance of the MadeOptionalClient type. @@ -193,7 +194,7 @@ public MadeOptionalClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -202,7 +203,7 @@ public MadeOptionalClientBuilder endpoint(String endpoint) { * @return the MadeOptionalClientBuilder. */ @Generated - public MadeOptionalClientBuilder version(String version) { + public MadeOptionalClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java index 4771f82025..b33e858f0c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java @@ -32,6 +32,7 @@ import com.azure.core.util.serializer.SerializerAdapter; import reactor.core.publisher.Mono; import versioning.madeoptional.MadeOptionalServiceVersion; +import versioning.madeoptional.models.Versions; /** * Initializes a new instance of the MadeOptionalClient type. @@ -59,14 +60,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -119,7 +120,7 @@ public SerializerAdapter getSerializerAdapter() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public MadeOptionalClientImpl(String endpoint, String version, MadeOptionalServiceVersion serviceVersion) { + public MadeOptionalClientImpl(String endpoint, Versions version, MadeOptionalServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -132,7 +133,7 @@ public MadeOptionalClientImpl(String endpoint, String version, MadeOptionalServi * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public MadeOptionalClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public MadeOptionalClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, MadeOptionalServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -147,7 +148,7 @@ public MadeOptionalClientImpl(HttpPipeline httpPipeline, String endpoint, String * @param serviceVersion Service version. */ public MadeOptionalClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, MadeOptionalServiceVersion serviceVersion) { + Versions version, MadeOptionalServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -170,7 +171,7 @@ public interface MadeOptionalClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -180,7 +181,7 @@ Mono> test(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/models/Versions.java new file mode 100644 index 0000000000..484bc36018 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package versioning.madeoptional.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClientBuilder.java index 282050c491..1b6b012ce5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClientBuilder.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Objects; import versioning.removed.implementation.RemovedClientImpl; +import versioning.removed.models.Versions; /** * A builder for creating a new instance of the RemovedClient type. @@ -193,7 +194,7 @@ public RemovedClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -202,7 +203,7 @@ public RemovedClientBuilder endpoint(String endpoint) { * @return the RemovedClientBuilder. */ @Generated - public RemovedClientBuilder version(String version) { + public RemovedClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java index 3f7d871e06..a86151c15c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java @@ -32,6 +32,7 @@ import com.azure.core.util.serializer.SerializerAdapter; import reactor.core.publisher.Mono; import versioning.removed.RemovedServiceVersion; +import versioning.removed.models.Versions; /** * Initializes a new instance of the RemovedClient type. @@ -59,14 +60,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -119,7 +120,7 @@ public SerializerAdapter getSerializerAdapter() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public RemovedClientImpl(String endpoint, String version, RemovedServiceVersion serviceVersion) { + public RemovedClientImpl(String endpoint, Versions version, RemovedServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -132,7 +133,7 @@ public RemovedClientImpl(String endpoint, String version, RemovedServiceVersion * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public RemovedClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public RemovedClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, RemovedServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -147,7 +148,7 @@ public RemovedClientImpl(HttpPipeline httpPipeline, String endpoint, String vers * @param serviceVersion Service version. */ public RemovedClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, RemovedServiceVersion serviceVersion) { + Versions version, RemovedServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -168,7 +169,7 @@ public interface RemovedClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> v2(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> v2(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -178,7 +179,7 @@ Mono> v2(@HostParam("endpoint") String endpoint, @HostParam @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/models/Versions.java new file mode 100644 index 0000000000..af49a0a93a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package versioning.removed.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java index f7ffca8ddc..29683d66f0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Objects; import versioning.renamedfrom.implementation.RenamedFromClientImpl; +import versioning.renamedfrom.models.Versions; /** * A builder for creating a new instance of the RenamedFromClient type. @@ -198,7 +199,7 @@ public RenamedFromClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -207,7 +208,7 @@ public RenamedFromClientBuilder endpoint(String endpoint) { * @return the RenamedFromClientBuilder. */ @Generated - public RenamedFromClientBuilder version(String version) { + public RenamedFromClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java index 40ab4b5543..cfc8b94935 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java @@ -26,6 +26,7 @@ import com.azure.core.util.FluxUtil; import reactor.core.publisher.Mono; import versioning.renamedfrom.RenamedFromServiceVersion; +import versioning.renamedfrom.models.Versions; /** * An instance of this class provides access to all the operations defined in NewInterfaces. @@ -75,7 +76,7 @@ public interface NewInterfacesService { @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Mono> newOpInNewInterface(@HostParam("endpoint") String endpoint, - @HostParam("version") String version, @HeaderParam("Content-Type") String contentType, + @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -86,7 +87,7 @@ Mono> newOpInNewInterface(@HostParam("endpoint") String end @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) Response newOpInNewInterfaceSync(@HostParam("endpoint") String endpoint, - @HostParam("version") String version, @HeaderParam("Content-Type") String contentType, + @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java index f1e1bdbc61..4a1ffb5bed 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java @@ -33,6 +33,7 @@ import com.azure.core.util.serializer.SerializerAdapter; import reactor.core.publisher.Mono; import versioning.renamedfrom.RenamedFromServiceVersion; +import versioning.renamedfrom.models.Versions; /** * Initializes a new instance of the RenamedFromClient type. @@ -60,14 +61,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -134,7 +135,7 @@ public NewInterfacesImpl getNewInterfaces() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public RenamedFromClientImpl(String endpoint, String version, RenamedFromServiceVersion serviceVersion) { + public RenamedFromClientImpl(String endpoint, Versions version, RenamedFromServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -147,7 +148,7 @@ public RenamedFromClientImpl(String endpoint, String version, RenamedFromService * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public RenamedFromClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public RenamedFromClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, RenamedFromServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -162,7 +163,7 @@ public RenamedFromClientImpl(HttpPipeline httpPipeline, String endpoint, String * @param serviceVersion Service version. */ public RenamedFromClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, RenamedFromServiceVersion serviceVersion) { + Versions version, RenamedFromServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -185,7 +186,7 @@ public interface RenamedFromClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> newOp(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> newOp(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @QueryParam("newQuery") String newQuery, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -196,7 +197,7 @@ Mono> newOp(@HostParam("endpoint") String endpoint, @HostPa @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response newOpSync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response newOpSync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @QueryParam("newQuery") String newQuery, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/models/Versions.java new file mode 100644 index 0000000000..574cbf58d0 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package versioning.renamedfrom.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java index fcd0aae18f..ef09845dd6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Objects; import versioning.returntypechangedfrom.implementation.ReturnTypeChangedFromClientImpl; +import versioning.returntypechangedfrom.models.Versions; /** * A builder for creating a new instance of the ReturnTypeChangedFromClient type. @@ -194,7 +195,7 @@ public ReturnTypeChangedFromClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -203,7 +204,7 @@ public ReturnTypeChangedFromClientBuilder endpoint(String endpoint) { * @return the ReturnTypeChangedFromClientBuilder. */ @Generated - public ReturnTypeChangedFromClientBuilder version(String version) { + public ReturnTypeChangedFromClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java index d788305746..a77a752e4e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java @@ -32,6 +32,7 @@ import com.azure.core.util.serializer.SerializerAdapter; import reactor.core.publisher.Mono; import versioning.returntypechangedfrom.ReturnTypeChangedFromServiceVersion; +import versioning.returntypechangedfrom.models.Versions; /** * Initializes a new instance of the ReturnTypeChangedFromClient type. @@ -59,14 +60,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -119,7 +120,7 @@ public SerializerAdapter getSerializerAdapter() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public ReturnTypeChangedFromClientImpl(String endpoint, String version, + public ReturnTypeChangedFromClientImpl(String endpoint, Versions version, ReturnTypeChangedFromServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); @@ -133,7 +134,7 @@ public ReturnTypeChangedFromClientImpl(String endpoint, String version, * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public ReturnTypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public ReturnTypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, ReturnTypeChangedFromServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -148,7 +149,7 @@ public ReturnTypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoin * @param serviceVersion Service version. */ public ReturnTypeChangedFromClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, - String endpoint, String version, ReturnTypeChangedFromServiceVersion serviceVersion) { + String endpoint, Versions version, ReturnTypeChangedFromServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -171,7 +172,7 @@ public interface ReturnTypeChangedFromClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -181,7 +182,7 @@ Mono> test(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/models/Versions.java new file mode 100644 index 0000000000..644972abe6 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package versioning.returntypechangedfrom.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/models/package-info.java similarity index 86% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/package-info.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/models/package-info.java index 1a7a505149..f35f312267 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/returntypechangedfrom/models/package-info.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/models/package-info.java @@ -8,4 +8,4 @@ * Test for the `@returnTypeChangedFrom` decorator. * */ -package com.versioning.returntypechangedfrom.models; +package versioning.returntypechangedfrom.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java index 8b64e27395..cbca64c0e7 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Objects; import versioning.typechangedfrom.implementation.TypeChangedFromClientImpl; +import versioning.typechangedfrom.models.Versions; /** * A builder for creating a new instance of the TypeChangedFromClient type. @@ -194,7 +195,7 @@ public TypeChangedFromClientBuilder endpoint(String endpoint) { * Need to be set as 'v1' or 'v2' in client. */ @Generated - private String version; + private Versions version; /** * Sets Need to be set as 'v1' or 'v2' in client. @@ -203,7 +204,7 @@ public TypeChangedFromClientBuilder endpoint(String endpoint) { * @return the TypeChangedFromClientBuilder. */ @Generated - public TypeChangedFromClientBuilder version(String version) { + public TypeChangedFromClientBuilder version(Versions version) { this.version = version; return this; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java index 70700bd2c0..b13499ec85 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java @@ -33,6 +33,7 @@ import com.azure.core.util.serializer.SerializerAdapter; import reactor.core.publisher.Mono; import versioning.typechangedfrom.TypeChangedFromServiceVersion; +import versioning.typechangedfrom.models.Versions; /** * Initializes a new instance of the TypeChangedFromClient type. @@ -60,14 +61,14 @@ public String getEndpoint() { /** * Need to be set as 'v1' or 'v2' in client. */ - private final String version; + private final Versions version; /** * Gets Need to be set as 'v1' or 'v2' in client. * * @return the version value. */ - public String getVersion() { + public Versions getVersion() { return this.version; } @@ -120,7 +121,7 @@ public SerializerAdapter getSerializerAdapter() { * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public TypeChangedFromClientImpl(String endpoint, String version, TypeChangedFromServiceVersion serviceVersion) { + public TypeChangedFromClientImpl(String endpoint, Versions version, TypeChangedFromServiceVersion serviceVersion) { this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(), JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -133,7 +134,7 @@ public TypeChangedFromClientImpl(String endpoint, String version, TypeChangedFro * @param version Need to be set as 'v1' or 'v2' in client. * @param serviceVersion Service version. */ - public TypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, String version, + public TypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, Versions version, TypeChangedFromServiceVersion serviceVersion) { this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, version, serviceVersion); } @@ -148,7 +149,7 @@ public TypeChangedFromClientImpl(HttpPipeline httpPipeline, String endpoint, Str * @param serviceVersion Service version. */ public TypeChangedFromClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint, - String version, TypeChangedFromServiceVersion serviceVersion) { + Versions version, TypeChangedFromServiceVersion serviceVersion) { this.httpPipeline = httpPipeline; this.serializerAdapter = serializerAdapter; this.endpoint = endpoint; @@ -171,7 +172,7 @@ public interface TypeChangedFromClientService { @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Mono> test(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @QueryParam("param") String param, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); @@ -182,7 +183,7 @@ Mono> test(@HostParam("endpoint") String endpoint, @HostPar @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) @UnexpectedResponseExceptionType(HttpResponseException.class) - Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") String version, + Response testSync(@HostParam("endpoint") String endpoint, @HostParam("version") Versions version, @QueryParam("param") String param, @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/models/Versions.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/models/Versions.java new file mode 100644 index 0000000000..1dc8163ab0 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/models/Versions.java @@ -0,0 +1,56 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package versioning.typechangedfrom.models; + +/** + * The version of the API. + */ +public enum Versions { + /** + * The version v1. + */ + V1("v1"), + + /** + * The version v2. + */ + V2("v2"); + + /** + * The actual serialized value for a Versions instance. + */ + private final String value; + + Versions(String value) { + this.value = value; + } + + /** + * Parses a serialized value to a Versions instance. + * + * @param value the serialized value to parse. + * @return the parsed Versions object, or null if unable to parse. + */ + public static Versions fromString(String value) { + if (value == null) { + return null; + } + Versions[] items = Versions.values(); + for (Versions item : items) { + if (item.toString().equalsIgnoreCase(value)) { + return item; + } + } + return null; + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return this.value; + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json index 21bd3bf9f1..a7d4fed75d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json @@ -21,6 +21,7 @@ "versioning.added.models.EnumV1": "Versioning.Added.EnumV1", "versioning.added.models.EnumV2": "Versioning.Added.EnumV2", "versioning.added.models.ModelV1": "Versioning.Added.ModelV1", - "versioning.added.models.ModelV2": "Versioning.Added.ModelV2" + "versioning.added.models.ModelV2": "Versioning.Added.ModelV2", + "versioning.added.models.Versions": "Versioning.Added.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json index 81a95b261f..abb603aab0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json @@ -8,6 +8,7 @@ "versioning.madeoptional.MadeOptionalClient.test": "Versioning.MadeOptional.test", "versioning.madeoptional.MadeOptionalClient.testWithResponse": "Versioning.MadeOptional.test", "versioning.madeoptional.MadeOptionalClientBuilder": "Versioning.MadeOptional", - "versioning.madeoptional.models.TestModel": "Versioning.MadeOptional.TestModel" + "versioning.madeoptional.models.TestModel": "Versioning.MadeOptional.TestModel", + "versioning.madeoptional.models.Versions": "Versioning.MadeOptional.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json index 61b6046ebc..6d6f6fc06f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json @@ -9,6 +9,7 @@ "versioning.removed.RemovedClient.v2WithResponse": "Versioning.Removed.v2", "versioning.removed.RemovedClientBuilder": "Versioning.Removed", "versioning.removed.models.EnumV2": "Versioning.Removed.EnumV2", - "versioning.removed.models.ModelV2": "Versioning.Removed.ModelV2" + "versioning.removed.models.ModelV2": "Versioning.Removed.ModelV2", + "versioning.removed.models.Versions": "Versioning.Removed.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json index bfac10dbbb..5d21443195 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json @@ -15,6 +15,7 @@ "versioning.renamedfrom.RenamedFromClient.newOpWithResponse": "Versioning.RenamedFrom.newOp", "versioning.renamedfrom.RenamedFromClientBuilder": "Versioning.RenamedFrom", "versioning.renamedfrom.models.NewEnum": "Versioning.RenamedFrom.NewEnum", - "versioning.renamedfrom.models.NewModel": "Versioning.RenamedFrom.NewModel" + "versioning.renamedfrom.models.NewModel": "Versioning.RenamedFrom.NewModel", + "versioning.renamedfrom.models.Versions": "Versioning.RenamedFrom.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json index 991d9caa87..3e58f108a6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json @@ -7,6 +7,7 @@ "versioning.returntypechangedfrom.ReturnTypeChangedFromClient": "Versioning.ReturnTypeChangedFrom", "versioning.returntypechangedfrom.ReturnTypeChangedFromClient.test": "Versioning.ReturnTypeChangedFrom.test", "versioning.returntypechangedfrom.ReturnTypeChangedFromClient.testWithResponse": "Versioning.ReturnTypeChangedFrom.test", - "versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder": "Versioning.ReturnTypeChangedFrom" + "versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder": "Versioning.ReturnTypeChangedFrom", + "versioning.returntypechangedfrom.models.Versions": "Versioning.ReturnTypeChangedFrom.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json index 0f0f6a1972..039e23d92e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json @@ -8,6 +8,7 @@ "versioning.typechangedfrom.TypeChangedFromClient.test": "Versioning.TypeChangedFrom.test", "versioning.typechangedfrom.TypeChangedFromClient.testWithResponse": "Versioning.TypeChangedFrom.test", "versioning.typechangedfrom.TypeChangedFromClientBuilder": "Versioning.TypeChangedFrom", - "versioning.typechangedfrom.models.TestModel": "Versioning.TypeChangedFrom.TestModel" + "versioning.typechangedfrom.models.TestModel": "Versioning.TypeChangedFrom.TestModel", + "versioning.typechangedfrom.models.Versions": "Versioning.TypeChangedFrom.Versions" } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ClientAClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ClientAClientTestBase.java index eedacab93c..1435012c7b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ClientAClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ClientAClientTestBase.java @@ -12,6 +12,7 @@ import client.structure.service.ClientAClientBuilder; import client.structure.service.ClientBClient; import client.structure.service.ClientBClientBuilder; +import client.structure.service.models.ClientType; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -27,7 +28,7 @@ class ClientAClientTestBase extends TestProxyTestBase { protected void beforeTest() { ClientAClientBuilder clientAClientbuilder = new ClientAClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -37,7 +38,7 @@ protected void beforeTest() { ClientBClientBuilder clientBClientbuilder = new ClientBClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/FirstClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/FirstClientTestBase.java index 2bf77c3db3..c6177b09d6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/FirstClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/FirstClientTestBase.java @@ -12,6 +12,7 @@ import client.structure.service.FirstClientBuilder; import client.structure.service.Group3Client; import client.structure.service.Group4Client; +import client.structure.service.models.ClientType; import client.structure.service.subnamespace.Group5Client; import client.structure.service.subnamespace.SecondClient; import client.structure.service.subnamespace.SecondClientBuilder; @@ -36,7 +37,7 @@ class FirstClientTestBase extends TestProxyTestBase { protected void beforeTest() { FirstClientBuilder firstClientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -46,7 +47,7 @@ protected void beforeTest() { FirstClientBuilder group3Clientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -56,7 +57,7 @@ protected void beforeTest() { FirstClientBuilder group4Clientbuilder = new FirstClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -66,7 +67,7 @@ protected void beforeTest() { SecondClientBuilder secondClientbuilder = new SecondClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -76,7 +77,7 @@ protected void beforeTest() { SecondClientBuilder group5Clientbuilder = new SecondClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/RenamedOperationClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/RenamedOperationClientTestBase.java index c1670005f9..5572e6e2c2 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/RenamedOperationClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/RenamedOperationClientTestBase.java @@ -11,6 +11,7 @@ import client.structure.service.GroupClient; import client.structure.service.RenamedOperationClient; import client.structure.service.RenamedOperationClientBuilder; +import client.structure.service.models.ClientType; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -26,7 +27,7 @@ class RenamedOperationClientTestBase extends TestProxyTestBase { protected void beforeTest() { RenamedOperationClientBuilder renamedOperationClientbuilder = new RenamedOperationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -36,7 +37,7 @@ protected void beforeTest() { RenamedOperationClientBuilder groupClientbuilder = new RenamedOperationClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ServiceClientClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ServiceClientClientTestBase.java index 7fa6d269c6..e9a538d4cf 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ServiceClientClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ServiceClientClientTestBase.java @@ -15,6 +15,7 @@ import client.structure.service.QuxClient; import client.structure.service.ServiceClientClient; import client.structure.service.ServiceClientClientBuilder; +import client.structure.service.models.ClientType; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -38,7 +39,7 @@ class ServiceClientClientTestBase extends TestProxyTestBase { protected void beforeTest() { ServiceClientClientBuilder serviceClientClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -48,7 +49,7 @@ protected void beforeTest() { ServiceClientClientBuilder bazFooClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -58,7 +59,7 @@ protected void beforeTest() { ServiceClientClientBuilder quxClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -68,7 +69,7 @@ protected void beforeTest() { ServiceClientClientBuilder quxBarClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -78,7 +79,7 @@ protected void beforeTest() { ServiceClientClientBuilder fooClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -88,7 +89,7 @@ protected void beforeTest() { ServiceClientClientBuilder barClientbuilder = new ServiceClientClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/TwoOperationGroupClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/TwoOperationGroupClientTestBase.java index f29f30d759..908029631b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/TwoOperationGroupClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/TwoOperationGroupClientTestBase.java @@ -11,6 +11,7 @@ import client.structure.service.Group1Client; import client.structure.service.Group2Client; import client.structure.service.TwoOperationGroupClientBuilder; +import client.structure.service.models.ClientType; import com.azure.core.http.policy.HttpLogDetailLevel; import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.test.TestMode; @@ -26,7 +27,7 @@ class TwoOperationGroupClientTestBase extends TestProxyTestBase { protected void beforeTest() { TwoOperationGroupClientBuilder group1Clientbuilder = new TwoOperationGroupClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -36,7 +37,7 @@ protected void beforeTest() { TwoOperationGroupClientBuilder group2Clientbuilder = new TwoOperationGroupClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .client(Configuration.getGlobalConfiguration().get("CLIENT", "client")) + .client(ClientType.fromString(Configuration.getGlobalConfiguration().get("CLIENT", "client"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/generated/AddedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/generated/AddedClientTestBase.java index f949d1d947..ad5fc7557c 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/generated/AddedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/generated/AddedClientTestBase.java @@ -16,6 +16,7 @@ import versioning.added.AddedClient; import versioning.added.AddedClientBuilder; import versioning.added.InterfaceV2Client; +import versioning.added.models.Versions; class AddedClientTestBase extends TestProxyTestBase { protected AddedClient addedClient; @@ -26,7 +27,7 @@ class AddedClientTestBase extends TestProxyTestBase { protected void beforeTest() { AddedClientBuilder addedClientbuilder = new AddedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -36,7 +37,7 @@ protected void beforeTest() { AddedClientBuilder interfaceV2Clientbuilder = new AddedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/generated/MadeOptionalClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/generated/MadeOptionalClientTestBase.java index e59ff3a4d3..81f097c26b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/generated/MadeOptionalClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/generated/MadeOptionalClientTestBase.java @@ -15,6 +15,7 @@ import com.azure.core.util.Configuration; import versioning.madeoptional.MadeOptionalClient; import versioning.madeoptional.MadeOptionalClientBuilder; +import versioning.madeoptional.models.Versions; class MadeOptionalClientTestBase extends TestProxyTestBase { protected MadeOptionalClient madeOptionalClient; @@ -23,7 +24,7 @@ class MadeOptionalClientTestBase extends TestProxyTestBase { protected void beforeTest() { MadeOptionalClientBuilder madeOptionalClientbuilder = new MadeOptionalClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/generated/RemovedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/generated/RemovedClientTestBase.java index fcff23bf6c..f642e20959 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/generated/RemovedClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/generated/RemovedClientTestBase.java @@ -15,6 +15,7 @@ import com.azure.core.util.Configuration; import versioning.removed.RemovedClient; import versioning.removed.RemovedClientBuilder; +import versioning.removed.models.Versions; class RemovedClientTestBase extends TestProxyTestBase { protected RemovedClient removedClient; @@ -23,7 +24,7 @@ class RemovedClientTestBase extends TestProxyTestBase { protected void beforeTest() { RemovedClientBuilder removedClientbuilder = new RemovedClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/generated/RenamedFromClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/generated/RenamedFromClientTestBase.java index 001bcaf4ae..2e4e87d034 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/generated/RenamedFromClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/generated/RenamedFromClientTestBase.java @@ -16,6 +16,7 @@ import versioning.renamedfrom.NewInterfaceClient; import versioning.renamedfrom.RenamedFromClient; import versioning.renamedfrom.RenamedFromClientBuilder; +import versioning.renamedfrom.models.Versions; class RenamedFromClientTestBase extends TestProxyTestBase { protected RenamedFromClient renamedFromClient; @@ -26,7 +27,7 @@ class RenamedFromClientTestBase extends TestProxyTestBase { protected void beforeTest() { RenamedFromClientBuilder renamedFromClientbuilder = new RenamedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { @@ -36,7 +37,7 @@ protected void beforeTest() { RenamedFromClientBuilder newInterfaceClientbuilder = new RenamedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java index 82a8da4adc..bff7372da9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java @@ -15,6 +15,7 @@ import com.azure.core.util.Configuration; import versioning.returntypechangedfrom.ReturnTypeChangedFromClient; import versioning.returntypechangedfrom.ReturnTypeChangedFromClientBuilder; +import versioning.returntypechangedfrom.models.Versions; class ReturnTypeChangedFromClientTestBase extends TestProxyTestBase { protected ReturnTypeChangedFromClient returnTypeChangedFromClient; @@ -23,7 +24,7 @@ class ReturnTypeChangedFromClientTestBase extends TestProxyTestBase { protected void beforeTest() { ReturnTypeChangedFromClientBuilder returnTypeChangedFromClientbuilder = new ReturnTypeChangedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java index d9d3921ceb..e9a5a7da1f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java @@ -15,6 +15,7 @@ import com.azure.core.util.Configuration; import versioning.typechangedfrom.TypeChangedFromClient; import versioning.typechangedfrom.TypeChangedFromClientBuilder; +import versioning.typechangedfrom.models.Versions; class TypeChangedFromClientTestBase extends TestProxyTestBase { protected TypeChangedFromClient typeChangedFromClient; @@ -23,7 +24,7 @@ class TypeChangedFromClientTestBase extends TestProxyTestBase { protected void beforeTest() { TypeChangedFromClientBuilder typeChangedFromClientbuilder = new TypeChangedFromClientBuilder() .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .version(Configuration.getGlobalConfiguration().get("VERSION", "version")) + .version(Versions.fromString(Configuration.getGlobalConfiguration().get("VERSION", "version"))) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.RECORD) { From 0e5b7df3bea907f5052c43da8cb17e5fcc31518b Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:30:22 +0800 Subject: [PATCH 08/11] update tests --- .../client/structure/ClientOperationGroupTests.java | 5 +++-- .../java/client/structure/DefaultClientTests.java | 13 +++++++------ .../java/client/structure/MultiClientTests.java | 5 +++-- .../client/structure/OperationGroupClientTests.java | 5 +++-- .../java/client/structure/RenameOperationTests.java | 5 +++-- .../java/versioning/added/AddedClientTests.java | 5 +++-- .../madeoptional/MadeOptionalClienTests.java | 3 ++- .../java/versioning/removed/RemovedClientTests.java | 5 +++-- .../renamedfrom/RenamedFromClientTests.java | 5 +++-- .../ReturnTypeChangedFromClientTests.java | 2 +- .../typechangedfrom/TypeChangedFromClientTests.java | 3 ++- 11 files changed, 33 insertions(+), 23 deletions(-) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/ClientOperationGroupTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/ClientOperationGroupTests.java index 0c08c21b6c..4edaca9db9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/ClientOperationGroupTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/ClientOperationGroupTests.java @@ -4,6 +4,7 @@ package client.structure; import client.structure.service.FirstClientBuilder; +import client.structure.service.models.ClientType; import client.structure.service.subnamespace.SecondClientBuilder; import org.junit.jupiter.api.Test; @@ -12,9 +13,9 @@ public class ClientOperationGroupTests { @Test public void test() { FirstClientBuilder clientBuilder1 - = new FirstClientBuilder().endpoint("http://localhost:3000").client("client-operation-group"); + = new FirstClientBuilder().endpoint("http://localhost:3000").client(ClientType.CLIENT_OPERATION_GROUP); SecondClientBuilder clientBuilder2 - = new SecondClientBuilder().endpoint("http://localhost:3000").client("client-operation-group"); + = new SecondClientBuilder().endpoint("http://localhost:3000").client(ClientType.CLIENT_OPERATION_GROUP); clientBuilder1.buildClient().one(); clientBuilder1.buildGroup3Client().two(); diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/DefaultClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/DefaultClientTests.java index d6c05f0cea..3883378be6 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/DefaultClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/DefaultClientTests.java @@ -10,27 +10,28 @@ import client.structure.service.QuxClient; import client.structure.service.ServiceClientClient; import client.structure.service.ServiceClientClientBuilder; +import client.structure.service.models.ClientType; import org.junit.jupiter.api.Test; public class DefaultClientTests { private final ServiceClientClient client - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildClient(); private final FooClient client2 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildFooClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildFooClient(); private final BarClient client3 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildBarClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildBarClient(); private final QuxClient client4 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildQuxClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildQuxClient(); private final QuxBarClient client5 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildQuxBarClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildQuxBarClient(); private final BazFooClient client6 - = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client("default").buildBazFooClient(); + = new ServiceClientClientBuilder().endpoint("http://localhost:3000").client(ClientType.DEFAULT).buildBazFooClient(); @Test public void testClient() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/MultiClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/MultiClientTests.java index a86d828307..f477d65fa9 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/MultiClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/MultiClientTests.java @@ -7,14 +7,15 @@ import client.structure.service.ClientAClientBuilder; import client.structure.service.ClientBClient; import client.structure.service.ClientBClientBuilder; +import client.structure.service.models.ClientType; import org.junit.jupiter.api.Test; public class MultiClientTests { private final ClientAClient client1 - = new ClientAClientBuilder().endpoint("http://localhost:3000").client("multi-client").buildClient(); + = new ClientAClientBuilder().endpoint("http://localhost:3000").client(ClientType.MULTI_CLIENT).buildClient(); private final ClientBClient client2 - = new ClientBClientBuilder().endpoint("http://localhost:3000").client("multi-client").buildClient(); + = new ClientBClientBuilder().endpoint("http://localhost:3000").client(ClientType.MULTI_CLIENT).buildClient(); @Test public void testClient() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/OperationGroupClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/OperationGroupClientTests.java index 9c02cf3449..f4b6361b6b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/OperationGroupClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/OperationGroupClientTests.java @@ -6,15 +6,16 @@ import client.structure.service.Group1Client; import client.structure.service.Group2Client; import client.structure.service.TwoOperationGroupClientBuilder; +import client.structure.service.models.ClientType; import org.junit.jupiter.api.Test; public class OperationGroupClientTests { private final Group1Client client1 = new TwoOperationGroupClientBuilder().endpoint("http://localhost:3000") - .client("two-operation-group") + .client(ClientType.TWO_OPERATION_GROUP) .buildGroup1Client(); private final Group2Client client2 = new TwoOperationGroupClientBuilder().endpoint("http://localhost:3000") - .client("two-operation-group") + .client(ClientType.TWO_OPERATION_GROUP) .buildGroup2Client(); @Test diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/RenameOperationTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/RenameOperationTests.java index 159a3f2bfe..e935e4614a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/RenameOperationTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/RenameOperationTests.java @@ -6,15 +6,16 @@ import client.structure.service.GroupClient; import client.structure.service.RenamedOperationClient; import client.structure.service.RenamedOperationClientBuilder; +import client.structure.service.models.ClientType; import org.junit.jupiter.api.Test; public class RenameOperationTests { private final RenamedOperationClient client = new RenamedOperationClientBuilder().endpoint("http://localhost:3000") - .client("renamed-operation") + .client(ClientType.RENAMED_OPERATION) .buildClient(); private final GroupClient groupClient = new RenamedOperationClientBuilder().endpoint("http://localhost:3000") - .client("renamed-operation") + .client(ClientType.RENAMED_OPERATION) .buildGroupClient(); @Test diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/AddedClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/AddedClientTests.java index 1617c850a8..6144a80867 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/AddedClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/AddedClientTests.java @@ -9,12 +9,13 @@ import versioning.added.models.EnumV2; import versioning.added.models.ModelV1; import versioning.added.models.ModelV2; +import versioning.added.models.Versions; public class AddedClientTests { private final AddedClient addedClient - = new AddedClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new AddedClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); private final InterfaceV2Client interfaceV2Client - = new AddedClientBuilder().endpoint("http://localhost:3000").version("v2").buildInterfaceV2Client(); + = new AddedClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildInterfaceV2Client(); @Test public void testAddedClient() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/MadeOptionalClienTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/MadeOptionalClienTests.java index 481437d488..10de77bd0a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/MadeOptionalClienTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/MadeOptionalClienTests.java @@ -5,10 +5,11 @@ import org.junit.jupiter.api.Test; import versioning.madeoptional.models.TestModel; +import versioning.madeoptional.models.Versions; public class MadeOptionalClienTests { private final MadeOptionalClient madeOptionalClient - = new MadeOptionalClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new MadeOptionalClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); @Test public void testMadeOptionalClient() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/RemovedClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/RemovedClientTests.java index c37aa80425..d772701f1e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/RemovedClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/RemovedClientTests.java @@ -7,14 +7,15 @@ import org.junit.jupiter.api.Test; import versioning.removed.models.EnumV2; import versioning.removed.models.ModelV2; +import versioning.removed.models.Versions; public class RemovedClientTests { private final RemovedClient removedClientV1 - = new RemovedClientBuilder().endpoint("http://localhost:3000").version("v1").buildClient(); + = new RemovedClientBuilder().endpoint("http://localhost:3000").version(Versions.V1).buildClient(); private final RemovedClient removedClientV2 - = new RemovedClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new RemovedClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); @Test public void tesRemovedClient() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/RenamedFromClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/RenamedFromClientTests.java index a7914c0ba9..e54a852f0b 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/RenamedFromClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/RenamedFromClientTests.java @@ -7,12 +7,13 @@ import org.junit.jupiter.api.Test; import versioning.renamedfrom.models.NewEnum; import versioning.renamedfrom.models.NewModel; +import versioning.renamedfrom.models.Versions; public class RenamedFromClientTests { private final RenamedFromClient renamedFromClient - = new RenamedFromClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new RenamedFromClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); private final NewInterfaceClient newInterfaceClient - = new RenamedFromClientBuilder().endpoint("http://localhost:3000").version("v2").buildNewInterfaceClient(); + = new RenamedFromClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildNewInterfaceClient(); @Test public void testNewOp() { diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientTests.java index 78250f0458..912ff90197 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientTests.java @@ -3,8 +3,8 @@ package versioning.returntypechangedfrom; -import com.versioning.returntypechangedfrom.models.Versions; import org.junit.jupiter.api.Test; +import versioning.returntypechangedfrom.models.Versions; public class ReturnTypeChangedFromClientTests { private final ReturnTypeChangedFromClient returnTypeChangedFromClient diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/TypeChangedFromClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/TypeChangedFromClientTests.java index eaff18034a..bc753dfd2f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/TypeChangedFromClientTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/TypeChangedFromClientTests.java @@ -5,10 +5,11 @@ import org.junit.jupiter.api.Test; import versioning.typechangedfrom.models.TestModel; +import versioning.typechangedfrom.models.Versions; public class TypeChangedFromClientTests { private final TypeChangedFromClient typeChangedFromClient - = new TypeChangedFromClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient(); + = new TypeChangedFromClientBuilder().endpoint("http://localhost:3000").version(Versions.V2).buildClient(); @Test public void testTypeChangedFromClient() { From 7f98ae55a00c659c18b21297b62193ca85af8118 Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:30:48 +0800 Subject: [PATCH 09/11] remove import * --- .../core/template/example/ProtocolTestWriter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 719d119c64..01a90a6487 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 @@ -8,7 +8,12 @@ import com.azure.core.http.policy.HttpLogOptions; import com.azure.core.util.Configuration; import com.microsoft.typespec.http.client.generator.core.extension.model.codemodel.Scheme; -import com.microsoft.typespec.http.client.generator.core.model.clientmodel.*; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.AsyncSyncClient; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClassType; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.EnumType; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ServiceClient; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ServiceClientProperty; +import com.microsoft.typespec.http.client.generator.core.model.clientmodel.TestContext; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaBlock; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaClass; import com.microsoft.typespec.http.client.generator.core.model.javamodel.JavaIfBlock; From cd304bd29efcdfd82f2ff2226bbec3434dcbf3a7 Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Thu, 14 Nov 2024 17:47:13 +0800 Subject: [PATCH 10/11] add todo for non-string enum --- .../generator/core/template/example/ProtocolTestWriter.java | 1 + 1 file changed, 1 insertion(+) 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 01a90a6487..02384a8013 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 @@ -85,6 +85,7 @@ public ProtocolTestWriter(TestContext testContext) { String expr; if (defaultValueExpression == null) { if (serviceClientProperty.getType() instanceof EnumType) { + // TODO: handle non-string enum expr = String.format( "%1$s.fromString(Configuration.getGlobalConfiguration().get(\"%2$s\", %3$s))", serviceClientProperty.getType(), From 28be5db2bae7302c3733490ae33bf77a705aa794 Mon Sep 17 00:00:00 2001 From: Haoling Dong <87355844+haolingdong-msft@users.noreply.github.com> Date: Fri, 15 Nov 2024 13:50:03 +0800 Subject: [PATCH 11/11] handle for non-string enum --- .../core/template/example/ProtocolTestWriter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 02384a8013..1bbbb33f84 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 @@ -85,10 +85,11 @@ public ProtocolTestWriter(TestContext testContext) { String expr; if (defaultValueExpression == null) { if (serviceClientProperty.getType() instanceof EnumType) { - // TODO: handle non-string enum + String fromMethodName + = ((EnumType) serviceClientProperty.getType()).getFromMethodName(); expr = String.format( - "%1$s.fromString(Configuration.getGlobalConfiguration().get(\"%2$s\", %3$s))", - serviceClientProperty.getType(), + "%1$s.%2$s(Configuration.getGlobalConfiguration().get(\"%3$s\", %4$s))", + serviceClientProperty.getType(), fromMethodName, serviceClientProperty.getName().toUpperCase(Locale.ROOT), ClassType.STRING.defaultValueExpression( serviceClientProperty.getName().toLowerCase(Locale.ROOT)));